Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fce76af authored by Harald Welte's avatar Harald Welte Committed by David S. Miller
Browse files

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



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: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd6af700

net/ipv4/netfilter/ip_conntrack_ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/ipv4/netfilter/ip_conntrack_irc.c

+2 −2
Original line number Diff line number Diff line
@@ -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");

net/ipv4/netfilter/ip_conntrack_tftp.c

+2 −2
Original line number Diff line number Diff line
@@ -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