Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1435344 > unrolled thread
| Started by | Pavel Tikhomirov <ptikhomirov@virtuozzo.com> |
|---|---|
| First post | 2016-07-01 15:50 +0200 |
| Last post | 2016-07-06 11:30 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] netfilter: nf_log: fix error on write NONE to logger choice sysctl Pavel Tikhomirov <ptikhomirov@virtuozzo.com> - 2016-07-01 15:50 +0200
[PATCH v2] netfilter: nf_log: fix error on write NONE to logger choice sysctl Pavel Tikhomirov <ptikhomirov@virtuozzo.com> - 2016-07-01 16:00 +0200
Re: [PATCH v2] netfilter: nf_log: fix error on write NONE to logger choice sysctl Pablo Neira Ayuso <pablo@netfilter.org> - 2016-07-06 11:30 +0200
| From | Pavel Tikhomirov <ptikhomirov@virtuozzo.com> |
|---|---|
| Date | 2016-07-01 15:50 +0200 |
| Subject | [PATCH] netfilter: nf_log: fix error on write NONE to logger choice sysctl |
| Message-ID | <rQ6Zs-7ge-17@gated-at.bofh.it> |
It is hard to unbind nf-logger:
echo NONE > /proc/sys/net/netfilter/nf_log/0
bash: echo: write error: No such file or directory
sysctl -w net.netfilter.nf_log.0=NONE
sysctl: setting key "net.netfilter.nf_log.0": No such file or directory
net.netfilter.nf_log.0 = NONE
You need explicitly send '\0', for instance like:
echo -e "NONE\0" > /proc/sys/net/netfilter/nf_log/0
That seem to be strange, so fix it using proc_dostring.
Now it works fine:
modprobe nfnetlink_log
echo nfnetlink_log > /proc/sys/net/netfilter/nf_log/0
cat /proc/sys/net/netfilter/nf_log/0
nfnetlink_log
echo NONE > /proc/sys/net/netfilter/nf_log/0
cat /proc/sys/net/netfilter/nf_log/0
NONE
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
net/netfilter/nf_log.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index a5d41df..c7c5882 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -398,16 +398,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
{
const struct nf_logger *logger;
char buf[NFLOGGER_NAME_LEN];
- size_t size = *lenp;
int r = 0;
int tindex = (unsigned long)table->extra1;
struct net *net = current->nsproxy->net_ns;
if (write) {
- if (size > sizeof(buf))
- size = sizeof(buf);
- if (copy_from_user(buf, buffer, size))
- return -EFAULT;
+ struct ctl_table tmp = *table;
+
+ tmp.data = buf;
+ proc_dostring(&tmp, write, buffer, lenp, ppos);
if (!strcmp(buf, "NONE")) {
nf_log_unbind_pf(net, tindex);
--
2.5.5
[toc] | [next] | [standalone]
| From | Pavel Tikhomirov <ptikhomirov@virtuozzo.com> |
|---|---|
| Date | 2016-07-01 16:00 +0200 |
| Subject | [PATCH v2] netfilter: nf_log: fix error on write NONE to logger choice sysctl |
| Message-ID | <rQ798-7jz-29@gated-at.bofh.it> |
| In reply to | #1435344 |
It is hard to unbind nf-logger:
echo NONE > /proc/sys/net/netfilter/nf_log/0
bash: echo: write error: No such file or directory
sysctl -w net.netfilter.nf_log.0=NONE
sysctl: setting key "net.netfilter.nf_log.0": No such file or directory
net.netfilter.nf_log.0 = NONE
You need explicitly send '\0', for instance like:
echo -e "NONE\0" > /proc/sys/net/netfilter/nf_log/0
That seem to be strange, so fix it using proc_dostring.
Now it works fine:
modprobe nfnetlink_log
echo nfnetlink_log > /proc/sys/net/netfilter/nf_log/0
cat /proc/sys/net/netfilter/nf_log/0
nfnetlink_log
echo NONE > /proc/sys/net/netfilter/nf_log/0
cat /proc/sys/net/netfilter/nf_log/0
NONE
v2: add missed error check for proc_dostring
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
net/netfilter/nf_log.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index a5d41df..58ea5b0 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -398,16 +398,17 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
{
const struct nf_logger *logger;
char buf[NFLOGGER_NAME_LEN];
- size_t size = *lenp;
int r = 0;
int tindex = (unsigned long)table->extra1;
struct net *net = current->nsproxy->net_ns;
if (write) {
- if (size > sizeof(buf))
- size = sizeof(buf);
- if (copy_from_user(buf, buffer, size))
- return -EFAULT;
+ struct ctl_table tmp = *table;
+
+ tmp.data = buf;
+ r = proc_dostring(&tmp, write, buffer, lenp, ppos);
+ if (r)
+ return r;
if (!strcmp(buf, "NONE")) {
nf_log_unbind_pf(net, tindex);
--
2.5.5
[toc] | [prev] | [next] | [standalone]
| From | Pablo Neira Ayuso <pablo@netfilter.org> |
|---|---|
| Date | 2016-07-06 11:30 +0200 |
| Subject | Re: [PATCH v2] netfilter: nf_log: fix error on write NONE to logger choice sysctl |
| Message-ID | <rRRjz-7oL-1@gated-at.bofh.it> |
| In reply to | #1435348 |
On Fri, Jul 01, 2016 at 04:53:54PM +0300, Pavel Tikhomirov wrote: > It is hard to unbind nf-logger: > > echo NONE > /proc/sys/net/netfilter/nf_log/0 > bash: echo: write error: No such file or directory > > sysctl -w net.netfilter.nf_log.0=NONE > sysctl: setting key "net.netfilter.nf_log.0": No such file or directory > net.netfilter.nf_log.0 = NONE > > You need explicitly send '\0', for instance like: > > echo -e "NONE\0" > /proc/sys/net/netfilter/nf_log/0 > > That seem to be strange, so fix it using proc_dostring. > > Now it works fine: > modprobe nfnetlink_log > echo nfnetlink_log > /proc/sys/net/netfilter/nf_log/0 > cat /proc/sys/net/netfilter/nf_log/0 > nfnetlink_log > echo NONE > /proc/sys/net/netfilter/nf_log/0 > cat /proc/sys/net/netfilter/nf_log/0 > NONE Applied, thanks.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web