* [PATCH] netfilter: nf_log: fix error on write NONE to logger choice sysctl
@ 2016-07-01 13:16 Pavel Tikhomirov
2016-07-01 13:53 ` [PATCH v2] " Pavel Tikhomirov
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Tikhomirov @ 2016-07-01 13:16 UTC (permalink / raw)
To: David S. Miller
Cc: Eric Leblond, Pablo Neira Ayuso, Patrick McHardy,
Jozsef Kadlecsik, netfilter-devel, coreteam, netdev,
linux-kernel, Pavel Emelyanov, Konstantin Khorenko,
Pavel Tikhomirov, devel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] netfilter: nf_log: fix error on write NONE to logger choice sysctl
2016-07-01 13:16 [PATCH] netfilter: nf_log: fix error on write NONE to logger choice sysctl Pavel Tikhomirov
@ 2016-07-01 13:53 ` Pavel Tikhomirov
2016-07-06 9:22 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Tikhomirov @ 2016-07-01 13:53 UTC (permalink / raw)
To: David S. Miller
Cc: Eric Leblond, Pablo Neira Ayuso, Patrick McHardy,
Jozsef Kadlecsik, netfilter-devel, coreteam, netdev,
linux-kernel, Pavel Emelyanov, Konstantin Khorenko,
Pavel Tikhomirov, devel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] netfilter: nf_log: fix error on write NONE to logger choice sysctl
2016-07-01 13:53 ` [PATCH v2] " Pavel Tikhomirov
@ 2016-07-06 9:22 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2016-07-06 9:22 UTC (permalink / raw)
To: Pavel Tikhomirov
Cc: David S. Miller, Eric Leblond, Patrick McHardy, Jozsef Kadlecsik,
netfilter-devel, coreteam, netdev, linux-kernel, Pavel Emelyanov,
Konstantin Khorenko, devel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-06 9:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-01 13:16 [PATCH] netfilter: nf_log: fix error on write NONE to logger choice sysctl Pavel Tikhomirov
2016-07-01 13:53 ` [PATCH v2] " Pavel Tikhomirov
2016-07-06 9:22 ` Pablo Neira Ayuso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.