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 CDE55A04B1 for ; Fri, 28 Aug 2020 12:13:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AE8B31C119; Fri, 28 Aug 2020 12:13:44 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 011A81C116 for ; Fri, 28 Aug 2020 12:13:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609622; 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=AyTljpfYobgdIA5RbFDEU1Gq1493halXERedDhnjDCM=; b=U9TG52V2696hgjzvvmrlY/DtiT7I4X74b/tOhiMtpkSXzB0+Lsa1M04mNN9NlcgyRy3/k4 5YEPQ/pcMDy1EwGsRtcXiFUq8mm/2vVjS2FOY7AzEsH7SqKNrYgK2OfTrG+rjl9Zgujnbu dFnpxwIRGCn2dHN+73t9rR+eMl1J6qU= 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-514-UpSMJDnkN1K2B0oyegrTrw-1; Fri, 28 Aug 2020 06:13:39 -0400 X-MC-Unique: UpSMJDnkN1K2B0oyegrTrw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5EAC5189E617; Fri, 28 Aug 2020 10:13:38 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D36919D7C; Fri, 28 Aug 2020 10:13:37 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ferruh Yigit , dpdk stable Date: Fri, 28 Aug 2020 11:12:30 +0100 Message-Id: <20200828101308.223767-4-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/af_packet: fix munmap on init failure' has been queued to LTS release 18.11.10 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 LTS release 18.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 09/02/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/dba9120a2e05e60ae0e5ec23cb532eb3effcaaea Thanks. Kevin. --- >From dba9120a2e05e60ae0e5ec23cb532eb3effcaaea 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 bcbffe4caa..5eb71c9f5e 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -793,6 +793,7 @@ error: 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); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.073025998 +0100 +++ 0004-net-af_packet-fix-munmap-on-init-failure.patch 2020-08-28 11:03:25.896955253 +0100 @@ -1 +1 @@ -From b02e1742ebb5a6c23bea05c4d66b1d380bcd00eb Mon Sep 17 00:00:00 2001 +From dba9120a2e05e60ae0e5ec23cb532eb3effcaaea Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b02e1742ebb5a6c23bea05c4d66b1d380bcd00eb ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 62945fee20..b9723e9619 100644 +index bcbffe4caa..5eb71c9f5e 100644 @@ -22 +23 @@ -@@ -844,6 +844,7 @@ error: +@@ -793,6 +793,7 @@ error: