Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afff14f6 authored by Gao feng's avatar Gao feng Committed by Pablo Neira Ayuso
Browse files

netfilter: nfnetlink_log: use proper net to allocate skb 



Use proper net struct to allocate skb, otherwise
netlink mmap will be of no effect.

Signed-off-by: default avatarGao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 74332687

net/netfilter/nfnetlink_log.c

+6 −5
Original line number Diff line number Diff line
@@ -319,7 +319,8 @@ nfulnl_set_flags(struct nfulnl_instance *inst, u_int16_t flags) 
}



static struct sk_buff *

nfulnl_alloc_skb(u32 peer_portid, unsigned int inst_size, unsigned int pkt_size)

nfulnl_alloc_skb(struct net *net, u32 peer_portid, unsigned int inst_size,

		 unsigned int pkt_size)

{

	struct sk_buff *skb;

	unsigned int n;
@@ -328,13 +329,13 @@ nfulnl_alloc_skb(u32 peer_portid, unsigned int inst_size, unsigned int pkt_size) 
	 * message.  WARNING: has to be <= 128k due to slab restrictions */



	n = max(inst_size, pkt_size);

	skb = nfnetlink_alloc_skb(&init_net, n, peer_portid, GFP_ATOMIC);

	skb = nfnetlink_alloc_skb(net, n, peer_portid, GFP_ATOMIC);

	if (!skb) {

		if (n > pkt_size) {

			/* try to allocate only as much as we need for current

			 * packet */



			skb = nfnetlink_alloc_skb(&init_net, pkt_size,

			skb = nfnetlink_alloc_skb(net, pkt_size,

						  peer_portid, GFP_ATOMIC);

			if (!skb)

				pr_err("nfnetlink_log: can't even alloc %u bytes\n",
@@ -702,8 +703,8 @@ nfulnl_log_packet(struct net *net, 
	}



	if (!inst->skb) {

		inst->skb = nfulnl_alloc_skb(inst->peer_portid, inst->nlbufsiz,

					     size);

		inst->skb = nfulnl_alloc_skb(net, inst->peer_portid,

					     inst->nlbufsiz, size);

		if (!inst->skb)

			goto alloc_failure;

	}