From mboxrd@z Thu Jan 1 00:00:00 1970 From: Horms Subject: Re: [patch 3/4] Make sure ip_vs_ftp ports are valid Date: Wed, 20 Sep 2006 23:49:42 +0900 Message-ID: <20060920144941.GC1286@verge.net.au> References: <20060901101036.181146000@tabatha.lab.ultramonkey.org> <20060901101756.637601000@tabatha.lab.ultramonkey.org> <44FB60C7.30300@trash.net> <20060904004401.GD30287@verge.net.au> <20060904020253.GA8761@verge.net.au> <45111819.1030309@trash.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, Wensong Zhang , Julian Anastasov , David Miller , Joseph Mack NA3T Return-path: Received: from koto.vergenet.net ([210.128.90.7]:61654 "EHLO koto.vergenet.net") by vger.kernel.org with ESMTP id S1751525AbWITOur (ORCPT ); Wed, 20 Sep 2006 10:50:47 -0400 To: Patrick McHardy Content-Disposition: inline In-Reply-To: <45111819.1030309@trash.net> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On Wed, Sep 20, 2006 at 12:29:45PM +0200, Patrick McHardy wrote: > Horms wrote: > > Here is the revised patch. > > > > > > [IPVS] Make sure ip_vs_ftp ports are valid > > > > I'm not entirely sure what happens in the case of a valid port, > > at best it'll be silently ignored. This patch ensures that > > the port values are unsigned short values, and thus always valid. > > > > Cc: Patrick McHardy > > Signed-Off-By: Simon Horman > > > > Index: linux-2.6/net/ipv4/ipvs/ip_vs_ftp.c > > =================================================================== > > --- linux-2.6.orig/net/ipv4/ipvs/ip_vs_ftp.c 2006-09-04 > 10:47:09.000000000 +0900 > > +++ linux-2.6/net/ipv4/ipvs/ip_vs_ftp.c 2006-09-04 10:59:30.000000000 > +0900 > > @@ -44,8 +44,8 @@ > > * List of ports (up to IP_VS_APP_MAX_PORTS) to be handled by helper > > * First port is set to the default port. > > */ > > -static int ports[IP_VS_APP_MAX_PORTS] = {21, 0}; > > -module_param_array(ports, int, NULL, 0); > > +static unsigned short ports[IP_VS_APP_MAX_PORTS] = {21, 0}; > > +module_param_array(ports, ushort, NULL, 0); > > MODULE_PARM_DESC(ports, "Ports to monitor for FTP control commands"); > > > > /* > > It looks like the wrong patch went in: > > http://marc.theaimsgroup.com/?l=git-commits-head&m=115862407021941&w=2 Thanks for pointing that out. I'll send out patches to reverse the committed change, and add the newer incarntation. -- Horms H: http://www.vergenet.net/~horms/ W: http://www.valinux.co.jp/en/