diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-03-10 16:44:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-10 16:44:36 -0700 |
| commit | 914afea84e3e20cdbcd040f8387a0e6ef20ffc97 (patch) | |
| tree | 68d7e80bd238f2c2b794825213e3385c9db49de3 /net | |
| parent | b7047a1c886386b10a103b4fea26678db8b57832 (diff) | |
| download | linux-914afea84e3e20cdbcd040f8387a0e6ef20ffc97.tar.gz linux-914afea84e3e20cdbcd040f8387a0e6ef20ffc97.tar.bz2 linux-914afea84e3e20cdbcd040f8387a0e6ef20ffc97.zip | |
[NETFILTER]: nfnetlink_queue: fix EPERM when binding/unbinding and instance 0 exists
Similar to the nfnetlink_log problem, nfnetlink_queue incorrectly
returns -EPERM when binding or unbinding to an address family and
queueing instance 0 exists and is owned by a different process. Unlike
nfnetlink_log it previously completes the operation, but it is still
incorrect.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nfnetlink_queue.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index c0cc3d3618a3..012cb6910820 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -703,19 +703,12 @@ nfqnl_recv_config(struct sock *ctnl, struct sk_buff *skb, /* Commands without queue context - might sleep */ switch (cmd->command) { case NFQNL_CFG_CMD_PF_BIND: - ret = nf_register_queue_handler(ntohs(cmd->pf), - &nfqh); - break; + return nf_register_queue_handler(ntohs(cmd->pf), + &nfqh); case NFQNL_CFG_CMD_PF_UNBIND: - ret = nf_unregister_queue_handler(ntohs(cmd->pf), - &nfqh); - break; - default: - break; + return nf_unregister_queue_handler(ntohs(cmd->pf), + &nfqh); } - - if (ret < 0) - return ret; } rcu_read_lock(); |