From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753856Ab0JDI7T (ORCPT ); Mon, 4 Oct 2010 04:59:19 -0400 Received: from relay1.sgi.com ([192.48.179.29]:44307 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753630Ab0JDI7S (ORCPT ); Mon, 4 Oct 2010 04:59:18 -0400 Date: Mon, 4 Oct 2010 03:59:13 -0500 From: Robin Holt To: Eric Dumazet Cc: Andrew Morton , linux-kernel , Robin Holt , Willy Tarreau , "David S. Miller" , netdev@vger.kernel.org, James Morris , Hideaki YOSHIFUJI , "Pekka Savola (ipv6)" , Patrick McHardy , Alexey Kuznetsov Subject: Re: [PATCH] sysctl: fix min/max handling in __do_proc_doulongvec_minmax() Message-ID: <20101004085913.GR14068@sgi.com> References: <1286025469.2582.1806.camel@edumazet-laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1286025469.2582.1806.camel@edumazet-laptop> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Oct 02, 2010 at 03:17:49PM +0200, Eric Dumazet wrote: > When proc_doulongvec_minmax() is used with an array of longs, > and no min/max check requested (.extra1 or .extra2 being NULL), we > dereference a NULL pointer for the second element of the array. > > Noticed while doing some changes in network stack for the "16TB problem" > > Signed-off-by: Eric Dumazet > --- > kernel/sysctl.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > index f88552c..4fba86d 100644 > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -2500,7 +2500,8 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int > break; > if (neg) > continue; > - if ((min && val < *min) || (max && val > *max)) > + if ((table->extra1 && val < *min) || > + (table->extra2 && val > *max)) How about changing: for (; left && vleft--; i++, min++, max++, first=0) { into: for (; left && vleft--; i++, min = min ? min + 1 : NULL, max = max ? max + 1: NULL, first=0) { That would make min and max correct and reduce the chances somebody in the future overlooks the fact they are currently filled with garbage. Robin