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 4A425A0518 for ; Fri, 24 Jul 2020 14:10:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 39D011C225; Fri, 24 Jul 2020 14:10:48 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 57B9B1C225 for ; Fri, 24 Jul 2020 14:10:47 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id p14so7395210wmg.1 for ; Fri, 24 Jul 2020 05:10:47 -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=Ku1g2y86S97swAuoeK7j4eNkYZImXjv/D9+4DXV+GNM=; b=JGF3LndQ8X6n0l/lFIrnuHfUOvesB8um9TgjTBjdcRarPU+xvZsJ0YwNb/IJP4cEJz 6veLHFIwGV/g1S0Cv7CAyZ5DhIlm5hjrZv403pZKibq63gxE2FslfpV/T9LYH3eXx5OT Vxs0IU+OwSeAYXBkNSzoqqG+Jjxta3hpuP0B7QnH46WiVrC4rA+mSAH8L8einb4Zs+BT JNW8asSNaMNvybKL0e36jcIZ/BAj3rbZEbthVkuWXtm11jEidcZX6Wylrz/gcCIOf51n csMqkiC70pOqo/1WjXW+HL12CePpSrTBezaD6ihpGeSobGW2XIp6MuJY4wmbW2N7OopF HY2w== 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=Ku1g2y86S97swAuoeK7j4eNkYZImXjv/D9+4DXV+GNM=; b=QHQH6QXdqchWaxJrPZCZI6GwKP4LwKoATeGXJQ6l/4a8FWBsICX7oQ2nPZ30AMAeey vfnLeZJwsEfdPmTD1pkd0lcOofwZq1BCr61HBeNTJh2nyd/bpmp2l3EpFA7m+1iTFWDL 2SZQXyQp29eFzXW3kTEnUqKdqWHzJt6fyU4yCX/k2BWdAdMICihP0Yc/055kTPsci5MO RYWxqXu06dF/RToeZh9T5DF12tdjCYLWWTajJPrTPeTDt09LZkSeGT/xkwGAl5gCc0Bh DFqH9pEOD0VmWEPY03kHxcprM+v97i94bVyXlz0Rivat5tGFxjb2sKtej37hg1+C8q7W nC4A== X-Gm-Message-State: AOAM531hMbogIEA+f1ui3TmQrYOR0Xyg9zSLlTgpZnSYuREecmpfF6Mu O0mxlBsdJ4x2J6nvZ1fibUM= X-Google-Smtp-Source: ABdhPJy2tiiQCDYz8dEJUnyqZ232c8jcuIMvJXs9X2oXYMw1rpwFZBhGRvzV1KzUQ92g4mBSWlS4UA== X-Received: by 2002:a1c:2:: with SMTP id 2mr8665267wma.79.1595592647069; Fri, 24 Jul 2020 05:10:47 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j11sm1211312wrq.69.2020.07.24.05.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:10:46 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Ferruh Yigit , dpdk stable Date: Fri, 24 Jul 2020 12:59:55 +0100 Message-Id: <20200724120030.1863487-157-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 munmap 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 d96c627cf9e4121561524b20c11b682614a8669b Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 6 Jul 2020 20:28:02 +0800 Subject: [PATCH] net/af_packet: fix munmap on init failure [ upstream commit b02e1742ebb5a6c23bea05c4d66b1d380bcd00eb ] Add a missing available check and fix the wrong address passed to munmap on init failure. Fixes: dd6590fe2fd7 ("af_packet: fix possible memory leak") Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit --- drivers/net/af_packet/rte_eth_af_packet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 841a7009a..00387ed0a 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -804,8 +804,9 @@ error: if (qsockfd != -1) close(qsockfd); for (q = 0; q < nb_queues; q++) { - munmap((*internals)->rx_queue[q].map, - 2 * req->tp_block_size * req->tp_block_nr); + if ((*internals)->rx_queue[q].map != MAP_FAILED) + munmap((*internals)->rx_queue[q].map, + 2 * req->tp_block_size * req->tp_block_nr); rte_free((*internals)->rx_queue[q].rd); rte_free((*internals)->tx_queue[q].rd); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.611171206 +0100 +++ 0157-net-af_packet-fix-munmap-on-init-failure.patch 2020-07-24 12:53:48.519010782 +0100 @@ -1,13 +1,14 @@ -From b02e1742ebb5a6c23bea05c4d66b1d380bcd00eb Mon Sep 17 00:00:00 2001 +From d96c627cf9e4121561524b20c11b682614a8669b Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 6 Jul 2020 20:28:02 +0800 Subject: [PATCH] net/af_packet: fix munmap on init failure +[ upstream commit b02e1742ebb5a6c23bea05c4d66b1d380bcd00eb ] + Add a missing available check and fix the wrong address passed to munmap on init failure. Fixes: dd6590fe2fd7 ("af_packet: fix possible memory leak") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit @@ -16,10 +17,10 @@ 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c -index 62945fee2..b9723e961 100644 +index 841a7009a..00387ed0a 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c -@@ -843,8 +843,9 @@ error: +@@ -804,8 +804,9 @@ error: if (qsockfd != -1) close(qsockfd); for (q = 0; q < nb_queues; q++) {