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 D8AADA0C41 for ; Tue, 30 Nov 2021 17:38:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA2C3410F7; Tue, 30 Nov 2021 17:38:57 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id EFBFB411E6 for ; Tue, 30 Nov 2021 17:38:54 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 CE9EB3F1ED for ; Tue, 30 Nov 2021 16:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290334; bh=3ruoToEF9aeTPLpenC8kB2Yn0pFqAYTRtTSaWO3FOrU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hIffQhA0XTCx0hit/xr+EU30kQBM0N6fGWISCXTqZrPBm8Um6N3IWGDWX5P1mPsrU C7FGxCoLP+1ggDUDA/3qL1VKx+nCuhzHe5lituz55AFtqYQ7cXcg4pXa3y5F+U3ox/ OQcoDlmEnmPwLeNu6luEOrvYMAEsoOSmS3MhOoeYem0FBHX46bF5/6UHIutehnDOMW zcBFfK1XuQJeBXR+BN668igeFwbCPWCzr9b7Zt2yb61fwOClC2Jw5t94ZH+TI3XgcG Fh03WK+gzc5D1M82TBOY1VnBUniDdAqrydniN4dQEin6gL6LfGtE9K9g2qXYHrWp8n 6bevsAr1+ejPw== Received: by mail-ed1-f70.google.com with SMTP id a3-20020a05640213c300b003e7d12bb925so17543812edx.9 for ; Tue, 30 Nov 2021 08:38:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3ruoToEF9aeTPLpenC8kB2Yn0pFqAYTRtTSaWO3FOrU=; b=DbQUVecVKAMY2dO9QQSD9OXm0cE2DIExpqfInf3bbDlLkqk0AbQUGTmy54SV9ydI0Q YArly7UtsKQcDdQj7lC5Jwhe39fMWqv/hlB3Y+50x4+3SpDAV/ggG1ZJMUUKMfRqYF49 yPGuZSaS8VJLWuatSBgbnMxtSyweEbwwJhegAjyXrvBQZ1jy1vUc/D5cTTlsNJYk6q4D daGV2IaFkMnJuUp6dMNwDlHcyCiEoAYirZCm7KSeA4+giPRN07WRzqqeFE+wJksbdrjN LZnBV41Wkrv3v0D3cTAPG9gSa1QtgtoR8hYlGdpm8lzEvZvsXXKSZb6FHe9DZsTo00SP qMlA== X-Gm-Message-State: AOAM530+VeymqnMZXUYEbEugxrVlxk28RDWJKK4A5zDkECOkgLjtFjCe FuYVAJdWfDs5wPUJgR/6lhHRLXGeRVS03ddsOL+meMXzaX9QhKwrptROmbJJMFgSWumSMiYC0op o7mgVpHHc66HzBeEBKwQfHTtu X-Received: by 2002:a50:eb85:: with SMTP id y5mr33674edr.173.1638290334178; Tue, 30 Nov 2021 08:38:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZRFdkLMstSDKjJKWZJ1vbN3VkaWxZdago+g6R3NwYR0DXmMeeXySoS2Xko3LPPKrP5XEjrw== X-Received: by 2002:a50:eb85:: with SMTP id y5mr33661edr.173.1638290334034; Tue, 30 Nov 2021 08:38:54 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id he17sm9307168ejc.110.2021.11.30.08.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:38:53 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Long Li , dpdk stable Subject: patch 'bus/vmbus: fix leak on device scan' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:18 +0100 Message-Id: <20211130163605.2460997-54-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/6586da24bfb3532a87e657276b1906221e3f8d82 Thanks. Christian Ehrhardt --- >From 6586da24bfb3532a87e657276b1906221e3f8d82 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Sat, 2 Oct 2021 18:24:30 +0200 Subject: [PATCH] bus/vmbus: fix leak on device scan [ upstream commit c6c865d7e2e47a3a1a65a091103cca056bb073ef ] Caught running ASAN. The device name was leaked on scan. rte_device name field being a const, use a local pointer and release in error path. Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Signed-off-by: David Marchand Acked-by: Long Li --- drivers/bus/vmbus/linux/vmbus_bus.c | 6 +++++- 1 file 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..68f6cc5742 100644 --- a/drivers/bus/vmbus/linux/vmbus_bus.c +++ b/drivers/bus/vmbus/linux/vmbus_bus.c @@ -236,13 +236,14 @@ vmbus_scan_one(const char *name) char filename[PATH_MAX]; char dirname[PATH_MAX]; unsigned long tmp; + char *dev_name; dev = calloc(1, sizeof(*dev)); if (dev == NULL) 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 +262,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 +314,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 +325,7 @@ vmbus_scan_one(const char *name) error: VMBUS_LOG(DEBUG, "failed"); + free(dev_name); free(dev); return -1; } -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:09.190949134 +0100 +++ 0054-bus-vmbus-fix-leak-on-device-scan.patch 2021-11-30 16:50:05.706872913 +0100 @@ -1 +1 @@ -From c6c865d7e2e47a3a1a65a091103cca056bb073ef Mon Sep 17 00:00:00 2001 +From 6586da24bfb3532a87e657276b1906221e3f8d82 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c6c865d7e2e47a3a1a65a091103cca056bb073ef ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org