From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 93E5C42ECF for ; Thu, 20 Jul 2023 17:31:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8FC3742B8C; Thu, 20 Jul 2023 17:31:22 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B7B4F42D10 for ; Thu, 20 Jul 2023 17:31:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ITQjbQpYL0Ilc0tiA2jZjWh+oaKH5AaaG0ie2/f4hvA=; b=Awhw5XRNVjSHfy5ocDHwtl46ZT5u34+qYGwGMZiEieS0FGya/ykyY6yXkEamIpFC9WX+dc LnZs1uTumZtzerejHZVfkqG3U3ylbH7VadTjRLkzd6MwURKKNiqeJtLn39pCXTLfI+3l4E QSv8PfdJrw7K2AkQBwll0ZCEuD69ITA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-444-WE3TqEZLMlKoCZvqAlH7Uw-1; Thu, 20 Jul 2023 11:22:45 -0400 X-MC-Unique: WE3TqEZLMlKoCZvqAlH7Uw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8591E1011630; Thu, 20 Jul 2023 15:21:57 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3ED2E4CD0E3; Thu, 20 Jul 2023 15:21:56 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Maxime Coquelin , Tyler Retzlaff , dpdk stable Subject: patch 'net/virtio-user: fix leak when initialisation fails' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:28 +0100 Message-ID: <20230720151942.262154-77-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/77145940b5b8c8de00afd24cd3edb45dd095705b Thanks. Kevin --- >From 77145940b5b8c8de00afd24cd3edb45dd095705b Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 13 Apr 2023 12:10:41 +0200 Subject: [PATCH] net/virtio-user: fix leak when initialisation fails [ upstream commit c8254ef1a96c4897293b1d1db8c8a786dfb19e9d ] Caught with ASan. If initialising a virtio_user port fails, we may leak the ifname passed via a devargs. Fixes: 4214a1b493f2 ("net/virtio-user: support changing tap interface name") Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin Acked-by: Tyler Retzlaff --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index f9cada05e4..4044774ea0 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -586,9 +586,5 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, dev->unsupported_features = 0; dev->backend_type = backend_type; - - if (*ifname) { - dev->ifname = *ifname; - *ifname = NULL; - } + dev->ifname = *ifname; if (virtio_user_dev_setup(dev) < 0) { @@ -663,4 +659,5 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, } + *ifname = NULL; return 0; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:04.281991902 +0100 +++ 0077-net-virtio-user-fix-leak-when-initialisation-fails.patch 2023-07-20 16:17:54.922751574 +0100 @@ -1 +1 @@ -From c8254ef1a96c4897293b1d1db8c8a786dfb19e9d Mon Sep 17 00:00:00 2001 +From 77145940b5b8c8de00afd24cd3edb45dd095705b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c8254ef1a96c4897293b1d1db8c8a786dfb19e9d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 2b4607a291..af1f8c8237 100644 +index f9cada05e4..4044774ea0 100644 @@ -24 +25 @@ -@@ -697,9 +697,5 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, uint16_t queues, +@@ -586,9 +586,5 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, @@ -35 +36 @@ -@@ -795,4 +791,5 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, uint16_t queues, +@@ -663,4 +659,5 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, @@ -40 +41 @@ - + }