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 BD5D9C54EE9 for ; Tue, 30 Aug 2022 17:26:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231564AbiH3R05 (ORCPT ); Tue, 30 Aug 2022 13:26:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231598AbiH3R0U (ORCPT ); Tue, 30 Aug 2022 13:26:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3657F11F1BF; Tue, 30 Aug 2022 10:24:27 -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 dfw.source.kernel.org (Postfix) with ESMTPS id B23C8617B4; Tue, 30 Aug 2022 17:24:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D7BDC433C1; Tue, 30 Aug 2022 17:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661880256; bh=yAp8ZMi8qH8KS1kr4ogQHHKmeUCwzaZ840SmHCAlZ8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OtrajiZ/+tiA9vKaBmLcdr3vjgD1TdGpjT3pk+arJiKvPYKU+cdF6PccfS7Fz1Ctg Mh33iWNo9PChvWzeTtWtQ2LOimkHqozX3KS5Hw86XD4XPFNIK/lZVB6b3RpaDOgk/l 3UErOLS+dql3ynrSTkYvg1D03H+djj3vImaifIK2NKM8vNbNfrfHD5Rm6GVAogED4+ hKwjqm6nYV/g3Qltur+hmLtTjgkLf4RNcNybU5Q7XR2Qt8vfVBtTBt7w3KVOn6XUtY 4i7VcPHoPcdp9BAOPcrLBTaCQ3N99I6z01yz2oa65Qdx/GSVqD8e8kd9S/yMqpT3c7 LcK0SLu0sDWuQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: lily , "David S . Miller" , Sasha Levin , edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, asml.silence@gmail.com, imagedong@tencent.com, luiz.von.dentz@intel.com, vasily.averin@linux.dev, jk@codeconstruct.com.au, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 13/16] net/core/skbuff: Check the return value of skb_copy_bits() Date: Tue, 30 Aug 2022 13:23:14 -0400 Message-Id: <20220830172317.581397-13-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220830172317.581397-1-sashal@kernel.org> References: <20220830172317.581397-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: lily [ Upstream commit c624c58e08b15105662b9ab9be23d14a6b945a49 ] skb_copy_bits() could fail, which requires a check on the return value. Signed-off-by: Li Zhong Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/skbuff.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 48b6438f2a3d9..548f1adc14284 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3986,9 +3986,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, SKB_GSO_CB(nskb)->csum_start = skb_headroom(nskb) + doffset; } else { - skb_copy_bits(head_skb, offset, - skb_put(nskb, len), - len); + if (skb_copy_bits(head_skb, offset, skb_put(nskb, len), len)) + goto err; } continue; } -- 2.35.1