From patchwork Sun Nov 11 21:20:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Wang X-Patchwork-Id: 198297 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 59EC62C007D for ; Mon, 12 Nov 2012 08:20:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752027Ab2KKVUU (ORCPT ); Sun, 11 Nov 2012 16:20:20 -0500 Received: from mail-vc0-f174.google.com ([209.85.220.174]:33851 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751512Ab2KKVUT (ORCPT ); Sun, 11 Nov 2012 16:20:19 -0500 Received: by mail-vc0-f174.google.com with SMTP id fk26so5497526vcb.19 for ; Sun, 11 Nov 2012 13:20:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=9FjbPPeEf+RXR/NEJNRCOMzMhHzBTxlPjrgiwbTGWLI=; b=TWOqOPal5aCh+9lMucPmlBHishAEfQ4JpHLmhi6dJEC0edyWLxf/6Wlokue40FXBMI LbRVagJksig/C0wQyABsKQWKvf16xMZ94hPIF8vBF8tlGc8a7xj5haNyw0+zEAhJ+A/q 1/QqAUnI3s9Sdez8g+laEzB6fj21Udt5bjnTM1f/YUzBQyIsCWmWNRpZx4OyeGY43GCM 5E4dTGNyHkFT3LcSE5AIEfbxX0TB6AbyJhFMfpmeCiOstyUnWTBXKK3auwGB7Jf/DnyI Kc7LWqwanWcZLIkjlns0LQK/1VYOFwTrhVsI0+huKJbbithiz70/XBj33XUTc/84mrwA 9i8A== Received: by 10.52.26.81 with SMTP id j17mr19398943vdg.63.1352668818857; Sun, 11 Nov 2012 13:20:18 -0800 (PST) Received: from hchen.lcs.mit.edu (hchen.csail.mit.edu. [18.26.5.5]) by mx.google.com with ESMTPS id in19sm4848250vec.1.2012.11.11.13.20.16 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Nov 2012 13:20:18 -0800 (PST) From: Xi Wang To: "David S. Miller" Cc: netdev@vger.kernel.org, Xi Wang Subject: [PATCH] ipv4: avoid undefined behavior in do_ip_setsockopt() Date: Sun, 11 Nov 2012 16:20:01 -0500 Message-Id: <1352668801-14373-1-git-send-email-xi.wang@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org (1< --- net/ipv4/ip_sockglue.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 5eea4a8..14bbfcf 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -457,19 +457,28 @@ static int do_ip_setsockopt(struct sock *sk, int level, struct inet_sock *inet = inet_sk(sk); int val = 0, err; - if (((1<= sizeof(int)) { if (get_user(val, (int __user *) optval)) return -EFAULT;