mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-21 11:53:01 +00:00
[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: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
87711cb81c
commit
e7be6994ec
|
@ -36,7 +36,7 @@ static unsigned int master_timeout = 300;
|
||||||
MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>");
|
MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>");
|
||||||
MODULE_DESCRIPTION("Amanda connection tracking module");
|
MODULE_DESCRIPTION("Amanda connection tracking module");
|
||||||
MODULE_LICENSE("GPL");
|
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");
|
MODULE_PARM_DESC(master_timeout, "timeout for the master connection");
|
||||||
|
|
||||||
static const char *conns[] = { "DATA ", "MESG ", "INDEX " };
|
static const char *conns[] = { "DATA ", "MESG ", "INDEX " };
|
||||||
|
|
|
@ -34,7 +34,7 @@ static int ports_c;
|
||||||
module_param_array(ports, ushort, &ports_c, 0400);
|
module_param_array(ports, ushort, &ports_c, 0400);
|
||||||
|
|
||||||
static int loose;
|
static int loose;
|
||||||
module_param(loose, int, 0600);
|
module_param(loose, bool, 0600);
|
||||||
|
|
||||||
unsigned int (*ip_nat_ftp_hook)(struct sk_buff **pskb,
|
unsigned int (*ip_nat_ftp_hook)(struct sk_buff **pskb,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#define MAX_PORTS 8
|
#define MAX_PORTS 8
|
||||||
static unsigned short ports[MAX_PORTS];
|
static unsigned short ports[MAX_PORTS];
|
||||||
static int ports_c;
|
static int ports_c;
|
||||||
static int max_dcc_channels = 8;
|
static unsigned int max_dcc_channels = 8;
|
||||||
static unsigned int dcc_timeout = 300;
|
static unsigned int dcc_timeout = 300;
|
||||||
/* This is slow, but it's simple. --RR */
|
/* This is slow, but it's simple. --RR */
|
||||||
static char *irc_buffer;
|
static char *irc_buffer;
|
||||||
|
@ -54,9 +54,9 @@ MODULE_DESCRIPTION("IRC (DCC) connection tracking helper");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
module_param_array(ports, ushort, &ports_c, 0400);
|
module_param_array(ports, ushort, &ports_c, 0400);
|
||||||
MODULE_PARM_DESC(ports, "port numbers of IRC servers");
|
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_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");
|
MODULE_PARM_DESC(dcc_timeout, "timeout on for unestablished DCC channels");
|
||||||
|
|
||||||
static const char *dccprotos[] = { "SEND ", "CHAT ", "MOVE ", "TSEND ", "SCHAT " };
|
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");
|
printk("ip_conntrack_irc: max_dcc_channels must be a positive integer\n");
|
||||||
return -EBUSY;
|
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);
|
irc_buffer = kmalloc(65536, GFP_KERNEL);
|
||||||
if (!irc_buffer)
|
if (!irc_buffer)
|
||||||
|
|
|
@ -37,7 +37,7 @@ MODULE_DESCRIPTION("NetBIOS name service broadcast connection tracking helper");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
static unsigned int timeout = 3;
|
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");
|
MODULE_PARM_DESC(timeout, "timeout for master connection/replies in seconds");
|
||||||
|
|
||||||
static int help(struct sk_buff **pskb,
|
static int help(struct sk_buff **pskb,
|
||||||
|
|
|
@ -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)
|
#define PRINTR(format, args...) do { if (net_ratelimit()) printk(format , ## args); } while (0)
|
||||||
|
|
||||||
static unsigned int nlbufsiz = 4096;
|
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");
|
MODULE_PARM_DESC(nlbufsiz, "netlink buffer size");
|
||||||
|
|
||||||
static unsigned int flushtimeout = 10;
|
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)");
|
MODULE_PARM_DESC(flushtimeout, "buffer flush timeout (hundredths of a second)");
|
||||||
|
|
||||||
static unsigned int nflog = 1;
|
static int nflog = 1;
|
||||||
module_param(nflog, int, 0400);
|
module_param(nflog, bool, 0400);
|
||||||
MODULE_PARM_DESC(nflog, "register as internal netfilter logging module");
|
MODULE_PARM_DESC(nflog, "register as internal netfilter logging module");
|
||||||
|
|
||||||
/* global data structures */
|
/* global data structures */
|
||||||
|
@ -376,7 +376,7 @@ static int __init init(void)
|
||||||
|
|
||||||
DEBUGP("ipt_ULOG: init module\n");
|
DEBUGP("ipt_ULOG: init module\n");
|
||||||
|
|
||||||
if (nlbufsiz >= 128*1024) {
|
if (nlbufsiz > 128*1024) {
|
||||||
printk("Netlink buffer has to be <= 128kB\n");
|
printk("Netlink buffer has to be <= 128kB\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,10 +24,10 @@
|
||||||
#define HASH_LOG 9
|
#define HASH_LOG 9
|
||||||
|
|
||||||
/* Defaults, these can be overridden on the module command-line. */
|
/* Defaults, these can be overridden on the module command-line. */
|
||||||
static int ip_list_tot = 100;
|
static unsigned int ip_list_tot = 100;
|
||||||
static int ip_pkt_list_tot = 20;
|
static unsigned int ip_pkt_list_tot = 20;
|
||||||
static int ip_list_hash_size = 0;
|
static unsigned int ip_list_hash_size = 0;
|
||||||
static int ip_list_perms = 0644;
|
static unsigned int ip_list_perms = 0644;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
static int debug = 1;
|
static int debug = 1;
|
||||||
#endif
|
#endif
|
||||||
|
@ -38,13 +38,13 @@ KERN_INFO RECENT_NAME " " RECENT_VER ": Stephen Frost <sfrost@snowman.net>. htt
|
||||||
MODULE_AUTHOR("Stephen Frost <sfrost@snowman.net>");
|
MODULE_AUTHOR("Stephen Frost <sfrost@snowman.net>");
|
||||||
MODULE_DESCRIPTION("IP tables recently seen matching module " RECENT_VER);
|
MODULE_DESCRIPTION("IP tables recently seen matching module " RECENT_VER);
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
module_param(ip_list_tot, int, 0400);
|
module_param(ip_list_tot, uint, 0400);
|
||||||
module_param(ip_pkt_list_tot, int, 0400);
|
module_param(ip_pkt_list_tot, uint, 0400);
|
||||||
module_param(ip_list_hash_size, int, 0400);
|
module_param(ip_list_hash_size, uint, 0400);
|
||||||
module_param(ip_list_perms, int, 0400);
|
module_param(ip_list_perms, uint, 0400);
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
module_param(debug, int, 0600);
|
module_param(debug, bool, 0600);
|
||||||
MODULE_PARM_DESC(debug,"debugging level, defaults to 1");
|
MODULE_PARM_DESC(debug,"enable debugging output");
|
||||||
#endif
|
#endif
|
||||||
MODULE_PARM_DESC(ip_list_tot,"number of IPs to remember per list");
|
MODULE_PARM_DESC(ip_list_tot,"number of IPs to remember per list");
|
||||||
MODULE_PARM_DESC(ip_pkt_list_tot,"number of packets per IP to remember");
|
MODULE_PARM_DESC(ip_pkt_list_tot,"number of packets per IP to remember");
|
||||||
|
|
|
@ -44,7 +44,7 @@ static unsigned int ports_c;
|
||||||
module_param_array(ports, ushort, &ports_c, 0400);
|
module_param_array(ports, ushort, &ports_c, 0400);
|
||||||
|
|
||||||
static int loose;
|
static int loose;
|
||||||
module_param(loose, int, 0600);
|
module_param(loose, bool, 0600);
|
||||||
|
|
||||||
unsigned int (*nf_nat_ftp_hook)(struct sk_buff **pskb,
|
unsigned int (*nf_nat_ftp_hook)(struct sk_buff **pskb,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
|
|
Loading…
Reference in a new issue