diff options
| author | Gao feng | 2013-09-23 13:20:55 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2013-10-01 12:20:31 +0200 |
| commit | 7433268783eda21a04bf963f9992547a848d44a4 (patch) | |
| tree | b712d180d5f98ee23727416cd6902b1f0047f940 /net/netfilter/nfnetlink_queue_core.c | |
| parent | netfilter: ipset: Add hash:net,port,net module to kernel. (diff) | |
| download | kernel-qcow2-linux-7433268783eda21a04bf963f9992547a848d44a4.tar.gz kernel-qcow2-linux-7433268783eda21a04bf963f9992547a848d44a4.tar.xz kernel-qcow2-linux-7433268783eda21a04bf963f9992547a848d44a4.zip | |
netfilter: nfnetlink_queue: use proper net namespace to allocate skb
Use proper net struct to allocate skb, otherwise netlink mmap
will have no effect.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nfnetlink_queue_core.c')
| -rw-r--r-- | net/netfilter/nfnetlink_queue_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c index ae2e5c11d01a..21258cf70091 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue_core.c @@ -298,7 +298,7 @@ nfqnl_put_packet_info(struct sk_buff *nlskb, struct sk_buff *packet, } static struct sk_buff * -nfqnl_build_packet_message(struct nfqnl_instance *queue, +nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, struct nf_queue_entry *entry, __be32 **packet_id_ptr) { @@ -372,7 +372,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue, if (queue->flags & NFQA_CFG_F_CONNTRACK) ct = nfqnl_ct_get(entskb, &size, &ctinfo); - skb = nfnetlink_alloc_skb(&init_net, size, queue->peer_portid, + skb = nfnetlink_alloc_skb(net, size, queue->peer_portid, GFP_ATOMIC); if (!skb) return NULL; @@ -525,7 +525,7 @@ __nfqnl_enqueue_packet(struct net *net, struct nfqnl_instance *queue, __be32 *packet_id_ptr; int failopen = 0; - nskb = nfqnl_build_packet_message(queue, entry, &packet_id_ptr); + nskb = nfqnl_build_packet_message(net, queue, entry, &packet_id_ptr); if (nskb == NULL) { err = -ENOMEM; goto err_out; |