Received: by 2002:a17:90a:9103:0:0:0:0 with SMTP id k3csp11816570pjo; Thu, 2 Jan 2020 14:47:43 -0800 (PST) X-Google-Smtp-Source: APXvYqxBmOa8npQ2eGD1nVX5DEKfj/lAgxNntaSc9FLg+/CpM8OAic4NSR/aAQ3V4NupCqVE0/gY X-Received: by 2002:a9d:7410:: with SMTP id n16mr82613205otk.23.1578005262956; Thu, 02 Jan 2020 14:47:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578005262; cv=none; d=google.com; s=arc-20160816; b=X23GyaLMFqyes/pX2w5foFzJj3lG8MWSN90zLJ0ZKjmaWCj1jDKcIG0/LPUoP8A+r6 /1WUw/JlLwCU7d7q+dPkwDrqlzca1NtIutneA6g19aKs9DK7hbo2vtCvUIR11Pcjgt+3 LAvdKRSjHGBYS7VOfdceLOQuuTylhVy4oCpflUhpxlgXcpbrKfWJIPv1EwyWvVnXYFtA JfMIXkc8JvutyHi2OG5EG+VpHGZjcsymoDMkJt8tfSZWMDBKCM6KdqNPC5IW//iK53mf O9sZKpFQteFEEbofabTxoTomb83dpdS8opqxilBw3npDMaiEdudy7riBocYk+5ueE1Wp LDtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6FnhzECPO7hEyDL3eVFan3gWwZcU3M7xDM17i2lTj8M=; b=IeP+5l1f7gEOWAyGBP0ouR9TLGG8pDhXKJTTZ9Sg0Rd3WN42KkpDuzJ5kvI9S6SNJq JKCRnMLrkI11FWGg3W2Qi/JA0ZrhIua8mGeMkVeCbZEKRHtBj/6YTyODyDwyIVvAQQm4 wqvlmPB+BckWn25+Y5tQYFyLy2eOVYY+esWqm5yJRnc2kU/H3wxnXmyoo34vkM3gMu8w wFG6MJQ3uF4o1y8dNF7SQdfkZrJWb8B/4gOJOI3DQejTkbhgAQSspHJAzVOhO/1oFp5Z KUvV1l3iObRgEsyeCJSp7GNonBno4SCven7IDNRbKlB0aBMjSJGzlDw9OgDkyQkxF9Tt JdrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f4YYhI2F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l14si31630276otk.225.2020.01.02.14.47.31; Thu, 02 Jan 2020 14:47:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f4YYhI2F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730636AbgABWqV (ORCPT + 99 others); Thu, 2 Jan 2020 17:46:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:35652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730226AbgABWbB (ORCPT ); Thu, 2 Jan 2020 17:31:01 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1F5D520863; Thu, 2 Jan 2020 22:30:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004260; bh=iT8ha0g8v8WDWsKNDeVxAqM6YfuJogpdYejcBs+bGI8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f4YYhI2FXWujTFBzM64OH2ZT2PhUIyzvy+Ktn0ihCcav8itKz+ZysCTj0iP/oYSI1 TzXAJ3UPzurZoDZooPxNl0kxNr2J+tFNQY0tP0hhFqLglT43P2/Wx6ZZIXhelICBxI rzypfTlgQhwIG5B5A7HJLx99OuadmhfupW2gsoks= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jia-Ju Bai , "David S. Miller" Subject: [PATCH 4.9 097/171] net: nfc: nci: fix a possible sleep-in-atomic-context bug in nci_uart_tty_receive() Date: Thu, 2 Jan 2020 23:07:08 +0100 Message-Id: <20200102220600.726195922@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.960200039@linuxfoundation.org> References: <20200102220546.960200039@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jia-Ju Bai [ Upstream commit b7ac893652cafadcf669f78452329727e4e255cc ] The kernel may sleep while holding a spinlock. The function call path (from bottom to top) in Linux 4.19 is: net/nfc/nci/uart.c, 349: nci_skb_alloc in nci_uart_default_recv_buf net/nfc/nci/uart.c, 255: (FUNC_PTR)nci_uart_default_recv_buf in nci_uart_tty_receive net/nfc/nci/uart.c, 254: spin_lock in nci_uart_tty_receive nci_skb_alloc(GFP_KERNEL) can sleep at runtime. (FUNC_PTR) means a function pointer is called. To fix this bug, GFP_KERNEL is replaced with GFP_ATOMIC for nci_skb_alloc(). This bug is found by a static analysis tool STCheck written by myself. Signed-off-by: Jia-Ju Bai Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/nfc/nci/uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/nfc/nci/uart.c +++ b/net/nfc/nci/uart.c @@ -348,7 +348,7 @@ static int nci_uart_default_recv_buf(str nu->rx_packet_len = -1; nu->rx_skb = nci_skb_alloc(nu->ndev, NCI_MAX_PACKET_SIZE, - GFP_KERNEL); + GFP_ATOMIC); if (!nu->rx_skb) return -ENOMEM; }