Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NETFILTER] ip_conntrack: fix ftp/irc/tftp helpers on ports >= 32768

Browse Source 
Since we've converted the ftp/irc/tftp helpers to use the new
module_parm_array() some time ago, we ware accidentially using signed data
types - thus preventing those modules from being used on ports >= 32768.

This patch fixes it by using 'ushort' module parameters.

Thanks to Jan Nijs for reporting this bug.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harald Welte 2005-11-17 15:06:47 -08:00 committed by David S. Miller
parent bd6af700a7
commit 2fce76afdb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/netfilter/ip_conntrack_ftp.c
View File

@ -29,9 +29,9 @@ static char *ftp_buffer;
static DEFINE_SPINLOCK(ip_ftp_lock);
#define MAX_PORTS 8
static short ports[MAX_PORTS];
static unsigned short ports[MAX_PORTS];
static int ports_c;
module_param_array(ports, short, &ports_c, 0400);
module_param_array(ports, ushort, &ports_c, 0400);
static int loose;
module_param(loose, int, 0600);

4
net/ipv4/netfilter/ip_conntrack_irc.c
View File

@ -34,7 +34,7 @@
#include <linux/moduleparam.h>
#define MAX_PORTS 8
static short ports[MAX_PORTS];
static unsigned short ports[MAX_PORTS];
static int ports_c;
static int max_dcc_channels = 8;
static unsigned int dcc_timeout = 300;
@ -52,7 +52,7 @@ EXPORT_SYMBOL_GPL(ip_nat_irc_hook);
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("IRC (DCC) connection tracking helper");
MODULE_LICENSE("GPL");
module_param_array(ports, short, &ports_c, 0400);
module_param_array(ports, ushort, &ports_c, 0400);
MODULE_PARM_DESC(ports, "port numbers of IRC servers");
module_param(max_dcc_channels, int, 0400);
MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per IRC session");

4
net/ipv4/netfilter/ip_conntrack_tftp.c
View File

@ -26,9 +26,9 @@ MODULE_DESCRIPTION("tftp connection tracking helper");
MODULE_LICENSE("GPL");
#define MAX_PORTS 8
static short ports[MAX_PORTS];
static unsigned short ports[MAX_PORTS];
static int ports_c;
module_param_array(ports, short, &ports_c, 0400);
module_param_array(ports, ushort, &ports_c, 0400);
MODULE_PARM_DESC(ports, "port numbers of tftp servers");
#if 0