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 16CE0A0518 for ; Fri, 24 Jul 2020 14:10:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0E2E51C21A; Fri, 24 Jul 2020 14:10:36 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 12A611C20A for ; Fri, 24 Jul 2020 14:10:35 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id f1so7546619wro.2 for ; Fri, 24 Jul 2020 05:10:35 -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=jtDZtyEmHLSf+le2V7ChblKdRz9TAgLgBHYyKqbCE+Y=; b=pbzylGLlZ84d7ZFXSgA/p6+vytjtYSyO5LYPkkrm35g/DCd9jMDkDonZxCS5e0tOPN EXdmSxWAqxWBB4P9i1t2NLSsWtyDNtKvSB0W0I/MmEOp3zWxbWeEtHxbgKIlHqDNd/S5 u2AD4Sb10GcwM2OQHQg0YTsEJF2q1Qe8H4gL9rzXnYjsPMzPe+AHz0qg6UVaYGYg5tqN D2QxH1sHekS0tKHGp7cSQf4bKuTav1I/26SA24A0ao4sISO0uxr1UdWOEVmCN+WASjzM Il5CZ8qDIyx2tQt3HpHyNe+BDLUg29L52rMVKA+5wgJSqpNqTIMorWVbdHAvkn/9UXIi 2GVg== 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=jtDZtyEmHLSf+le2V7ChblKdRz9TAgLgBHYyKqbCE+Y=; b=DbRXw5fh+Vbx/MxAEuLu0uFEOG6E4V3gqXa937ZXLkgIkBIywXx7mp1P1sLh6XLp/e TgT1/mi3Oix+zlJUyY6ksFHKsnLlcTHF6PqQa4HsNhRsgWnE2TmL/i13M/lRGOIqC9ce xNSzhagxAML5N8GY8DCavPFnHFp9hfFmY3vSM+9DXBjo+mVOUyijfxZ9KXinWU21qKYw szZbJAxSDiy2zADp2RtTt89uVip5jTfinZpe9jUSDSAX8AV8drslrVNW+7EhM2galyy4 q9SDHQveFlWrig67U4Os7QHwMAE77Twq/iTavoZ0Zh6n9RrPdjjLKFWhBSIcLHZt6fTb tPmg== X-Gm-Message-State: AOAM533gBCvfKpPBe/TMVj9D1x/KRs9mgBQ+IDg0RPiCaRlYmwmOA0qo 0u9vhyxeOxbubtrsgoeqH8Y= X-Google-Smtp-Source: ABdhPJwpDRLf4TWCuWoDLv4HJEIb20PB2nOnishcw/cSnVl03OssNpsbPSCcJQKzEySeS9xUWRvEcQ== X-Received: by 2002:adf:df89:: with SMTP id z9mr8262663wrl.395.1595592634826; Fri, 24 Jul 2020 05:10:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i66sm3796585wma.35.2020.07.24.05.10.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:10:34 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Ferruh Yigit , dpdk stable Date: Fri, 24 Jul 2020 12:59:53 +0100 Message-Id: <20200724120030.1863487-155-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 check of file descriptors' 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 4dece22a2bd4e3301faa6555e6bf291c011ce3b4 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 f5806bf42..6c6bbaccf 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -604,6 +604,8 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, for (q = 0; q < nb_queues; q++) { (*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; } req = &((*internals)->req); @@ -807,7 +809,7 @@ 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.537386172 +0100 +++ 0155-net-af_packet-fix-check-of-file-descriptors.patch 2020-07-24 12:53:48.519010782 +0100 @@ -1,12 +1,13 @@ -From c6d1a552a8798df02bf85627c5d47a28ccdc62f8 Mon Sep 17 00:00:00 2001 +From 4dece22a2bd4e3301faa6555e6bf291c011ce3b4 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") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit @@ -15,10 +16,10 @@ 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 e1e7f3973..db5de8e45 100644 +index f5806bf42..6c6bbaccf 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c -@@ -645,6 +645,8 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, +@@ -604,6 +604,8 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, for (q = 0; q < nb_queues; q++) { (*internals)->rx_queue[q].map = MAP_FAILED; (*internals)->tx_queue[q].map = MAP_FAILED; @@ -27,7 +28,7 @@ } req = &((*internals)->req); -@@ -848,7 +850,7 @@ error: +@@ -807,7 +809,7 @@ error: rte_free((*internals)->rx_queue[q].rd); rte_free((*internals)->tx_queue[q].rd);