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 C017BC433EF for ; Tue, 12 Apr 2022 01:11:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346005AbiDLBMy (ORCPT ); Mon, 11 Apr 2022 21:12:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344713AbiDLA6U (ORCPT ); Mon, 11 Apr 2022 20:58:20 -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 C2A9929C98; Mon, 11 Apr 2022 17:50:10 -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 0A8DAB819B4; Tue, 12 Apr 2022 00:50:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE303C385A4; Tue, 12 Apr 2022 00:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724607; bh=jkM/RKdyK/H5xm4aNkhaPVHUFc65CBbp7zNjhnkRVso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kQ0c+s39+O82AdRl2lcACEdHBVLrp5UH01xYa2ezWd1hv+k843TDRDF4q0J0g8ewO sh9KBOczuUL1MpunBHp1z09fDkqjZVhWX/PD3743lSo0HHy0YwFulZ6dcdlZarJCLT dDAwP/R/IEYybF6nUGYB2enWJ3idV+6MPIR6ZgUe9PLEyl0J24K6KWppUwRnVdSlSa qwnEP+9ofnKumMPVs2KHqXuGc8a9mBhKCKYkOBIsnAUPMI07K0A2MrumFXi2LDjda8 EjS91udAI6GFpp27XH8psO4brLUfUpE28aVVnSeSZf6USa5auX/C5iiW072trYJXAB 7gz8dpoZN2CyQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiaomeng Tong , "David S . Miller" , Sasha Levin , christopher.lee@cspi.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 22/30] myri10ge: fix an incorrect free for skb in myri10ge_sw_tso Date: Mon, 11 Apr 2022 20:48:56 -0400 Message-Id: <20220412004906.350678-22-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004906.350678-1-sashal@kernel.org> References: <20220412004906.350678-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: Xiaomeng Tong [ Upstream commit b423e54ba965b4469b48e46fd16941f1e1701697 ] All remaining skbs should be released when myri10ge_xmit fails to transmit a packet. Fix it within another skb_list_walk_safe. Signed-off-by: Xiaomeng Tong Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index fc99ad8e4a38..1664e9184c9c 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -2895,11 +2895,9 @@ static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb, status = myri10ge_xmit(curr, dev); if (status != 0) { dev_kfree_skb_any(curr); - if (segs != NULL) { - curr = segs; - segs = next; + skb_list_walk_safe(next, curr, next) { curr->next = NULL; - dev_kfree_skb_any(segs); + dev_kfree_skb_any(curr); } goto drop; } -- 2.35.1