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 96879A0093 for ; Tue, 19 May 2020 15:15:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8A48B1D702; Tue, 19 May 2020 15:15:27 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 72C5C1D702 for ; Tue, 19 May 2020 15:15:26 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id u1so2240138wmn.3 for ; Tue, 19 May 2020 06:15:26 -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=GPnvwQycOWfedHqmxCdYVpgLHtx5LnhXFKijqeaQB7g=; b=fcj3H0q1j6uKocXJGn4qzdCuMlC8OsP/WjYzFquoGH3DKwXySSZGGBh1p6ImtBNdyl ASi6fSab4JYoledn/5lhYbXOzPSIqCwLbstDXmlleDbaUU164KV9hI8y3hlf5W5acr99 GAAczMvWivzR8+WzN5ltmMR30IC3+hNl/X4A/g0Bn086ZR9mvZdMCw77qzjvRGBoJy73 OjBDCCG8P1uc69b8egvE/mS+OFA3aMbfFfu6yEu32UmUrUI7QyNiZ23ESuBlHyVasZ2N cNisP3VbVVZiXH8Nc3JHSWl/xmOzm64rdgdH8VNEi+QmGUJUPYzqphi+dviXdv5Kec7H ipQg== 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=GPnvwQycOWfedHqmxCdYVpgLHtx5LnhXFKijqeaQB7g=; b=pPe0MaaNqPTsN2zseysVbU1K9PM+laNrKLDwijZSkvxmNUN4Q1GyVtfGkffxUotcB6 dINpn2YYoV51ycWQpB6C0OlulAvjqM84Md17FJMkN3XPqZzRpbxWZ8r8VuMwJRPCE2vD 4zUZ0eUw0DCocbcjwIFoL187sJzB0zZILeUOA0VyEyhbI3lnoLiDkGEHQeazYx4tvhmw Tz18cXKCFM0Kp/YwFoo7oQX1VR9Ue8s2quROpWn9f7VPDr4EXq+K1llKKWQiuD3K20bM 1H0GpRElGE+13ImswWoLHuDKK7ST5kOANf9oq82t3XVE0Vb6Z6nAb1kqXmB+aJOZFG2f kU+g== X-Gm-Message-State: AOAM533+JjQ09auaOHI2nX/vZ4BX2RCSujcY0WPoILUH2sikWrU71ZPk yDY/kKiOGCJ17ITbGbvId5/gZt1SlNogPBn3 X-Google-Smtp-Source: ABdhPJwT2v7nwomGU/FjY5LI2euEGMwPdvpzx5T5a7rJloAQgBwFGrmPgaOSSY3SlWOzUjbkSkXFgg== X-Received: by 2002:a1c:7213:: with SMTP id n19mr5455747wmc.88.1589894126157; Tue, 19 May 2020 06:15:26 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z132sm4246344wmc.29.2020.05.19.06.15.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:15:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Gaetan Rivet , Ali Alnubani , dpdk stable Date: Tue, 19 May 2020 14:05:16 +0100 Message-Id: <20200519130549.112823-181-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/failsafe: fix fd leak' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 556ae6bd83a2970e0b7cf2ae216ef87eac2d1ab4 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 27 Apr 2020 18:44:19 +0800 Subject: [PATCH] net/failsafe: fix fd leak [ upstream commit b9663f60359296bcb6f0be8a3d6a2a838c77ee30 ] Zero is a valid fd. The fd won't be closed thus leading fd leak, when it is zero. Also the service proxy is initialized at 0. This is assuming that all of its fields are invalid at 0. The issue is that a file descriptor at 0 is a valid one. The value -1 is used as sentinel during cleanup. Initialize the RX proxy file descriptor to -1. Fixes: f234e5bd996d ("net/failsafe: register slaves Rx interrupts") Fixes: 9e0360aebf23 ("net/failsafe: register as Rx interrupt mode") Signed-off-by: Yunjian Wang Signed-off-by: Gaetan Rivet Tested-by: Ali Alnubani --- drivers/net/failsafe/failsafe.c | 1 + drivers/net/failsafe/failsafe_intr.c | 2 +- drivers/net/failsafe/failsafe_ops.c | 2 +- drivers/net/failsafe/failsafe_private.h | 8 ++++++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c index 8af31d71b3..72362f35de 100644 --- a/drivers/net/failsafe/failsafe.c +++ b/drivers/net/failsafe/failsafe.c @@ -190,6 +190,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev) } priv = PRIV(dev); priv->data = dev->data; + priv->rxp = FS_RX_PROXY_INIT; dev->dev_ops = &failsafe_ops; dev->data->mac_addrs = &PRIV(dev)->mac_addrs[0]; dev->data->dev_link = eth_link; diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/failsafe_intr.c index 0f34c5bbac..bb5b089b31 100644 --- a/drivers/net/failsafe/failsafe_intr.c +++ b/drivers/net/failsafe/failsafe_intr.c @@ -394,7 +394,7 @@ fs_rx_event_proxy_uninstall(struct fs_priv *priv) free(priv->rxp.evec); priv->rxp.evec = NULL; } - if (priv->rxp.efd > 0) { + if (priv->rxp.efd >= 0) { close(priv->rxp.efd); priv->rxp.efd = -1; } diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c index 50f2aca4e7..e1d08e46c8 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -380,7 +380,7 @@ fs_rx_queue_release(void *queue) rxq = queue; dev = &rte_eth_devices[rxq->priv->data->port_id]; fs_lock(dev, 0); - if (rxq->event_fd > 0) + if (rxq->event_fd >= 0) close(rxq->event_fd); FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) { if (ETH(sdev)->data->rx_queues != NULL && diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h index 8e9706aef0..651578a128 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -58,6 +58,14 @@ struct rx_proxy { enum rxp_service_state sstate; }; +#define FS_RX_PROXY_INIT (struct rx_proxy){ \ + .efd = -1, \ + .evec = NULL, \ + .sid = 0, \ + .scid = 0, \ + .sstate = SS_NO_SERVICE, \ +} + struct rxq { struct fs_priv *priv; uint16_t qid; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:51.913176286 +0100 +++ 0181-net-failsafe-fix-fd-leak.patch 2020-05-19 14:04:44.524653956 +0100 @@ -1,8 +1,10 @@ -From b9663f60359296bcb6f0be8a3d6a2a838c77ee30 Mon Sep 17 00:00:00 2001 +From 556ae6bd83a2970e0b7cf2ae216ef87eac2d1ab4 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 27 Apr 2020 18:44:19 +0800 Subject: [PATCH] net/failsafe: fix fd leak +[ upstream commit b9663f60359296bcb6f0be8a3d6a2a838c77ee30 ] + Zero is a valid fd. The fd won't be closed thus leading fd leak, when it is zero. @@ -15,7 +17,6 @@ Fixes: f234e5bd996d ("net/failsafe: register slaves Rx interrupts") Fixes: 9e0360aebf23 ("net/failsafe: register as Rx interrupt mode") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Signed-off-by: Gaetan Rivet @@ -40,10 +41,10 @@ dev->data->mac_addrs = &PRIV(dev)->mac_addrs[0]; dev->data->dev_link = eth_link; diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/failsafe_intr.c -index d8728fe7e3..602c04033c 100644 +index 0f34c5bbac..bb5b089b31 100644 --- a/drivers/net/failsafe/failsafe_intr.c +++ b/drivers/net/failsafe/failsafe_intr.c -@@ -393,7 +393,7 @@ fs_rx_event_proxy_uninstall(struct fs_priv *priv) +@@ -394,7 +394,7 @@ fs_rx_event_proxy_uninstall(struct fs_priv *priv) free(priv->rxp.evec); priv->rxp.evec = NULL; }