From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9D217466 for ; Fri, 8 Sep 2023 23:59:04 +0000 (UTC) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8614C18E; Fri, 8 Sep 2023 16:59:02 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2D8F15C01D4; Fri, 8 Sep 2023 19:59:00 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 08 Sep 2023 19:59:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jcline.org; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm1; t=1694217540; x=1694303940; bh=5hPh3+A1H4 jBnyK3iCCM3bu6cw6mebsPN+ivH9DugBY=; b=a+a5xsQd2PAdpoDepP++GoZdkb RKTMbSDjw2ShX0Bt+cIK85NR6rD5RbqOQ/9y4iVnM1uVbVLnvuLt3Gm2vsLK5hON fWG7WOLd0m9qp1Hsodl/c+V07OHZdC0WPIhG9qqD+7Jm0hbQbVgDBSz5sLpfpicP w7SlUvaMilNVwKhmXVGyZHiZ8yNud2o7JYYpYm7NYRlDOC78vs+5Ff5/FSIeO1CZ wXTVM1gX+gq6boljjXo6Z//Y8gpRjJtUbjGR/YHU39F9K3765JNnnxtc204aU5qG AiGON/ZztWNywezQqr8cXkRyePv0W82BdSvDaWEd/A1roPxzyUGB/efAMNQg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1694217540; x=1694303940; bh=5hPh3+A1H4jBn yK3iCCM3bu6cw6mebsPN+ivH9DugBY=; b=2PBqp+Nl7uaqC2epPYIfFSFMrqSWd To5kX28VbPIvStwzKoJ/lBx1lGz+49twRUu9EzuVKCdrIz/WokyNSLGEK9c+XnK4 VRSS1iaK0E2vBd/0zqliAyYkLXt4q/LB1jo+4c54G0C/vgB2y3QrxP4YKzMqETTm kv3NfsQwO/9JIpr82Lmr/iaU7XbXtbfY0kGUTL90cnZOXNcs8aXl26eLB22S23kk 6QZjUL8+EfTBIaEFVEmO1XHS2cVRzN3Yaa9sGVZW6WM4WyRSZLvOqRxpEzztF2Fm Q23VpAs3aPuy/1XTaag3vu6nu6ckyFfG5QIdCkH5o7RBofBqIxnzO5b9g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudehkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheplfgvrhgvmhih ucevlhhinhgvuceojhgvrhgvmhihsehjtghlihhnvgdrohhrgheqnecuggftrfgrthhtvg hrnhepveelveefheeuhffhieduvefgudefiedvfeduteejlefflefggfekvdeuhffgteev necuffhomhgrihhnpehshiiikhgrlhhlvghrrdgrphhpshhpohhtrdgtohhmnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhgvrhgvmhihsehj tghlihhnvgdrohhrgh X-ME-Proxy: Feedback-ID: i7a7146c5:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 8 Sep 2023 19:58:59 -0400 (EDT) From: Jeremy Cline To: Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jeremy Cline , syzbot+c1d0a03d305972dbbe14@syzkaller.appspotmail.com Subject: [PATCH net] net: nfc: llcp: Add lock when modifying device list Date: Fri, 8 Sep 2023 19:58:53 -0400 Message-ID: <20230908235853.1319596-1-jeremy@jcline.org> X-Mailer: git-send-email 2.41.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net The device list needs its associated lock held when modifying it, or the list could become corrupted, as syzbot discovered. Reported-and-tested-by: syzbot+c1d0a03d305972dbbe14@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=c1d0a03d305972dbbe14 Signed-off-by: Jeremy Cline --- net/nfc/llcp_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index f60e424e0607..6705bb895e23 100644 --- a/net/nfc/llcp_core.c +++ b/net/nfc/llcp_core.c @@ -1636,7 +1636,9 @@ int nfc_llcp_register_device(struct nfc_dev *ndev) timer_setup(&local->sdreq_timer, nfc_llcp_sdreq_timer, 0); INIT_WORK(&local->sdreq_timeout_work, nfc_llcp_sdreq_timeout_work); + spin_lock(&llcp_devices_lock); list_add(&local->list, &llcp_devices); + spin_unlock(&llcp_devices_lock); return 0; } -- 2.41.0