Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp996062pxb; Wed, 6 Apr 2022 06:18:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8L2dste1YhYB5LLkBFunyZ47FZeumdi32dy1jDeuqpE/mVXQMPhjEaG0RJc45/yQ9heEt X-Received: by 2002:a63:9d8f:0:b0:398:dad:c3d8 with SMTP id i137-20020a639d8f000000b003980dadc3d8mr7196710pgd.228.1649251101224; Wed, 06 Apr 2022 06:18:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649251101; cv=none; d=google.com; s=arc-20160816; b=ii+MsUdLPfTX3fDxvHdNNKjLl+FBj50WxqHUdNCrzdvlHYfnQoW5PMBfawQt3rdgmD 9a4ZRMdf1quQOpfJaPj/AvJLUzLozwOQI1GcJ27lxLXTHu6dPuGUc2c84dTF9G2zPEUv 0E/yegZMo0eYw/nmQ/sZDEvmCAHMFuYJ9ZvRwlFDZZ4YbXen/WyfF3swLkUaY5sEKhZJ bUybtlMO2BQzgBB5/D5nLIbchMBhQfryRN4KjklGVNGAfhriAZBp0R5SABz8Qz8Hfkef KwP1RRsAqzdV/x1X9fhh4+WMr7MiZZkbyGBDNcP5ftZaQU+0BITyeCwh/ObBWw3LfY6f /Kng== 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=bCSpdXUcWGCrCLsLrTFuGmzPD82URzppR1oBvUJT4G4=; b=QADQw1LqnRr4KqT0YrUujHgVLIqeDUCv+zPYtdd4YAW7Er/jOWqsvkZIQMAFNWOrcW og7yTH/EwSjekGAImvQZn0mco3Ob5HV9xfYrlnci01AjBZ2sA1ohRiUJExsX7VUmDAt7 +9WJFRXzpPFmnq+MKgzE3pBN3Uj9yXGw2G+//k3mZZMhDOD9mcoEONMy1tdOqEmSUrl7 TdlMmmZKZd3vt/VtJEA5lswHoADYBjG0xOPmEtSZgJR0ei3O0okFuBA4zu5C59tgrQ3Z 5UaOezhxHZivRYcMY9h3vTAiAAaafgyoHHP9A2N1XTqjmO5KTYjuj5/xs/6XXuEz+dS/ PkrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=l7pVQzQh; 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 c5-20020a170902d48500b00153b2d164cbsi16208429plg.211.2022.04.06.06.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 06:18:21 -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=l7pVQzQh; 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 B27E16BB10D; Wed, 6 Apr 2022 03:54:32 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1843615AbiDFBlb (ORCPT + 99 others); Tue, 5 Apr 2022 21:41:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345127AbiDEKkp (ORCPT ); Tue, 5 Apr 2022 06:40:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 280EB2DAB0; Tue, 5 Apr 2022 03:25:55 -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 DEAB0B81C8B; Tue, 5 Apr 2022 10:25:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 544B6C385A0; Tue, 5 Apr 2022 10:25:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649154352; bh=/z7MPAZvFmUkpDiauBrT9wCPj3216I7SkrRPEdHXi8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l7pVQzQhJDmdrUsMmdGAxEMdcmQ2C+AXA6vJceDcE8eRwosK9aLLfYHajHzWrCW80 fYTeVXyuKAVE5SDiH4yG3WROYN4/eX5OOkqHtRzVC76KSfTj9ci3/bbJ9ytGhqVG81 XbewGvvm47onr4Le4cxdVjmvPZRWOckrN16MDgoc= 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.10 549/599] can: mcba_usb: mcba_usb_start_xmit(): fix double dev_kfree_skb in error path Date: Tue, 5 Apr 2022 09:34:03 +0200 Message-Id: <20220405070315.177794690@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070258.802373272@linuxfoundation.org> References: <20220405070258.802373272@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); mcba_usb_free_ctx(ctx); - dev_kfree_skb(skb); stats->tx_dropped++; return NETDEV_TX_OK;