From: Samuel Ortiz <sameo@linux.intel.com>
Date: Wed, 14 Dec 2011 15:43:08 +0000 (+0100)
Subject: NFC: Atomic socket allocation
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=db81a62451b24eaef59f41e6fb312a88e1a83454;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

NFC: Atomic socket allocation

rawsock_create() is called with preemption disabled, so we should not
sleep.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
index 11ac0a17156e..2e2f8c6a61fe 100644
--- a/net/nfc/rawsock.c
+++ b/net/nfc/rawsock.c
@@ -310,7 +310,7 @@ static int rawsock_create(struct net *net, struct socket *sock,
 
 	sock->ops = &rawsock_ops;
 
-	sk = sk_alloc(net, PF_NFC, GFP_KERNEL, nfc_proto->proto);
+	sk = sk_alloc(net, PF_NFC, GFP_ATOMIC, nfc_proto->proto);
 	if (!sk)
 		return -ENOMEM;