From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2F6C2A0518 for ; Fri, 24 Jul 2020 14:10:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 262EF1C20A; Fri, 24 Jul 2020 14:10:47 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 312AD1C20A for ; Fri, 24 Jul 2020 14:10:46 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id p14so7395162wmg.1 for ; Fri, 24 Jul 2020 05:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ByGAynrnbKIlX+oFiRGCsjy0qCjZD83KXH7pM2WwCKQ=; b=ZeI3FGtraOmtgXVCDo1XwcZHoXanPQpTb8Mh6JfqrWSa4aWrkihYQfglRWf/UIMJKD 0F/Hjt1O8VSd135dhC5p1WFqz7lpKEw+D25ulWQPfBbRll1FB/IPDH7XsMGuQOnC5YSq scjmXgJ3iU7NholyJ84TQboY3sOePkVi2xJhTSkd/IgI/VWZ7yAraA0MkTjBDi8Wpw+B VqBbjHYQJqTwUAfIauOz9hIUAg9Tr9E1coGa81I+hJySJdISlkjxcVHyPD+82nBfRqtU s+Y9RIu0Zel+slJ9nIiIUer2cob8D+QnhlOiJuhgJoZqPO9L0sWquzhWp+rxzOGuTppb aUlA== 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=ByGAynrnbKIlX+oFiRGCsjy0qCjZD83KXH7pM2WwCKQ=; b=b4iDf4E5ZWy+DzEGSAeQLNidkjDAa8NvBce03WXmmO94DEpCIXIe40GqQmG91HFfLJ k1sxWuulsXF0/rnK/dFovLP0DYJUQv9GBEePm2ZPFIn+kftWOnReRYpOns8cmeLtp53F 5+sSsCEpreVCVHZhS5njOjMZGS+TS4mdMZDnmhgWpJIsCITp9kXcuLWMucpZAP0JScwM yIdncqtKtJlhIcoJBTvZb1HXisk8fdNENfPDirOo9frmcHQwcK2qncvUVJpnr3ptLbQv uWOiVDaZMAkj3jOpNGk7Y79HrNVHqhLbIPxhPU9vuAdapeEZA/mixVd/NG+eyfN5iQfJ HRpA== X-Gm-Message-State: AOAM532YYLpQp9Ia0WESkjDjzImVtdeZgbtXvDJJI+bu4s8FsxLTy3sf BAqsNlBYwZaoOhxP3KNrNUo= X-Google-Smtp-Source: ABdhPJwR5RZEZfF0p3U3KF/gjOCwcHL6oau7a+iJVcqNJ8HGAHee06S+vZkgpEpUAGGoic4eKzR/Rw== X-Received: by 2002:a05:600c:2154:: with SMTP id v20mr9178686wml.185.1595592645875; Fri, 24 Jul 2020 05:10:45 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c15sm6756174wme.23.2020.07.24.05.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:10:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Ferruh Yigit , dpdk stable Date: Fri, 24 Jul 2020 12:59:54 +0100 Message-Id: <20200724120030.1863487-156-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/af_packet: fix memory leak on init failure' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.4 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/26/20. 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. Thanks. Luca Boccassi --- >From 8298ac40093e6b800d4715da73cf4d2d44090f0f Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 6 Jul 2020 20:27:51 +0800 Subject: [PATCH] net/af_packet: fix memory leak on init failure [ upstream commit 3400148949ea4edecba0256f4ab97e80f1d98474 ] Add missing code to free memory when the device initialization fails. Fixes: ccd37d341e8d ("net/af_packet: remove queue number limitation") Fixes: 5f19dee604ed ("drivers/net: do not use private ethdev data") Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit --- drivers/net/af_packet/rte_eth_af_packet.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 6c6bbaccf..841a7009a 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -623,20 +623,20 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, PMD_LOG(ERR, "%s: I/F name too long (%s)", name, pair->value); - return -1; + goto free_internals; } if (ioctl(sockfd, SIOCGIFINDEX, &ifr) == -1) { PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFINDEX)", name); - return -1; + goto free_internals; } (*internals)->if_name = strdup(pair->value); if ((*internals)->if_name == NULL) - return -1; + goto free_internals; (*internals)->if_index = ifr.ifr_ifindex; if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) == -1) { PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFHWADDR)", name); - return -1; + goto free_internals; } memcpy(&(*internals)->eth_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN); @@ -660,7 +660,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, PMD_LOG_ERRNO(ERR, "%s: could not open AF_PACKET socket", name); - return -1; + goto error; } tpver = TPACKET_V2; @@ -813,6 +813,9 @@ error: ((*internals)->rx_queue[q].sockfd != qsockfd)) close((*internals)->rx_queue[q].sockfd); } +free_internals: + rte_free((*internals)->rx_queue); + rte_free((*internals)->tx_queue); free((*internals)->if_name); rte_free(*internals); return -1; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.572131535 +0100 +++ 0156-net-af_packet-fix-memory-leak-on-init-failure.patch 2020-07-24 12:53:48.519010782 +0100 @@ -1,36 +1,26 @@ -From 3400148949ea4edecba0256f4ab97e80f1d98474 Mon Sep 17 00:00:00 2001 +From 8298ac40093e6b800d4715da73cf4d2d44090f0f Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 6 Jul 2020 20:27:51 +0800 Subject: [PATCH] net/af_packet: fix memory leak on init failure +[ upstream commit 3400148949ea4edecba0256f4ab97e80f1d98474 ] + Add missing code to free memory when the device initialization fails. Fixes: ccd37d341e8d ("net/af_packet: remove queue number limitation") Fixes: 5f19dee604ed ("drivers/net: do not use private ethdev data") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit --- - drivers/net/af_packet/rte_eth_af_packet.c | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) + drivers/net/af_packet/rte_eth_af_packet.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c -index db5de8e45..62945fee2 100644 +index 6c6bbaccf..841a7009a 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c -@@ -637,9 +637,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, - sizeof(struct pkt_tx_queue), - 0, numa_node); - if (!(*internals)->rx_queue || !(*internals)->tx_queue) { -- rte_free((*internals)->rx_queue); -- rte_free((*internals)->tx_queue); -- return -1; -+ goto free_internals; - } - - for (q = 0; q < nb_queues; q++) { -@@ -664,20 +662,20 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, +@@ -623,20 +623,20 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, PMD_LOG(ERR, "%s: I/F name too long (%s)", name, pair->value); @@ -55,7 +45,7 @@ } memcpy(&(*internals)->eth_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN); -@@ -701,7 +699,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, +@@ -660,7 +660,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, PMD_LOG_ERRNO(ERR, "%s: could not open AF_PACKET socket", name); @@ -64,7 +54,7 @@ } tpver = TPACKET_V2; -@@ -854,6 +852,9 @@ error: +@@ -813,6 +813,9 @@ error: ((*internals)->rx_queue[q].sockfd != qsockfd)) close((*internals)->rx_queue[q].sockfd); }