diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2007-07-08 01:40:08 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:18:21 -0400 |
commit | ce7663d84a87bb4e1743f62950bf7dceed723a13 (patch) | |
tree | 3c1b16e33913199da3181b92ed7dc0fbb6e0aa64 /net/netfilter/nfnetlink_queue.c | |
parent | 0d53778e81ac7af266dac8a20cc328328c327112 (diff) |
[NETFILTER]: nfnetlink_queue: don't unregister handler of other subsystem
The queue handlers registered by ip[6]_queue.ko at initialization should
not be unregistered according to requests from userland program
using nfnetlink_queue. If we allow that, there is no way to register
the handlers of built-in ip[6]_queue again.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nfnetlink_queue.c')
-rw-r--r-- | net/netfilter/nfnetlink_queue.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 7a97bec6772..7d47fc4b19c 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c | |||
@@ -913,9 +913,7 @@ nfqnl_recv_config(struct sock *ctnl, struct sk_buff *skb, | |||
913 | case NFQNL_CFG_CMD_PF_UNBIND: | 913 | case NFQNL_CFG_CMD_PF_UNBIND: |
914 | QDEBUG("unregistering queue handler for pf=%u\n", | 914 | QDEBUG("unregistering queue handler for pf=%u\n", |
915 | ntohs(cmd->pf)); | 915 | ntohs(cmd->pf)); |
916 | /* This is a bug and a feature. We can unregister | 916 | ret = nf_unregister_queue_handler(ntohs(cmd->pf), &nfqh); |
917 | * other handlers(!) */ | ||
918 | ret = nf_unregister_queue_handler(ntohs(cmd->pf)); | ||
919 | break; | 917 | break; |
920 | default: | 918 | default: |
921 | ret = -EINVAL; | 919 | ret = -EINVAL; |