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 F1330A0C47 for ; Tue, 10 Aug 2021 17:44:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7DEA4114F; Tue, 10 Aug 2021 17:44:30 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 54E0140686 for ; Tue, 10 Aug 2021 17:44:29 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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-canonical-0.canonical.com (Postfix) with ESMTPS id 3861D40330 for ; Tue, 10 Aug 2021 15:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610269; bh=WxlPaUYe67qp2FcR5rQjSG4JA2OlYZsEqXm73gg3rMo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lrIN68j7fjtTRMbY7/p+YCU+0/49Ib8GRAyZbdw/EQh9OUKXOKaWOJVwSosoQYon8 INI3+4Z6YbYkMcmg1o56m/YFMgLUdElm+eS0FHo0c4c1Y6jJB15wIrbnvWQ0bhWF95 bUtgG/CS6MlMI+0tAEzfAuH13lgNWGKqjRS4W1wocOcSHiUTdk8X9tYuQ9ZwWSgzrw Dw3YKLKPWkg7Fdga8oWYoW1FztuBw3CYFGcszf5ccQ+tY2no+QRFrpFYjKnqP7kEfc IkB05qHnROpygx9LmbZCTk0fhQSop1eYKx5bb7oFq4pZ3SExcMLowA57j1eolssLLr EYGZi9YwG9jNA== Received: by mail-ed1-f72.google.com with SMTP id d12-20020a50fe8c0000b02903a4b519b413so10953959edt.9 for ; Tue, 10 Aug 2021 08:44:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WxlPaUYe67qp2FcR5rQjSG4JA2OlYZsEqXm73gg3rMo=; b=MvwjDockvgzdPzfrdhzUgOoG23cBMO5jo5Qk7X+UattcSRmc+eso0h2VsYR+M5Vkex z6FdGTVpqk4zC3e1Ef8HZOOPk/rr4mvAO9ykq/hyPjO6qv0pRjMnddcWTW8m+dQ5bJoV ndhaJbJK6jmysEVsDO1W+2ztq39294qIXdHmT9PfQKedbwQWin7rEGfcAWHxZ96nITjT dGJ4mYOkocyGgir6odPSVSqLHwYKNEs0JBYSMvkX6XUB55cEQdTftLBP8u9DDEf3c52h +OxEdk9abkcEVrbC6AEUmVQJUDxHslh1/5brzYyMm3+buj1cB3j9ExPMg6IiQn3qQ/hP ZCqw== X-Gm-Message-State: AOAM532x/DksaGSGjVgzfO85dUD2R4bl1OQKmVxpVaNIHsgjshZVMd0j FcuzdSr7XitpTLIg12u20KJk+OJMr2vVJcqPvDMsJjIHvKcEONqspyZVzClQjzZav3gQCj2UdR/ 32l+BCN6cmTK4FRZUz/5/3ZAe X-Received: by 2002:a50:fb18:: with SMTP id d24mr5645336edq.225.1628610268589; Tue, 10 Aug 2021 08:44:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVHFXkfq0966vv2/CflfdqmRDlE7cDm8xrN9BxXO7McMm6OJjsPMadjIX/gUpp7LBJG5zmYA== X-Received: by 2002:a50:fb18:: with SMTP id d24mr5645320edq.225.1628610268413; Tue, 10 Aug 2021 08:44:28 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id t9sm9371640edd.33.2021.08.10.08.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:44:27 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Dapeng Yu Cc: Jasvinder Singh , dpdk stable Date: Tue, 10 Aug 2021 17:39:59 +0200 Message-Id: <20210810154022.749358-79-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/softnic: fix memory leak in arguments parsing' has been queued to stable release 19.11.10 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" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. 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/d313979fd603c8c588822a675b328fd000e17734 Thanks. Christian Ehrhardt --- >From d313979fd603c8c588822a675b328fd000e17734 Mon Sep 17 00:00:00 2001 From: Dapeng Yu Date: Thu, 15 Jul 2021 13:38:14 +0800 Subject: [PATCH] net/softnic: fix memory leak in arguments parsing [ upstream commit d8f852f5f3692bbf15743d1aca25e6abcbe652ad ] In function pmd_parse_args(), firmware path is duplicated from device arguments as character string, but is never freed, which cause memory leak. This patch changes the type of firmware member of struct pmd_params to character array, to make memory resource release unnecessary, and changes the type of name member to character array, to keep the consistency of character string handling in struct pmd_params. Fixes: 7e68bc20f8c8 ("net/softnic: restructure") Signed-off-by: Dapeng Yu Acked-by: Jasvinder Singh --- drivers/net/softnic/rte_eth_softnic.c | 30 ++++++++++++++++--- .../net/softnic/rte_eth_softnic_internals.h | 5 ++-- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c index 11723778fd..f4858255ce 100644 --- a/drivers/net/softnic/rte_eth_softnic.c +++ b/drivers/net/softnic/rte_eth_softnic.c @@ -440,6 +440,7 @@ pmd_parse_args(struct pmd_params *p, const char *params) { struct rte_kvargs *kvlist; int ret = 0; + char *firmware = NULL; kvlist = rte_kvargs_parse(params, pmd_valid_args); if (kvlist == NULL) @@ -447,7 +448,14 @@ pmd_parse_args(struct pmd_params *p, const char *params) /* Set default values */ memset(p, 0, sizeof(*p)); - p->firmware = SOFTNIC_FIRMWARE; + if (rte_strscpy(p->firmware, SOFTNIC_FIRMWARE, + sizeof(p->firmware)) < 0) { + PMD_LOG(WARNING, + "\"%s\": firmware path should be shorter than %zu", + SOFTNIC_FIRMWARE, sizeof(p->firmware)); + ret = -EINVAL; + goto out_free; + } p->cpu_id = SOFTNIC_CPU_ID; p->sc = SOFTNIC_SC; p->tm.n_queues = SOFTNIC_TM_N_QUEUES; @@ -468,11 +476,20 @@ pmd_parse_args(struct pmd_params *p, const char *params) /* Firmware script (optional) */ if (rte_kvargs_count(kvlist, PMD_PARAM_FIRMWARE) == 1) { ret = rte_kvargs_process(kvlist, PMD_PARAM_FIRMWARE, - &get_string, &p->firmware); + &get_string, &firmware); if (ret < 0) goto out_free; } - + if (rte_strscpy(p->firmware, firmware, + sizeof(p->firmware)) < 0) { + PMD_LOG(WARNING, + "\"%s\": firmware path should be shorter than %zu", + firmware, sizeof(p->firmware)); + free(firmware); + ret = -EINVAL; + goto out_free; + } + free(firmware); /* Connection listening port (optional) */ if (rte_kvargs_count(kvlist, PMD_PARAM_CONN_PORT) == 1) { ret = rte_kvargs_process(kvlist, PMD_PARAM_CONN_PORT, @@ -621,7 +638,12 @@ pmd_probe(struct rte_vdev_device *vdev) if (status) return status; - p.name = name; + if (rte_strscpy(p.name, name, sizeof(p.name)) < 0) { + PMD_LOG(WARNING, + "\"%s\": device name should be shorter than %zu", + name, sizeof(p.name)); + return -EINVAL; + } /* Allocate and initialize soft ethdev private data */ dev_private = pmd_init(&p); diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h index 6eec43b22b..f8549b2174 100644 --- a/drivers/net/softnic/rte_eth_softnic_internals.h +++ b/drivers/net/softnic/rte_eth_softnic_internals.h @@ -28,14 +28,15 @@ #include "conn.h" #define NAME_SIZE 64 +#define SOFTNIC_PATH_MAX 4096 /** * PMD Parameters */ struct pmd_params { - const char *name; - const char *firmware; + char name[NAME_SIZE]; + char firmware[SOFTNIC_PATH_MAX]; uint16_t conn_port; uint32_t cpu_id; int sc; /**< Service cores. */ -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:16.063474888 +0200 +++ 0079-net-softnic-fix-memory-leak-in-arguments-parsing.patch 2021-08-10 15:11:13.090638619 +0200 @@ -1 +1 @@ -From d8f852f5f3692bbf15743d1aca25e6abcbe652ad Mon Sep 17 00:00:00 2001 +From d313979fd603c8c588822a675b328fd000e17734 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d8f852f5f3692bbf15743d1aca25e6abcbe652ad ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index f64023256d..0aa7147b13 100644 +index 11723778fd..f4858255ce 100644 @@ -91 +92 @@ -index 1b3186ef0b..07285ca315 100644 +index 6eec43b22b..f8549b2174 100644