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 0AF85A0C47 for ; Fri, 17 Sep 2021 10:23:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 01A8C410F6; Fri, 17 Sep 2021 10:23:37 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id B1703410EA for ; Fri, 17 Sep 2021 10:23:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631867014; 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=z/j6TCIJoRrEZSdba11MJ+yi7uqX1wgSiOz78FEsToA=; b=MDayo6nzqgjqY8XrVAA4XWqkNkaShnmiuk7IjROw5fDYw82Q18qJtNWdQ/YR7GO/hOe4z4 SrSminU+jSrVbJddWKAzsyZwVZ16SJM8SL56wNJbnr2JIN/2ocOW0pa62/Fe9IB67Q3DIm E/JDe5wORMhVn3OVYQsvt36nMKJNRC0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-340-vfbh-I6kOXe24Aabw21cjw-1; Fri, 17 Sep 2021 04:23:31 -0400 X-MC-Unique: vfbh-I6kOXe24Aabw21cjw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D5B0801B3D; Fri, 17 Sep 2021 08:23:30 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.192.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6EDEF60C9F; Fri, 17 Sep 2021 08:23:28 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: aconole@redhat.com, zhihongx.peng@intel.com, stable@dpdk.org, Stephen Hemminger , Long Li Date: Fri, 17 Sep 2021 10:23:11 +0200 Message-Id: <20210917082313.21934-2-david.marchand@redhat.com> In-Reply-To: <20210917082313.21934-1-david.marchand@redhat.com> References: <20210917082313.21934-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] [PATCH 1/3] bus/vmbus: fix leak on device scan 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 Sender: "stable" Caught running ASAN. The device name is leaked on scan. rte_device name field being a const, use the private vmbus struct to store the device name and point at it. Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Cc: stable@dpdk.org Signed-off-by: David Marchand --- drivers/bus/vmbus/linux/vmbus_bus.c | 5 ++++- drivers/bus/vmbus/rte_bus_vmbus.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/bus/vmbus/linux/vmbus_bus.c b/drivers/bus/vmbus/linux/vmbus_bus.c index 3c924eee14..d8eb07d398 100644 --- a/drivers/bus/vmbus/linux/vmbus_bus.c +++ b/drivers/bus/vmbus/linux/vmbus_bus.c @@ -242,7 +242,7 @@ vmbus_scan_one(const char *name) return -1; dev->device.bus = &rte_vmbus_bus.bus; - dev->device.name = strdup(name); + dev->device.name = dev->name = strdup(name); if (!dev->device.name) goto error; @@ -261,6 +261,7 @@ vmbus_scan_one(const char *name) /* skip non-network devices */ if (rte_uuid_compare(dev->class_id, vmbus_nic_uuid) != 0) { + free(dev->name); free(dev); return 0; } @@ -312,6 +313,7 @@ vmbus_scan_one(const char *name) } else { /* already registered */ VMBUS_LOG(NOTICE, "%s already registered", name); + free(dev->name); free(dev); } return 0; @@ -322,6 +324,7 @@ vmbus_scan_one(const char *name) error: VMBUS_LOG(DEBUG, "failed"); + free(dev->name); free(dev); return -1; } diff --git a/drivers/bus/vmbus/rte_bus_vmbus.h b/drivers/bus/vmbus/rte_bus_vmbus.h index 4cf73ce815..438eb481fc 100644 --- a/drivers/bus/vmbus/rte_bus_vmbus.h +++ b/drivers/bus/vmbus/rte_bus_vmbus.h @@ -65,6 +65,7 @@ struct rte_vmbus_device { TAILQ_ENTRY(rte_vmbus_device) next; /**< Next probed VMBUS device */ const struct rte_vmbus_driver *driver; /**< Associated driver */ struct rte_device device; /**< Inherit core device */ + char *name; /**< Device name */ rte_uuid_t device_id; /**< VMBUS device id */ rte_uuid_t class_id; /**< VMBUS device type */ uint32_t relid; /**< id for primary */ -- 2.23.0