From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 83D8CA0548 for ; Fri, 12 Nov 2021 09:44:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7ACF040687; Fri, 12 Nov 2021 09:44:52 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7065040687 for ; Fri, 12 Nov 2021 09:44:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636706690; 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; bh=KU+JP8zs1Bz/hhYc3reVqFYj12tXGIbG17x4JyNX6sU=; b=CZ2p8wFMpte8aZlVk3+KbVZUaYH7fZuPKMxbZVVmD4wUbJfZNyO4ex1y2wAGJuDS7ZA6Gi 0NXDoAfvh1gxsdsW+5wsfb+eDo0T9n3sr84mNku0QkIrGwT3XU5KjLwaVlq8PFinPOCPWx 67EnZm4/v7k2GpUTcKvdxS8JWcXGr9s= 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-182-4ZAPt4O7Px-r4sPa6844BQ-1; Fri, 12 Nov 2021 03:44:49 -0500 X-MC-Unique: 4ZAPt4O7Px-r4sPa6844BQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B37A7817440; Fri, 12 Nov 2021 08:44:48 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.192.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48B4364188; Fri, 12 Nov 2021 08:44:46 +0000 (UTC) From: David Marchand To: stable@dpdk.org, xuemingl@nvidia.com Cc: dkozlyuk@nvidia.com Subject: [PATCH 20.11] net/mlx5: do not close stdin on error Date: Fri, 12 Nov 2021 09:44:35 +0100 Message-Id: <20211112084435.26358-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 [ upstream commit 7f49dafe0534b8a8614492c052d7fbe2e87dc6ae ] If for any reason, a socket could not be opened, mlx5_pmd_socket_init() could close the 0 fd (which is valid, and has a fair chance to be stdin), since server_socket == 0 from the variable being in .bss. Fixes: e6cdc54cc0ef ("net/mlx5: add socket server for external tools") Signed-off-by: David Marchand Reviewed-by: Dmitry Kozlyuk --- drivers/net/mlx5/linux/mlx5_socket.c | 29 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_socket.c b/drivers/net/mlx5/linux/mlx5_socket.c index b1f41bc102..24dea5e3c7 100644 --- a/drivers/net/mlx5/linux/mlx5_socket.c +++ b/drivers/net/mlx5/linux/mlx5_socket.c @@ -18,7 +18,7 @@ #define MLX5_SOCKET_PATH "/var/tmp/dpdk_net_mlx5_%d" -int server_socket; /* Unix socket for primary process. */ +int server_socket = -1; /* Unix socket for primary process. */ struct rte_intr_handle server_intr_handle; /* Interrupt handler. */ /** @@ -117,7 +117,7 @@ mlx5_pmd_socket_handle(void *cb __rte_unused) static int mlx5_pmd_interrupt_handler_install(void) { - MLX5_ASSERT(server_socket); + MLX5_ASSERT(server_socket != -1); server_intr_handle.fd = server_socket; server_intr_handle.type = RTE_INTR_HANDLE_EXT; return rte_intr_callback_register(&server_intr_handle, @@ -130,7 +130,7 @@ mlx5_pmd_interrupt_handler_install(void) static void mlx5_pmd_interrupt_handler_uninstall(void) { - if (server_socket) { + if (server_socket != -1) { mlx5_intr_callback_unregister(&server_intr_handle, mlx5_pmd_socket_handle, NULL); @@ -158,7 +158,7 @@ mlx5_pmd_socket_init(void) int flags; MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY); - if (server_socket) + if (server_socket != -1) return 0; /* * Initialize the socket to communicate with the secondary @@ -173,10 +173,10 @@ mlx5_pmd_socket_init(void) server_socket = ret; flags = fcntl(server_socket, F_GETFL, 0); if (flags == -1) - goto error; + goto close; ret = fcntl(server_socket, F_SETFL, flags | O_NONBLOCK); if (ret < 0) - goto error; + goto close; snprintf(sun.sun_path, sizeof(sun.sun_path), MLX5_SOCKET_PATH, getpid()); remove(sun.sun_path); @@ -184,25 +184,26 @@ mlx5_pmd_socket_init(void) if (ret < 0) { DRV_LOG(WARNING, "cannot bind mlx5 socket: %s", strerror(errno)); - goto close; + goto remove; } ret = listen(server_socket, 0); if (ret < 0) { DRV_LOG(WARNING, "cannot listen on mlx5 socket: %s", strerror(errno)); - goto close; + goto remove; } if (mlx5_pmd_interrupt_handler_install()) { DRV_LOG(WARNING, "cannot register interrupt handler for mlx5 socket: %s", strerror(errno)); - goto close; + goto remove; } return 0; -close: +remove: remove(sun.sun_path); -error: +close: claim_zero(close(server_socket)); - server_socket = 0; + server_socket = -1; +error: DRV_LOG(ERR, "Cannot initialize socket: %s", strerror(errno)); return -errno; } @@ -212,11 +213,11 @@ mlx5_pmd_socket_init(void) */ RTE_FINI(mlx5_pmd_socket_uninit) { - if (!server_socket) + if (server_socket == -1) return; mlx5_pmd_interrupt_handler_uninstall(); claim_zero(close(server_socket)); - server_socket = 0; + server_socket = -1; MKSTR(path, MLX5_SOCKET_PATH, getpid()); claim_zero(remove(path)); } -- 2.23.0