leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NETFILTER]: nfnetlink_queue: don't unregister handler of other subsystem

Browse Source 
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>
This commit is contained in:
Yasuyuki Kozakai 2007-07-07 22:40:08 -07:00 committed by David S. Miller
parent 0d53778e81
commit ce7663d84a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/netfilter.h
View File

@ -275,7 +275,8 @@ struct nf_queue_handler {
}; };
extern int nf_register_queue_handler(int pf, extern int nf_register_queue_handler(int pf,
struct nf_queue_handler *qh); struct nf_queue_handler *qh);
extern int nf_unregister_queue_handler(int pf); extern int nf_unregister_queue_handler(int pf,
struct nf_queue_handler *qh);
extern void nf_unregister_queue_handlers(struct nf_queue_handler *qh); extern void nf_unregister_queue_handlers(struct nf_queue_handler *qh);
extern void nf_reinject(struct sk_buff *skb, extern void nf_reinject(struct sk_buff *skb,
struct nf_info *info, struct nf_info *info,

7
net/netfilter/nf_queue.c
View File

@ -44,12 +44,17 @@ int nf_register_queue_handler(int pf, struct nf_queue_handler *qh)
EXPORT_SYMBOL(nf_register_queue_handler); EXPORT_SYMBOL(nf_register_queue_handler);
/* The caller must flush their queue before this */ /* The caller must flush their queue before this */
int nf_unregister_queue_handler(int pf) int nf_unregister_queue_handler(int pf, struct nf_queue_handler *qh)
{ {
if (pf >= NPROTO) if (pf >= NPROTO)
return -EINVAL; return -EINVAL;
write_lock_bh(&queue_handler_lock); write_lock_bh(&queue_handler_lock);
if (queue_handler[pf] != qh) {
write_unlock_bh(&queue_handler_lock);
return -EINVAL;
}
queue_handler[pf] = NULL; queue_handler[pf] = NULL;
write_unlock_bh(&queue_handler_lock); write_unlock_bh(&queue_handler_lock);

4
net/netfilter/nfnetlink_queue.c
View File

@ -913,9 +913,7 @@ nfqnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
case NFQNL_CFG_CMD_PF_UNBIND: case NFQNL_CFG_CMD_PF_UNBIND:
QDEBUG("unregistering queue handler for pf=%u\n", QDEBUG("unregistering queue handler for pf=%u\n",
ntohs(cmd->pf)); ntohs(cmd->pf));
/* This is a bug and a feature. We can unregister ret = nf_unregister_queue_handler(ntohs(cmd->pf), &nfqh);
* other handlers(!) */
ret = nf_unregister_queue_handler(ntohs(cmd->pf));
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;