From patchwork Wed Feb 5 15:43:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 13961397 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7934415FA7B for ; Wed, 5 Feb 2025 15:43:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770224; cv=none; b=id8def3XyW6nw61GLxdhA9jriSgsVeJ3prPZV2hTKzlFJSd61UJR/zRCAd7IF/lG3d6zK1pLtzJTam1vZ0sz3kBe47X2qj4Fyp3WMB14Z5tB67iWCNsOD3aPRRAKuea+LAWxHlDtYiFsXktIzIOQ6+wMNKM/QukWsVea0w+P5rE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770224; c=relaxed/simple; bh=PClFaLceKKrlHjjkUggbhLd0y9eGTgZcIQ+LXxJtRJg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mpSDxtcPAuIrAjf5JHMEzmq0imQhUrYGCdPVrjQqjxK5xuQBkoK/nbTdKFXbxKo2C8zdfen5cTNdqZomIOsijQw3+gn2DZ2HlQJ/i/jw00XcPcRazZhI2uA0vN9Krn59LpOFRcOm6PYnA0KgbERubi/oMQ2DYVdkxW2VUgpakZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=YeWN9vUT; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YeWN9vUT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738770221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EvxjezREji/E3sTzBtYF8DFHKn53uIX4n7f8+6lhhIQ=; b=YeWN9vUT8ypgKWrX4wYjcV211DYy8qgt83DH9cup8yrM+Co4x3qCm4QfqojFDYDAbrfTax cQTZS2X113GAUUfXTotlXL/AolRkU8IpvM8J6OKIyDnRD37LRXwoN704tZQA6ba2AEGfWF 38XNdYwfk/NjgRykpg8BwR6judcrhj4= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-152-NziWkbu6N2CcU4_G0ssu2w-1; Wed, 05 Feb 2025 10:43:40 -0500 X-MC-Unique: NziWkbu6N2CcU4_G0ssu2w-1 X-Mimecast-MFC-AGG-ID: NziWkbu6N2CcU4_G0ssu2w Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3797A1800983 for ; Wed, 5 Feb 2025 15:43:39 +0000 (UTC) Received: from okorniev-mac.redhat.com (unknown [10.22.82.81]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 504B3195608D; Wed, 5 Feb 2025 15:43:38 +0000 (UTC) From: Olga Kornievskaia To: steved@redhat.com Cc: linux-nfs@vger.kernel.org, Olga Kornievskaia Subject: [PATCH 1/4] nfs-utils: nfsdctl: fix update_listeners Date: Wed, 5 Feb 2025 10:43:30 -0500 Message-Id: <20250205154333.58646-2-okorniev@redhat.com> In-Reply-To: <20250205154333.58646-1-okorniev@redhat.com> References: <20250205154333.58646-1-okorniev@redhat.com> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 When adding a listener via an nfsdctl listener command and passing in a hostname that is longer then 62bytes it leads to a buffer overlow problem. Instead allocate the needed buffer to be the size of the supplied command-line argument. Fixes: 8c32613d5311 ("nfsdctl: add the nfsdctl utility to nfs-utils") Signed-off-by: Olga Kornievskaia --- utils/nfsdctl/nfsdctl.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c index 0e93beda..0530dfdd 100644 --- a/utils/nfsdctl/nfsdctl.c +++ b/utils/nfsdctl/nfsdctl.c @@ -938,8 +938,6 @@ static void print_listeners(void) } } -#define BUFLEN (INET6_ADDRSTRLEN + 16) - /* * Format is <+/->:
:port * @@ -950,7 +948,7 @@ static void print_listeners(void) */ static int update_listeners(const char *str) { - char buf[INET6_ADDRSTRLEN + 16]; + char *buf; char sign = *str; char *netid, *addr, *port, *end; struct addrinfo *res; @@ -963,6 +961,9 @@ static int update_listeners(const char *str) if (sign != '+' && sign != '-') goto out_inval; + buf = malloc(strlen(str) + 1); + if (!buf) + goto out_inval; strcpy(buf, str + 1); /* netid is start */ @@ -971,18 +972,18 @@ static int update_listeners(const char *str) /* find first ':' */ addr = strchr(buf, ':'); if (!addr) - goto out_inval; + goto out_inval_free; if (addr == buf) { /* empty netid */ - goto out_inval; + goto out_inval_free; } *addr = '\0'; ++addr; port = strrchr(addr, ':'); if (!port) - goto out_inval; + goto out_inval_free; if (port == addr) { /* empty address, give gai a NULL ptr */ addr = NULL; @@ -992,7 +993,7 @@ static int update_listeners(const char *str) if (*port == '\0') { /* empty port */ - goto out_inval; + goto out_inval_free; } /* IPv6 addrs must be in square brackets */ @@ -1001,7 +1002,7 @@ static int update_listeners(const char *str) ++addr; end = strchr(addr, ']'); if (!end) - goto out_inval; + goto out_inval_free; if (end == addr) addr = NULL; *end = '\0'; @@ -1070,7 +1071,10 @@ static int update_listeners(const char *str) ++nfsd_socket_count; } } + free(buf); return 0; +out_inval_free: + free(buf); out_inval: fprintf(stderr, "Invalid listener update string: %s", str); return -EINVAL; From patchwork Wed Feb 5 15:43:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 13961398 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4314A15FA7B for ; Wed, 5 Feb 2025 15:43:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770227; cv=none; b=i3VS9uwB+2uvasF7GZBsKUxkC4u7FFbXDhcktyJgQKqlIykBmKJ6poaN2uqllS5ErxCemXbHRwK/buFnQUPXawJIdfDvHSS8fD4nOTAtH6W5m9Rw+oWGux+7BM5ne4L7fDKOaC/GD/d6iAxyQnC3RlQNgg1txw4Yr2Gt+vQWclk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770227; c=relaxed/simple; bh=IykN3c1X42iqx8cAkLlwE3yprV0MhYEUAvJnkHCerDQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Dt6bJhn2SPolc2GpaVwuPzebNLsfC0Ow9Yjsq0PKpbkj+uFp9wnGxMH18H/VqfxcRrGSA8Ni3K739aG2e1y8fYm5Yszx9CiSXi3tHlstPUUBP6c9SAX1V/OV/qreT2wdZXtGgLyhwwgIjQNK8uMCA/ZSeic/gqcqmnpHyCEqEzM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=JY9ljJGW; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JY9ljJGW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738770224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CisEwXdVN53ah8bmYpFQiU6+tn6g05Qn5jPpgl6FYck=; b=JY9ljJGWCSPjIZzRJLwx1KUa0PT1EH44TPKEKFrDgccHIG0L4/tkBSXsPIqS730Xx2aaKH 0LCpSgEi9afKXGkJVJxwbqToN1+uhW5rsXxhgZoHxwbcN5iNOKMDKv51yKXi8mROcdzqRQ RVY5rYb8q1dDl9A6mJbFVsDYdv2UP3I= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-454-hhxL4xGlPGyqPsEBeW9Y7g-1; Wed, 05 Feb 2025 10:43:43 -0500 X-MC-Unique: hhxL4xGlPGyqPsEBeW9Y7g-1 X-Mimecast-MFC-AGG-ID: hhxL4xGlPGyqPsEBeW9Y7g Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 473F21956086 for ; Wed, 5 Feb 2025 15:43:42 +0000 (UTC) Received: from okorniev-mac.redhat.com (unknown [10.22.82.81]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5ED9D195608D; Wed, 5 Feb 2025 15:43:41 +0000 (UTC) From: Olga Kornievskaia To: steved@redhat.com Cc: linux-nfs@vger.kernel.org, Olga Kornievskaia Subject: [PATCH 2/4] nfs-utils: nfsdctl: fix autostart Date: Wed, 5 Feb 2025 10:43:31 -0500 Message-Id: <20250205154333.58646-3-okorniev@redhat.com> In-Reply-To: <20250205154333.58646-1-okorniev@redhat.com> References: <20250205154333.58646-1-okorniev@redhat.com> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 During nfsdctl autostart the nfsdctl reads the nfs.conf file and tries to setup the listeners and start knfsd threads. However, if we failed to start a listener, it currently ignores the error and starts the threads anyway. Suggesting that if we fail to start a UDP/TCP listener then do not start threads. At the moment ignoring the failure of adding an RDMA listener (because default config might have rdma=y set but not RDMA-enabled interface is available and previously we did not fail the start of knfsd in that case). Signed-off-by: Olga Kornievskaia --- utils/nfsdctl/nfsdctl.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c index 0530dfdd..624243dc 100644 --- a/utils/nfsdctl/nfsdctl.c +++ b/utils/nfsdctl/nfsdctl.c @@ -1285,7 +1285,7 @@ static int pool_mode_func(struct nl_sock *sock, int argc, char **argv) #define MAX_LISTENER_LEN (64 * 2 + 16) -static void +static int add_listener(const char *netid, const char *addr, const char *port) { char buf[MAX_LISTENER_LEN]; @@ -1297,7 +1297,7 @@ add_listener(const char *netid, const char *addr, const char *port) snprintf(buf, MAX_LISTENER_LEN, "+%s:%s:%s", netid, addr, port); buf[MAX_LISTENER_LEN - 1] = '\0'; - update_listeners(buf); + return update_listeners(buf); } static void @@ -1350,11 +1350,12 @@ static int configure_versions(void) return 0; } -static void configure_listeners(void) +static int configure_listeners(void) { char *port, *rdma_port; bool rdma, udp, tcp; struct conf_list *hosts; + int ret = 0; udp = conf_get_bool("nfsd", "udp", false); tcp = conf_get_bool("nfsd", "tcp", true); @@ -1378,20 +1379,23 @@ static void configure_listeners(void) struct conf_list_node *n; TAILQ_FOREACH(n, &(hosts->fields), link) { if (udp) - add_listener("udp", n->field, port); + ret = add_listener("udp", n->field, port); if (tcp) - add_listener("tcp", n->field, port); + ret = add_listener("tcp", n->field, port); if (rdma) add_listener("rdma", n->field, rdma_port); + if (ret) + return ret; } } else { if (udp) - add_listener("udp", "", port); + ret = add_listener("udp", "", port); if (tcp) - add_listener("tcp", "", port); + ret = add_listener("tcp", "", port); if (rdma) add_listener("rdma", "", rdma_port); } + return ret; } static void autostart_usage(void) @@ -1438,7 +1442,9 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv) if (ret) return ret; - configure_listeners(); + ret = configure_listeners(); + if (ret) + return ret; ret = set_listeners(sock); if (ret) return ret; From patchwork Wed Feb 5 15:43:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 13961399 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2EF9015FA7B for ; Wed, 5 Feb 2025 15:43:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770231; cv=none; b=LTdnDSB3ZMRiVODWro2ccvVhGEQJQpEFh51O2HvQFzIptvtNsNydo6PIEuRroMYCuZIMRq4ZrdwYzkN0wKnd9iEgPId8YsP8L9IsmQOBuBi5EWb9+LhRai+4nBbIg1CUWaql4ACGQDE1JZLS2pS0sGQUocvoB+fAzLI4w+O3TFA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770231; c=relaxed/simple; bh=351tppkOywBRvVcFmrA7iYU0pm3YcCeEvcDR4U3+ZhU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fo2IotkY4YT4iiYolFULwjJ/W3iJwU5mf+e/4aEpE76gRh5TEneCbGZAp7Wc03CjhJrXAAmSt6ZMGy60XojmwX7BkX0vklIFTHxujtUF9FzXUe9/Bi+B+oKQkHVNf+ac0k001Kk+GsNYNWqyqu+s6XwRj7vXQaM5dCwRin3Nvck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=NI5qX61p; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NI5qX61p" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738770226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9ue53weQJz0q6CJxCblQXAliUuP9Z0KF8YdE7C3UHcw=; b=NI5qX61pIFT5kz07ONWjMz3Wt/uWP7WoXQxtkhnuW0ez2E3bwx7GBek2HKnp9BTAzlcsIa zxuT41yOyndsRS6V+6nUZabagVzIPRhkidUkPZ0qmvfp8D09RlA1nPjlKFVXg7X/mE3iZi 00fmim2Hg0QeeiSqnsNr69/RuouvnKs= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-102-SmjP17B2O4GcU8a2hqWPfA-1; Wed, 05 Feb 2025 10:43:45 -0500 X-MC-Unique: SmjP17B2O4GcU8a2hqWPfA-1 X-Mimecast-MFC-AGG-ID: SmjP17B2O4GcU8a2hqWPfA Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 713D51956094 for ; Wed, 5 Feb 2025 15:43:44 +0000 (UTC) Received: from okorniev-mac.redhat.com (unknown [10.22.82.81]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8804E1956051; Wed, 5 Feb 2025 15:43:43 +0000 (UTC) From: Olga Kornievskaia To: steved@redhat.com Cc: linux-nfs@vger.kernel.org, Olga Kornievskaia Subject: [PATCH 3/4] nfs-utils: nfsdctl: cleanup listeners if some failed Date: Wed, 5 Feb 2025 10:43:32 -0500 Message-Id: <20250205154333.58646-4-okorniev@redhat.com> In-Reply-To: <20250205154333.58646-1-okorniev@redhat.com> References: <20250205154333.58646-1-okorniev@redhat.com> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 If we couldn't start some listeners, then make sure to remove already added listeners. Signed-off-by: Olga Kornievskaia --- utils/nfsdctl/nfsdctl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c index 624243dc..64ce44a1 100644 --- a/utils/nfsdctl/nfsdctl.c +++ b/utils/nfsdctl/nfsdctl.c @@ -1413,6 +1413,7 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv) struct conf_list *thread_str; struct conf_list_node *n; char *scope, *pool_mode; + bool failed_listeners = false; optind = 1; while ((opt = getopt_long(argc, argv, "h", help_only_options, NULL)) != -1) { @@ -1447,7 +1448,7 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv) return ret; ret = set_listeners(sock); if (ret) - return ret; + failed_listeners = true; grace = conf_get_num("nfsd", "grace-time", 0); lease = conf_get_num("nfsd", "lease-time", 0); @@ -1456,6 +1457,12 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv) thread_str = conf_get_list("nfsd", "threads"); pools = thread_str ? thread_str->cnt : 1; + /* if we fail to start one or more listeners, then cleanup by + * starting 0 knfsd threads + */ + if (failed_listeners) + pools = 0; + threads = calloc(pools, sizeof(int)); if (!threads) return -ENOMEM; From patchwork Wed Feb 5 15:43:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 13961400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 094AB18952C for ; Wed, 5 Feb 2025 15:43:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770231; cv=none; b=sXyIWVtG4Fe+7Lxu21h39Ozp2wjCEfh0tMW+f+3y5xy4wsS7PKp+Wya/e5Z5P0+49v3ZJWePwzU27tEtB5g2LjHRCnqgrYfecOey/PQ9oEchkHPXYru8W0+gQyvlYm7rgQlbWjeK4h0veAhEtrXKm3OukRcWF5k/fYEvqKl1zfc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770231; c=relaxed/simple; bh=d5gRQRQJHc7bCxRTVTalqlk70Zkgm6gwkVcduipd9iE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NeMyvGRvI6Zo1ZM/AiOGew4Saw7wrq4KuQXGFlKcNJzj2WO2XImUnkRGlbtiGEhfpUfgbH3uE8rCEanx3Unq1+Qlt5XEoTaVfDbbB8BAPJj5yjzjeacAlc1XQVv10rqgZwigIpik+LDV5gtXrBBLWh2U+eDZD9aMQg358fIhyjg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Z9Umfx9+; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Z9Umfx9+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738770228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qiECIRWiChw3CvjpDSmrgdHpXeGdFVubGgfvtUUJPu0=; b=Z9Umfx9+gZliQyY01s58LmEAt3VfXnOP3ojimcnwfO64o90mX/lxPvO0QucyDTACNQoRmm rIsvHjWFQCNv7yrkwgVALNzmlpGwq2F/VhF2B9GZ0932vO2cCnKepq1H1kuCouJ4ePBhKN Q2R3ZFUtcZR+AJ7fD8ddt4nOhA3Ycgg= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-208-Yxpgh8KFNpGBKeBx7j_6xA-1; Wed, 05 Feb 2025 10:43:47 -0500 X-MC-Unique: Yxpgh8KFNpGBKeBx7j_6xA-1 X-Mimecast-MFC-AGG-ID: Yxpgh8KFNpGBKeBx7j_6xA Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D144B1956086 for ; Wed, 5 Feb 2025 15:43:46 +0000 (UTC) Received: from okorniev-mac.redhat.com (unknown [10.22.82.81]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E7E73195608D; Wed, 5 Feb 2025 15:43:45 +0000 (UTC) From: Olga Kornievskaia To: steved@redhat.com Cc: linux-nfs@vger.kernel.org, Olga Kornievskaia Subject: [PATCH 4/4] nfs-utils: nfsdctl: fix host-limited add listener Date: Wed, 5 Feb 2025 10:43:33 -0500 Message-Id: <20250205154333.58646-5-okorniev@redhat.com> In-Reply-To: <20250205154333.58646-1-okorniev@redhat.com> References: <20250205154333.58646-1-okorniev@redhat.com> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 If in nfs.conf there was "host=" configuration that limited knfsd to listen on a particular hostname, then add_listener() had to fit :: into 144bytes to create a listener or be truncated which leads to failure of said listener creation. Instead allocate needed memory dynamically to allow for long hostname values. Signed-off-by: Olga Kornievskaia --- utils/nfsdctl/nfsdctl.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c index 64ce44a1..05fecc71 100644 --- a/utils/nfsdctl/nfsdctl.c +++ b/utils/nfsdctl/nfsdctl.c @@ -1283,21 +1283,26 @@ static int pool_mode_func(struct nl_sock *sock, int argc, char **argv) return pool_mode_doit(sock, cmd, pool_mode); } -#define MAX_LISTENER_LEN (64 * 2 + 16) - static int add_listener(const char *netid, const char *addr, const char *port) { - char buf[MAX_LISTENER_LEN]; + char *buf; + int ret; + int size = strlen(addr) + 1 + 16; + buf = calloc(size, sizeof(int)); + if (!buf) + return -ENOMEM; if (strchr(addr, ':')) - snprintf(buf, MAX_LISTENER_LEN, "+%s:[%s]:%s", + snprintf(buf, size, "+%s:[%s]:%s", netid, addr, port); else - snprintf(buf, MAX_LISTENER_LEN, "+%s:%s:%s", + snprintf(buf, size, "+%s:%s:%s", netid, addr, port); - buf[MAX_LISTENER_LEN - 1] = '\0'; - return update_listeners(buf); + buf[size - 1] = '\0'; + ret = update_listeners(buf); + free(buf); + return ret; } static void