From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1A8872E62C; Mon, 8 Apr 2024 13:02:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712581326; cv=none; b=OMQpmet5QTFIiA9hMqCEVOxsELYRPNX0afk7+C9WBacdgSPb/aNYwyTIoswmoMfouZDpYvALOV1/Vv/LWka8OfR4IWOhTvjNVRo987lbKoJv1xumOpdXuk7YYjUohQG7vaXrPNBHaaMwjr1etsSrz9LggsZBFt6equ7mp/buC7g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712581326; c=relaxed/simple; bh=AZPEGhXvjZV0T50lW2inuiZxe69+gwvyCt8uC7HDV1k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rDbyiN7D3m8qshfyfC8/6/Fgknkw/1HBB0jFD3PHazXi5dh6F/GpxNNUXBzDv4d8euPYZLqiZY90H4g1ZTEyU06Rbh6xiSM1feIOJ6YC/L0KaxPod3p936Y7ryN52SuO5WprYWdxOldEy4yQdh39FvgjCIlXQrlUbA3hyWzU1bM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NCyBmtTD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NCyBmtTD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 941ABC433C7; Mon, 8 Apr 2024 13:02:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712581326; bh=AZPEGhXvjZV0T50lW2inuiZxe69+gwvyCt8uC7HDV1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NCyBmtTD7cnztTl/bakXS8AsbD65Wa8Lb/9YpOQQzkqF8EJ471WbMRkqj5ZrZq2Kl x89OA0ilOYRvdkiqRLdKQxO18/ThOmYbWbuNLfNQVTxW8UWx/1nm3iMM6kEi63qRub WcwmstWcTpochyRpiwcwtb2XevLX2wb4zB9ImZHk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ryosuke Yasuoka , Jeremy Cline , Krzysztof Kozlowski , "David S. Miller" , Sasha Levin , syzbot+7ea9413ea6749baf5574@syzkaller.appspotmail.com, syzbot+29b5ca705d2e0f4a44d2@syzkaller.appspotmail.com Subject: [PATCH 6.1 003/138] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet Date: Mon, 8 Apr 2024 14:56:57 +0200 Message-ID: <20240408125256.329926010@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125256.218368873@linuxfoundation.org> References: <20240408125256.218368873@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ryosuke Yasuoka [ Upstream commit d24b03535e5eb82e025219c2f632b485409c898f ] syzbot reported the following uninit-value access issue [1][2]: nci_rx_work() parses and processes received packet. When the payload length is zero, each message type handler reads uninitialized payload and KMSAN detects this issue. The receipt of a packet with a zero-size payload is considered unexpected, and therefore, such packets should be silently discarded. This patch resolved this issue by checking payload size before calling each message type handler codes. Fixes: 6a2968aaf50c ("NFC: basic NCI protocol implementation") Reported-and-tested-by: syzbot+7ea9413ea6749baf5574@syzkaller.appspotmail.com Reported-and-tested-by: syzbot+29b5ca705d2e0f4a44d2@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=7ea9413ea6749baf5574 [1] Closes: https://syzkaller.appspot.com/bug?extid=29b5ca705d2e0f4a44d2 [2] Signed-off-by: Ryosuke Yasuoka Reviewed-by: Jeremy Cline Reviewed-by: Krzysztof Kozlowski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/nfc/nci/core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index b5071a2f597d4..f76a2d8060340 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -1512,6 +1512,11 @@ static void nci_rx_work(struct work_struct *work) nfc_send_to_raw_sock(ndev->nfc_dev, skb, RAW_PAYLOAD_NCI, NFC_DIRECTION_RX); + if (!nci_plen(skb->data)) { + kfree_skb(skb); + break; + } + /* Process frame */ switch (nci_mt(skb->data)) { case NCI_MT_RSP_PKT: -- 2.43.0