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

Commit e7be6994 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: Fix module_param types and permissions 



Fix netfilter module_param types and permissions. Also fix an off-by-one in
the ipt_ULOG nlbufsiz < 128k check.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 87711cb8

net/ipv4/netfilter/ip_conntrack_amanda.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static unsigned int master_timeout = 300; 
MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>");

MODULE_DESCRIPTION("Amanda connection tracking module");

MODULE_LICENSE("GPL");

module_param(master_timeout, int, 0600);

module_param(master_timeout, uint, 0600);

MODULE_PARM_DESC(master_timeout, "timeout for the master connection");



static const char *conns[] = { "DATA ", "MESG ", "INDEX " };

net/ipv4/netfilter/ip_conntrack_ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int ports_c; 
module_param_array(ports, ushort, &ports_c, 0400);



static int loose;

module_param(loose, int, 0600);

module_param(loose, bool, 0600);



unsigned int (*ip_nat_ftp_hook)(struct sk_buff **pskb,

				enum ip_conntrack_info ctinfo,

net/ipv4/netfilter/ip_conntrack_irc.c

+3 −7
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define MAX_PORTS 8

static unsigned short ports[MAX_PORTS];

static int ports_c;

static int max_dcc_channels = 8;

static unsigned int max_dcc_channels = 8;

static unsigned int dcc_timeout = 300;

/* This is slow, but it's simple. --RR */

static char *irc_buffer;
@@ -54,9 +54,9 @@ MODULE_DESCRIPTION("IRC (DCC) connection tracking helper"); 
MODULE_LICENSE("GPL");

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_param(max_dcc_channels, uint, 0400);

MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per IRC session");

module_param(dcc_timeout, int, 0400);

module_param(dcc_timeout, uint, 0400);

MODULE_PARM_DESC(dcc_timeout, "timeout on for unestablished DCC channels");



static const char *dccprotos[] = { "SEND ", "CHAT ", "MOVE ", "TSEND ", "SCHAT " };
@@ -254,10 +254,6 @@ static int __init init(void) 
		printk("ip_conntrack_irc: max_dcc_channels must be a positive integer\n");

		return -EBUSY;

	}

	if (dcc_timeout < 0) {

		printk("ip_conntrack_irc: dcc_timeout must be a positive integer\n");

		return -EBUSY;

	}



	irc_buffer = kmalloc(65536, GFP_KERNEL);

	if (!irc_buffer)

net/ipv4/netfilter/ip_conntrack_netbios_ns.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ MODULE_DESCRIPTION("NetBIOS name service broadcast connection tracking helper"); 
MODULE_LICENSE("GPL");



static unsigned int timeout = 3;

module_param(timeout, int, 0600);

module_param(timeout, uint, 0400);

MODULE_PARM_DESC(timeout, "timeout for master connection/replies in seconds");



static int help(struct sk_buff **pskb,

net/ipv4/netfilter/ipt_ULOG.c

+5 −5
Original line number Diff line number Diff line
@@ -77,15 +77,15 @@ MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_NFLOG); 
#define PRINTR(format, args...) do { if (net_ratelimit()) printk(format , ## args); } while (0)



static unsigned int nlbufsiz = 4096;

module_param(nlbufsiz, uint, 0600); /* FIXME: Check size < 128k --RR */

module_param(nlbufsiz, uint, 0400);

MODULE_PARM_DESC(nlbufsiz, "netlink buffer size");



static unsigned int flushtimeout = 10;

module_param(flushtimeout, int, 0600);

module_param(flushtimeout, uint, 0600);

MODULE_PARM_DESC(flushtimeout, "buffer flush timeout (hundredths of a second)");



static unsigned int nflog = 1;

module_param(nflog, int, 0400);

static int nflog = 1;

module_param(nflog, bool, 0400);

MODULE_PARM_DESC(nflog, "register as internal netfilter logging module");



/* global data structures */
@@ -376,7 +376,7 @@ static int __init init(void) 


	DEBUGP("ipt_ULOG: init module\n");



	if (nlbufsiz >= 128*1024) {

	if (nlbufsiz > 128*1024) {

		printk("Netlink buffer has to be <= 128kB\n");

		return -EINVAL;

	}