From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE8E0C433F5 for ; Mon, 30 May 2022 14:12:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239782AbiE3OKI (ORCPT ); Mon, 30 May 2022 10:10:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240077AbiE3OG2 (ORCPT ); Mon, 30 May 2022 10:06:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E7AF35AAF; Mon, 30 May 2022 06:41:54 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id EF9BEB80D86; Mon, 30 May 2022 13:41:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40590C3411C; Mon, 30 May 2022 13:41:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653918110; bh=ENYoUzxPB664IG1sN5huDvIcLEy/V+cCgsIQBznRbKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MOOUJnKoHXi1OODJji/4uozjCxJlDNPnvUqUvahcy13bJ2LFFEZerLGsLKhWpBXF6 nXe6YatXAfJniVqkzS8q4DP4lcx2Nfs6+iT3mBbXL43gukVWtZOFgseAAGGvMK1QrQ HvyCJaLHX1MM/GhhN12VF/8+2MF7OCLTf2JCt92eCxKAGHBdZJ9mHJcJe9CNPRgSOw bEGlBp5GZAQJUL//WQZq1dNZeEIAeycbdZGe9iH1Rg8pccRExyT58rH0uGequ2pyiO t74eTKaRu456FRvVwDhpjh98SEX/o9Iyf8CUW0sp/ssbPkiNkZzPOmcaz64HVMaqPA 1BYNH7hMM7Vvw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , "David S . Miller" , Sasha Levin , kuba@kernel.org, pabeni@redhat.com, bigeasy@linutronix.de, imagedong@tencent.com, petrm@nvidia.com, memxor@gmail.com, arnd@arndb.de, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 064/109] net: remove two BUG() from skb_checksum_help() Date: Mon, 30 May 2022 09:37:40 -0400 Message-Id: <20220530133825.1933431-64-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530133825.1933431-1-sashal@kernel.org> References: <20220530133825.1933431-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet [ Upstream commit d7ea0d9df2a6265b2b180d17ebc64b38105968fc ] I have a syzbot report that managed to get a crash in skb_checksum_help() If syzbot can trigger these BUG(), it makes sense to replace them with more friendly WARN_ON_ONCE() since skb_checksum_help() can instead return an error code. Note that syzbot will still crash there, until real bug is fixed. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/dev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 5907212c00f3..b9731b267d07 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3233,11 +3233,15 @@ int skb_checksum_help(struct sk_buff *skb) } offset = skb_checksum_start_offset(skb); - BUG_ON(offset >= skb_headlen(skb)); + ret = -EINVAL; + if (WARN_ON_ONCE(offset >= skb_headlen(skb))) + goto out; + csum = skb_checksum(skb, offset, skb->len - offset, 0); offset += skb->csum_offset; - BUG_ON(offset + sizeof(__sum16) > skb_headlen(skb)); + if (WARN_ON_ONCE(offset + sizeof(__sum16) > skb_headlen(skb))) + goto out; ret = skb_ensure_writable(skb, offset + sizeof(__sum16)); if (ret) -- 2.35.1