Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp913451pxb; Wed, 6 Apr 2022 04:06:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxMh4NHCmeNEuhEOq1IPCJqHoDKBE6qvkyhMTN70jmQHd7ccPZREwgTQM8w0nKPpwi6EPm X-Received: by 2002:a05:6a00:87:b0:4fb:39f9:bb9d with SMTP id c7-20020a056a00008700b004fb39f9bb9dmr8279060pfj.48.1649243206655; Wed, 06 Apr 2022 04:06:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649243206; cv=none; d=google.com; s=arc-20160816; b=PpDfE3V38BDB7THRoHLtpD5fXB3F58Hn4/abK4JK8Cdwk6qlw3vu0/BhSJvIfvoTjZ 2pBm2FJwvq5s9xaC/YO5oSKXMJN3bYSfLJ/F2IWG/85KrMacUipdEpQxbKvlwb2udBAH BslIQ5ufpjxpXraFZTV1EoiJdH7+/9CJGXOe10L4mzVeTzVmb4ctERLUw9MyLWKojGZG MK7epzQX5mcfAQsZdeQD5OX5QC8snew5TurGO8fzfhf6p9mYewle9WMnW71F1G+gJHZr AwFuWfirv5JE/9tMV/YIzyXDfk9I4mrYABznQdAPYYTi8jmpxzMP0TEYHpLhpW125lme 6kzQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Q7CCht8ylQQc5lmJDKjGVyODtl9UikMkOblAhaB5YdE=; b=sdeSaTsbbyyTneJ1o9OK1l+xcTXzUxUaWeoKu5V/PDtCtivAPDemNsIua5zpNxLtuI p0Ph2dXTryf20OxthOJG31eFtDNvZIgUyx1WkABbwLnkAjvVYWRNY4OrvSCQUQOow3t7 25gFtle9/gQ7YW19Q/7GxtmY4dHV61tXuv0HFr3qJG4b+sgyBWxThFoV3F15IiRg1JfG 8eToVezc0RJEie9P4iGv+DzdQE5Yt+20wCgoJJNPDyoKqM5TuW7R+pnbYzpj+VPdOau7 AzRLA6w/9qbZdz+3R1iEFtU1RmqYVuy+fvVUiAcPuma0degbONMZzHzAGbPOhskU7wqR jB4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="MV/cFwM5"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id q2-20020a056a00084200b004faa67abb7fsi14973604pfk.46.2022.04.06.04.06.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 04:06:46 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="MV/cFwM5"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3AF0D5C3BF8; Wed, 6 Apr 2022 02:28:49 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1582406AbiDEXnD (ORCPT + 99 others); Tue, 5 Apr 2022 19:43:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354198AbiDEKMP (ORCPT ); Tue, 5 Apr 2022 06:12:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 842B352E42; Tue, 5 Apr 2022 02:58:17 -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 1A5116167E; Tue, 5 Apr 2022 09:58:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27038C385A1; Tue, 5 Apr 2022 09:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649152696; bh=ILBucAii6L59KbluEJs9UfkSEPcuI0aO3O8zzJAmlug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MV/cFwM5bBNTByx7gt5rHCcAcYDJc8H3tkCx8uSMTUiPblgiSlKQ5YktrVSB20O7M a409zpj1Si2gtA8VZaEf7U/lpeeCjVuNQLFGvCEbVwXYxAOLJWSl5UdVpMGdvuBXPu V+1F415/EuJKna0tzqPTFKFDKwgHIyOdN7XTFxa4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hangyu Hua , Marc Kleine-Budde Subject: [PATCH 5.15 832/913] can: mcba_usb: mcba_usb_start_xmit(): fix double dev_kfree_skb in error path Date: Tue, 5 Apr 2022 09:31:34 +0200 Message-Id: <20220405070404.770496313@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070339.801210740@linuxfoundation.org> References: <20220405070339.801210740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Hangyu Hua commit 04c9b00ba83594a29813d6b1fb8fdc93a3915174 upstream. There is no need to call dev_kfree_skb() when usb_submit_urb() fails because can_put_echo_skb() deletes original skb and can_free_echo_skb() deletes the cloned skb. Fixes: 51f3baad7de9 ("can: mcba_usb: Add support for Microchip CAN BUS Analyzer") Link: https://lore.kernel.org/all/20220311080208.45047-1-hbh25y@gmail.com Signed-off-by: Hangyu Hua Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/usb/mcba_usb.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/net/can/usb/mcba_usb.c +++ b/drivers/net/can/usb/mcba_usb.c @@ -368,7 +368,6 @@ static netdev_tx_t mcba_usb_start_xmit(s xmit_failed: can_free_echo_skb(priv->netdev, ctx->ndx, NULL); mcba_usb_free_ctx(ctx); - dev_kfree_skb(skb); stats->tx_dropped++; return NETDEV_TX_OK;