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 989FEA04B1 for ; Fri, 28 Aug 2020 12:13:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 77DC01C114; Fri, 28 Aug 2020 12:13:42 +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 BC331A3 for ; Fri, 28 Aug 2020 12:13:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609620; 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=96qgkP9V6zHFMEjmTXIu0CZuCPD76NfAQu+SU1PSpYM=; b=VxbFGYTG296VLkxLbRnGm3DH9lr5wEYTGWXaTuVprP8SU9hGXaZkj59sv4/B16gRGRk9Pw GlKDbuyAF1kZmCoJz0AGoT34AeRvHIevsvok3/YxquPFqnzyOAp9GrzSMut8eRD0MFlzsc Uz8hw9UV3pQebdz80X/uaaKKirwBFW8= 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-490-COCuUsO8OP6Q9mhLkVdoTA-1; Fri, 28 Aug 2020 06:13:37 -0400 X-MC-Unique: COCuUsO8OP6Q9mhLkVdoTA-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 B4FA21DE05; Fri, 28 Aug 2020 10:13:35 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AB0A19D7C; Fri, 28 Aug 2020 10:13:34 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ferruh Yigit , dpdk stable Date: Fri, 28 Aug 2020 11:12:28 +0100 Message-Id: <20200828101308.223767-2-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 check of file descriptors' 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/2cea42a592e20072c337cbe9fc070dd57615fcb3 Thanks. Kevin. --- >From 2cea42a592e20072c337cbe9fc070dd57615fcb3 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 6 Jul 2020 20:27:32 +0800 Subject: [PATCH] net/af_packet: fix check of file descriptors [ upstream commit c6d1a552a8798df02bf85627c5d47a28ccdc62f8 ] Zero is a valid fd. It will fail to check the fd if the fd is zero. Fixes: 527740ccfaec ("af_packet: fix some leaks") Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit --- drivers/net/af_packet/rte_eth_af_packet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 90e34c45ac..698197b552 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -589,4 +589,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, (*internals)->rx_queue[q].map = MAP_FAILED; (*internals)->tx_queue[q].map = MAP_FAILED; + (*internals)->rx_queue[q].sockfd = -1; + (*internals)->tx_queue[q].sockfd = -1; } @@ -796,5 +798,5 @@ error: rte_free((*internals)->rx_queue[q].rd); rte_free((*internals)->tx_queue[q].rd); - if (((*internals)->rx_queue[q].sockfd != 0) && + if (((*internals)->rx_queue[q].sockfd >= 0) && ((*internals)->rx_queue[q].sockfd != qsockfd)) close((*internals)->rx_queue[q].sockfd); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.033097369 +0100 +++ 0002-net-af_packet-fix-check-of-file-descriptors.patch 2020-08-28 11:03:25.894955238 +0100 @@ -1 +1 @@ -From c6d1a552a8798df02bf85627c5d47a28ccdc62f8 Mon Sep 17 00:00:00 2001 +From 2cea42a592e20072c337cbe9fc070dd57615fcb3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c6d1a552a8798df02bf85627c5d47a28ccdc62f8 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index e1e7f3973b..db5de8e45e 100644 +index 90e34c45ac..698197b552 100644 @@ -21 +22 @@ -@@ -646,4 +646,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, +@@ -589,4 +589,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, @@ -28 +29 @@ -@@ -849,5 +851,5 @@ error: +@@ -796,5 +798,5 @@ error: