Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp595961rwb; Thu, 1 Dec 2022 06:12:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Ox7O9Lz4sgWGaiUlLahIKrFLto14hNto61AiCUAsuq0b2Xf3SLf6wgWcu/Y0+qbZgj3HQ X-Received: by 2002:a17:902:aa04:b0:17f:6fee:3334 with SMTP id be4-20020a170902aa0400b0017f6fee3334mr48324194plb.10.1669903950176; Thu, 01 Dec 2022 06:12:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669903950; cv=none; d=google.com; s=arc-20160816; b=j0/2W5/jU90Cl/zZFQ9/ELvvro+yGWAyNovkOsJ/mLAy0ZzLHzE01YR3HLB+cHN+Et nN8e0U73rnWJUoS8qM7SgQY4QkXapcRu8oE0gF8vclrHmV5wntCjUgam0C33FIUBpWCq EORMj3r2CuuxykWBeFnKMJfBRNJWP1CGLe2nEMx5cpVdmLyg4/MTn8OUfkz56kUh9cBp eHlzeKjUxq33RdzXd7dt+W42WmA8QqXLuReeIuOrO5IwyolvmlaBdtXzIPmxt/LknydT 0ePPJmQWawKWqH18cXd129lO8QecDFaBwODypyIeOARPZLEzunvbAbSK4GYW3WxPz9KB WGsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=YnBGKAO+NMoDiT20N9ZG2N/t9qm9UWjtmEuKmt4AYJE=; b=vjEPNU7b05Zz3uRrBlKHEUCopNpKtSy4G5NPe2tc9dkNk2DW7v7kaHqpDJwZCYYrU0 4q9WNOCr5eoKWnmFKkI4DLjWXhZtJ6sRJfYVqAEjqKgZkrIzxErFrhUa35hRDQQctLp2 2CoQKSELaqmuxw8G04ljF2TiC3utm53wICkXjiJ84MyZqTVhcvrchxaMv03Bp4pLQaVc 9ythGlvT6Yi1OgOI+VEU+cd4H/NnZg+sh9Axh47xBlKpYw472xa5utzR7t5guuA+45aw Ux0rf4SeS2BmKOHr046O/JhAJoi8vXSFB2ciPLBBSGm6W37fVQAXAbiydV4O4beyhJ5b +OIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r16-20020a63fc50000000b00477a32da0a9si4570863pgk.455.2022.12.01.06.12.16; Thu, 01 Dec 2022 06:12:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231717AbiLAOBY (ORCPT + 82 others); Thu, 1 Dec 2022 09:01:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231193AbiLAOBP (ORCPT ); Thu, 1 Dec 2022 09:01:15 -0500 Received: from gw.red-soft.ru (red-soft.ru [188.246.186.2]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AEA469075D; Thu, 1 Dec 2022 06:01:11 -0800 (PST) Received: from localhost.biz (unknown [10.81.81.211]) by gw.red-soft.ru (Postfix) with ESMTPA id 689993E42F8; Thu, 1 Dec 2022 17:01:09 +0300 (MSK) From: Artem Chernyshev To: artem.chernyshev@red-soft.ru, Vladimir Oltean , Woojung Huh Cc: Florian Fainelli , "David S . Miller" , UNGLinuxDriver@microchip.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org Subject: [PATCH v3 1/3] net: dsa: ksz: Check return value Date: Thu, 1 Dec 2022 17:00:30 +0300 Message-Id: <20221201140032.26746-1-artem.chernyshev@red-soft.ru> X-Mailer: git-send-email 2.30.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 173880 [Dec 01 2022] X-KLMS-AntiSpam-Version: 5.9.59.0 X-KLMS-AntiSpam-Envelope-From: artem.chernyshev@red-soft.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 502 502 69dee8ef46717dd3cb3eeb129cb7cc8dab9e30f6, {Tracking_from_domain_doesnt_match_to}, localhost.biz:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;red-soft.ru:7.1.1;127.0.0.199:7.1.2 X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2022/12/01 13:03:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2022/12/01 11:49:00 #20632713 X-KLMS-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return NULL if we got unexpected value from skb_trim_rcsum() in ksz_common_rcv() Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: bafe9ba7d908 ("net: dsa: ksz: Factor out common tag code") Signed-off-by: Artem Chernyshev Reviewed-by: Vladimir Oltean --- V1->V2 Fixes for tag_hellcreek.c and tag_sja1105.c V2->V3 Split patch in 3 separate parts net/dsa/tag_ksz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c index 38fa19c1e2d5..429250298ac4 100644 --- a/net/dsa/tag_ksz.c +++ b/net/dsa/tag_ksz.c @@ -21,7 +21,8 @@ static struct sk_buff *ksz_common_rcv(struct sk_buff *skb, if (!skb->dev) return NULL; - pskb_trim_rcsum(skb, skb->len - len); + if (pskb_trim_rcsum(skb, skb->len - len)) + return NULL; dsa_default_offload_fwd_mark(skb); -- 2.30.3