From patchwork Thu Apr 13 10:10:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 126024 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6025142932; Thu, 13 Apr 2023 12:10:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4705A40A84; Thu, 13 Apr 2023 12:10:58 +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 A67364014F for ; Thu, 13 Apr 2023 12:10:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681380656; 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; bh=7bDcfneeNr7wrTstS/DlGwOMg/2z/urYLEAYU7Sl3fA=; b=NAP7tQALgU1P4TYQbzhrdKLtjKOl0XgZ4fy7M33VP9QMcYQ4heMLGLemwiJveFJ/M+k8m4 sUGHl8dlZB1PVhzHr4rO3BJsuL6nI/ztxUVp0jlMjd1FWUvaNP4nYNGKlZymPUjP84xqe4 ciICHtwD3p9MHSHqQvPzPOkEi4uBEQU= 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-511-VUMoNq06OiGhhUii2l4Cow-1; Thu, 13 Apr 2023 06:10:54 -0400 X-MC-Unique: VUMoNq06OiGhhUii2l4Cow-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A8613887401; Thu, 13 Apr 2023 10:10:53 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.225.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43A1D2166B26; Thu, 13 Apr 2023 10:10:51 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: stable@dpdk.org, Maxime Coquelin , Chenbo Xia , Yuanhan Liu , Wenfeng Liu , Jianfeng Tan Subject: [PATCH] net/virtio-user: fix leak when initialisation fails Date: Thu, 13 Apr 2023 12:10:41 +0200 Message-Id: <20230413101041.1638478-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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") Cc: stable@dpdk.org 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 f46a131b5c..744f3c30d2 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -696,11 +696,7 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, uint16_t queues, dev->frontend_features = 0; 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) { PMD_INIT_LOG(ERR, "(%s) backend set up fails", dev->path); @@ -794,6 +790,7 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, uint16_t queues, } } + *ifname = NULL; return 0; notify_uninit: