Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
netfilter
/
nf_log.c
diff --git
a/kernel/net/netfilter/nf_log.c
b/kernel/net/netfilter/nf_log.c
index
a5d41df
..
2c89f90
100644
(file)
--- a/
kernel/net/netfilter/nf_log.c
+++ b/
kernel/net/netfilter/nf_log.c
@@
-401,7
+401,7
@@
static int nf_log_proc_dostring(struct ctl_table *table, int write,
size_t size = *lenp;
int r = 0;
int tindex = (unsigned long)table->extra1;
size_t size = *lenp;
int r = 0;
int tindex = (unsigned long)table->extra1;
- struct net *net =
current->nsproxy->net_ns
;
+ struct net *net =
table->extra2
;
if (write) {
if (size > sizeof(buf))
if (write) {
if (size > sizeof(buf))
@@
-453,7
+453,6
@@
static int netfilter_log_sysctl_init(struct net *net)
3, "%d", i);
nf_log_sysctl_table[i].procname =
nf_log_sysctl_fnames[i];
3, "%d", i);
nf_log_sysctl_table[i].procname =
nf_log_sysctl_fnames[i];
- nf_log_sysctl_table[i].data = NULL;
nf_log_sysctl_table[i].maxlen = NFLOGGER_NAME_LEN;
nf_log_sysctl_table[i].mode = 0644;
nf_log_sysctl_table[i].proc_handler =
nf_log_sysctl_table[i].maxlen = NFLOGGER_NAME_LEN;
nf_log_sysctl_table[i].mode = 0644;
nf_log_sysctl_table[i].proc_handler =
@@
-463,6
+462,9
@@
static int netfilter_log_sysctl_init(struct net *net)
}
}
}
}
+ for (i = NFPROTO_UNSPEC; i < NFPROTO_NUMPROTO; i++)
+ table[i].extra2 = net;
+
net->nf.nf_log_dir_header = register_net_sysctl(net,
"net/netfilter/nf_log",
table);
net->nf.nf_log_dir_header = register_net_sysctl(net,
"net/netfilter/nf_log",
table);