From patchwork Wed May 25 21:00:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cengiz Can X-Patchwork-Id: 1635657 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=LwNEfhCU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L7k580QLsz9sGF for ; Thu, 26 May 2022 07:01:32 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nty8E-0002bj-AI; Wed, 25 May 2022 21:01:26 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nty8C-0002Z1-Ph for kernel-team@lists.ubuntu.com; Wed, 25 May 2022 21:01:24 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D8D613F178 for ; Wed, 25 May 2022 21:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1653512483; bh=1VuDyGy+yCVLGQncHlNfG+IwkP6irig1uZe3Myzvd6Y=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LwNEfhCUr8SbwRk8UJglPzOgIuQU/14lmYA+jwdbBSoiFE9+lWFxDeee5kgNvVd4V YeGP5L5LdbhjZpfeNctVIruXRq6g+l6QNRvoSqAEayLlyBQkjf2UNm0cLL67vPkXVF +Irm4gGlHfXTZ2XPzlhaE5FrKaUtqjn4xQACyAeckSxLlgEjww8fRN1lyqW3w+zYfB ha8ulcDkMzhFbPIvdH4EtvpP8c+u+RzskvaYgm5zVnMiPEy1XVEiZo0/ALl4Zyme/1 +AsMY+Xiq1lmWno0VK2bwkA4xYdFRZb+K8YCDqld2s7Z2dzyMi1yo/hn2MxHJS+dTI OmrZJPD5R9uMg== Received: by mail-ed1-f69.google.com with SMTP id j7-20020a056402238700b0042b9c2e9c64so3246614eda.19 for ; Wed, 25 May 2022 14:01:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1VuDyGy+yCVLGQncHlNfG+IwkP6irig1uZe3Myzvd6Y=; b=6sra39UCRE6hg/48dVeLhKlYNzcmtmSgsEXs/TSXwugODO4Y/MxY53cudupvGWBXE8 r96/vaDNxKbVkUhBKSIX4UpwG8nJIvw8lS/3vd67AXEC2e6ttW5giQbFEMdtmfrJH/XH 8RkFaroL9tHEKA4usV0iqE+0GG3PkQDR1G+0s6HGzJzNDlc+JCESp+UE72Il82tt9WuO tMuzI+j7iZu3vT3IN82mPtNJjf/Tf+jnAZWbjLPAmRF8B3xWO4B1JKGgCDo4/0JPgE3b QifO8pKOYSQDmCjAsMOAMR5PS2mcinDn5KVbrRZG/jXIWZ3nZN22/9QjgafJc5XmgPEP afBA== X-Gm-Message-State: AOAM531SUmyr42XQl3wPkgy4+8HY3GO8nToXD8pc4UwF8JKTdYEZQ8Vr 99spYT0efuZXLJ25AUXX6YaZTj7eaUYqZri6IdNcO5OcQgZbuH1K4OS9ORgq6Bvp3WSfY7x0lSg EmTTy10A9NFbOqXrdCMRwNdLudAeQ4Ft9kIBkfwbeDg== X-Received: by 2002:a17:907:6d26:b0:6fe:b8cc:4613 with SMTP id sa38-20020a1709076d2600b006feb8cc4613mr21807833ejc.229.1653512483324; Wed, 25 May 2022 14:01:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYfdCnHg/pxoYws9IrSw4kcLbiEkRa8l2gs9gNkcJqt7HmbEtUvBWlHMxieFDZeujFtT2yIA== X-Received: by 2002:a17:907:6d26:b0:6fe:b8cc:4613 with SMTP id sa38-20020a1709076d2600b006feb8cc4613mr21807820ejc.229.1653512483097; Wed, 25 May 2022 14:01:23 -0700 (PDT) Received: from localhost.localdomain ([176.218.65.129]) by smtp.gmail.com with ESMTPSA id z23-20020a1709060f1700b006f3ef214dd1sm8398403eji.55.2022.05.25.14.01.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 May 2022 14:01:22 -0700 (PDT) From: Cengiz Can To: kernel-team@lists.ubuntu.com Subject: [SRU Focal] can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path Date: Thu, 26 May 2022 00:00:48 +0300 Message-Id: <20220525210050.1038369-4-cengiz.can@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220525210050.1038369-1-cengiz.can@canonical.com> References: <20220525210050.1038369-1-cengiz.can@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Hangyu Hua 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: 0024d8ad1639 ("can: usb_8dev: Add support for USB2CAN interface from 8 devices") Link: https://lore.kernel.org/all/20220311080614.45229-1-hbh25y@gmail.com Cc: stable@vger.kernel.org Signed-off-by: Hangyu Hua Signed-off-by: Marc Kleine-Budde (cherry picked from commit 3d3925ff6433f98992685a9679613a2cc97f3ce2) [cengizcan: adjusted params of can_free_echo_skb() for 5.4] CVE-2022-28388 Signed-off-by: Cengiz Can --- drivers/net/can/usb/usb_8dev.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c index c43e98bb6e2d..b514b2eaa318 100644 --- a/drivers/net/can/usb/usb_8dev.c +++ b/drivers/net/can/usb/usb_8dev.c @@ -670,9 +670,20 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb, atomic_inc(&priv->active_tx_urbs); err = usb_submit_urb(urb, GFP_ATOMIC); - if (unlikely(err)) - goto failed; - else if (atomic_read(&priv->active_tx_urbs) >= MAX_TX_URBS) + if (unlikely(err)) { + can_free_echo_skb(netdev, context->echo_index); + + usb_unanchor_urb(urb); + usb_free_coherent(priv->udev, size, buf, urb->transfer_dma); + + atomic_dec(&priv->active_tx_urbs); + + if (err == -ENODEV) + netif_device_detach(netdev); + else + netdev_warn(netdev, "failed tx_urb %d\n", err); + stats->tx_dropped++; + } else if (atomic_read(&priv->active_tx_urbs) >= MAX_TX_URBS) /* Slow down tx path */ netif_stop_queue(netdev); @@ -691,19 +702,6 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb, return NETDEV_TX_BUSY; -failed: - can_free_echo_skb(netdev, context->echo_index); - - usb_unanchor_urb(urb); - usb_free_coherent(priv->udev, size, buf, urb->transfer_dma); - - atomic_dec(&priv->active_tx_urbs); - - if (err == -ENODEV) - netif_device_detach(netdev); - else - netdev_warn(netdev, "failed tx_urb %d\n", err); - nomembuf: usb_free_urb(urb);