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 09F1413E8A5; Tue, 14 May 2024 10:46:27 +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=1715683587; cv=none; b=AHo5GY++8swCVIIalmJNvxMChbuFqPyFoslOdCVKn7FrhxmAEqMhSKP0W7UnYAozGafe1KGC64S6wWiEo/3SwWmAwyaLE3daE3BRzbiiTIxe/jt52T53HmtS/hQND9RcccBVkEBhDLXkZ0eyJW8mMSdFVY+P5wopHZwBRjZNjwU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715683587; c=relaxed/simple; bh=GpLGX9kVoP0ZTbXVl8i6ai9lK9IYxSquGk+Mof7L+W8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hwj1iq58XC7mnB6CWD0THbwvlvJQlk6twAnJwhvqBsgGT02OknQN4FXZjrq5x8MHMFrdQqL3fmnsLw7dpTnArRrUjFJttBilEQqR/IjtEgzSk0+iuzc87ZJZ9Ir+ONsD4P5ejZHLQHuXXSY7x50xSEdpb8MWqrxmb6a3Tca/pq0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FLJAu/OK; 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="FLJAu/OK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7A07C2BD10; Tue, 14 May 2024 10:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715683586; bh=GpLGX9kVoP0ZTbXVl8i6ai9lK9IYxSquGk+Mof7L+W8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FLJAu/OKG3AUpap9NYSatw4dmCr/qOgs7wxMWBCIC2kTxGl2bDE1UNlsLlw2FRBzS jkz3XEQjAtSJ+K3f+dCj9zkAP5EZcoJnFZLob8P1uvpYUCPwGOy4aRPdM2B6SWEbm3 Y0ye/GwTx71tM60kmk3UnouC7F1St4EOU7JSyCbM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot , Andrey Konovalov , Tetsuo Handa , Krzysztof Kozlowski , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.8 212/336] nfc: nci: Fix kcov check in nci_rx_work() Date: Tue, 14 May 2024 12:16:56 +0200 Message-ID: <20240514101046.616317911@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101038.595152603@linuxfoundation.org> References: <20240514101038.595152603@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tetsuo Handa [ Upstream commit 19e35f24750ddf860c51e51c68cf07ea181b4881 ] Commit 7e8cdc97148c ("nfc: Add KCOV annotations") added kcov_remote_start_common()/kcov_remote_stop() pair into nci_rx_work(), with an assumption that kcov_remote_stop() is called upon continue of the for loop. But commit d24b03535e5e ("nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet") forgot to call kcov_remote_stop() before break of the for loop. Reported-by: syzbot Closes: https://syzkaller.appspot.com/bug?extid=0438378d6f157baae1a2 Fixes: d24b03535e5e ("nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet") Suggested-by: Andrey Konovalov Signed-off-by: Tetsuo Handa Reviewed-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/6d10f829-5a0c-405a-b39a-d7266f3a1a0b@I-love.SAKURA.ne.jp Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/nfc/nci/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 0d26c8ec9993e..b133dc55304ce 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -1518,6 +1518,7 @@ static void nci_rx_work(struct work_struct *work) if (!nci_plen(skb->data)) { kfree_skb(skb); + kcov_remote_stop(); break; } -- 2.43.0