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 0CE00C433EF for ; Mon, 30 May 2022 13:38:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237816AbiE3Niw (ORCPT ); Mon, 30 May 2022 09:38:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237750AbiE3Nfn (ORCPT ); Mon, 30 May 2022 09:35:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B443984A13; Mon, 30 May 2022 06:28:49 -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 92038B80DAD; Mon, 30 May 2022 13:28:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4972C385B8; Mon, 30 May 2022 13:28:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653917326; bh=K2Ha6JtZ7cu6X4p0HZ0kxO5UVLehWsWMBYNF/7lW3VA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yj9agz5dH9mNlqkeM9rJtGicBmhConHCsK5TeBzzPgXtVC06Pi6yBW2r9TTyPk7Wf C2+zcWBkQP1L2D8DeXKYFfZVLW4tahmq6qnudty6mFtpwd3YWV6YN2/Ou65Ywui5Tm j2L0xQGCjYYLx8E75mEKdCv2Qq4zKGe0dlCjJzcsfYpbU7hMJYnTC8CufkVcrGsqIZ wuKZASOnn9CkVeLxRcWD8UPPd26MG7tYiZVaT+IDo4sCBhLXYYugdX3jHriGHrqPhX 7YK8yOAUYO7SEkjgdwUeSCeWQX8De3PNiTDtpT1uhBOKTf2rpIqfGz7NL9CAJu6Ho7 cgiJZjWrfbS3A== 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.18 095/159] net: remove two BUG() from skb_checksum_help() Date: Mon, 30 May 2022 09:23:20 -0400 Message-Id: <20220530132425.1929512-95-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530132425.1929512-1-sashal@kernel.org> References: <20220530132425.1929512-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: linux-kernel@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 4a8cefb4967d..d7c558125b64 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3215,11 +3215,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