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

Commit 3ec19255 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlock 



The previous fix for the conntrack creation race (netfilter: ctnetlink:
fix conntrack creation race) missed a GFP_KERNEL allocation that is
now performed while holding a spinlock. Switch to GFP_ATOMIC.

Reported-and-tested-by: default avatarZoltan Borbely <bozo@andrews.hu>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd511269

net/netfilter/nf_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[], 
		}

	}



	nf_ct_acct_ext_add(ct, GFP_KERNEL);

	nf_ct_acct_ext_add(ct, GFP_ATOMIC);



#if defined(CONFIG_NF_CONNTRACK_MARK)

	if (cda[CTA_MARK])