From nobody Wed Oct 29 21:44:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxgkM2zSZz6FM2q; Wed, 29 Oct 2025 21:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxgkM2FpFz3Dsb; Wed, 29 Oct 2025 21:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761774267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VI42zN9Nbx6s7lNY5xTv642OmvjRN53YqDCe7m2V5K8=; b=SBR2egW0wWROK3Ek6XI5CL+8kv2GJQLmb15il4OQtrqcKf9RuUsxPr7h2KQlz3wQIqLaih 1+UgJyx18bmWdERbgQTGFxr+y9R59YjMCymqvnr4bqqLB07IoCBniBIAW0pSfPnCVXRadU EeSvqplQMcFsQSUcKrUdg2Ss90KPMXkMDkIAg0VKCsor+jGGRNefhdsjLBCWNFryjayaHI ISmVpEeZH73yFnebSAxq1VXTUJZtW6zkatzTTlSuujalS+HGKlk0AVLiSfs0N+PJWefBrX wCbcrcHxKO3QljH3G/BEpOPfNrapYQ5x9rHV0Jn8mUQikaZWS1tP0BXgxiFICA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761774267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VI42zN9Nbx6s7lNY5xTv642OmvjRN53YqDCe7m2V5K8=; b=nWPKynuWlSpm9FXy/lsz5kgs2C+lquUc8/HFUQL8SKcatQlGxZm7I2qdgUckAOVg79vqa+ V1iIfE5mWT0Xb1Vbxjgzr6JHU5EsSk9osYgcnkUVfViZAYqME5zW1FIX/clUngAUrjfn+5 PdkdrCsmBJ7X3MkinKPSTYnjZc+vtdtDq5nYWFLeCcVZAMFKDf5UEEcEriJMEFTsGcJ/Lk KJBKL1snCZMeIyVzViWIp6pS8bBiNRir2UjcBeidI3SPRbPwfoAlNKwfPGJQykfErMjXGa xvBK8HEtPYZ6dULNjGfve5ozD3MaFWKCJY68toxsnlcCvPE3hs+MVrnZbjUUQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761774267; a=rsa-sha256; cv=none; b=LlmbZtAeVMWffGXq5tAzoBFNiEw1D3QbB5udAB4vW1Q/JZtzncmitxIB7eyNPrZCclYBvh rgx23zaaMSPFFSSv/OR4xBgrYYhGB87XvwQT8fEBLi//54qIycL8C6U7fKzGz7NQjjMl7Q aNgh5faKJCx9NumuTWSM9qw3guYlzZlkRE4W3oKieq/D2/H9vKXA3lRh4TCWNj3jo6ZuUS OZTARxE4zeLFU4+ZsScA5IwJTwpURHT9nZnf7NPx3nBD6TxyJ2G2JYCz3nATOT0oUbg8QK xVbqk6dKM/pUyPrMia+yi+856016FfIWXSs/jh0Tv0YmdK0AZsvoKDMWXqgPKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxgkM1s82ztgM; Wed, 29 Oct 2025 21:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59TLiRiU030321; Wed, 29 Oct 2025 21:44:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TLiRFu030318; Wed, 29 Oct 2025 21:44:27 GMT (envelope-from git) Date: Wed, 29 Oct 2025 21:44:27 GMT Message-Id: <202510292144.59TLiRFu030318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 8d5a88ac95b2 - main - nfs_clvfsops.c: Allow long directory mount paths List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d5a88ac95b23b0a8c4943be0aef1f93e3902bfb Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8d5a88ac95b23b0a8c4943be0aef1f93e3902bfb commit 8d5a88ac95b23b0a8c4943be0aef1f93e3902bfb Author: Rick Macklem AuthorDate: 2025-10-29 21:41:12 +0000 Commit: Rick Macklem CommitDate: 2025-10-29 21:41:12 +0000 nfs_clvfsops.c: Allow long directory mount paths Without this patch, the NFS client code for mounts has an arbitrary 100 character limit for the directory path being mounted on the server. Someone reported this quite a while ago, but I cannot find the email or bugzilla PR. This patch fixes the problem by increasing the directory path length limit to MNAMELEN, allocated via malloc() to avoid using too much stack. MFC after: 2 weeks --- sys/fs/nfsclient/nfs_clvfsops.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 5ea7eab07632..212c88f28930 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -927,7 +927,7 @@ nfs_mount(struct mount *mp) struct vnode *vp; struct thread *td; char *hst; - u_char nfh[NFSX_FHMAX], krbname[100], dirpath[100], srvkrbname[100]; + u_char nfh[NFSX_FHMAX], krbname[100], *dirpath, srvkrbname[100]; char *cp, *opt, *name, *secname, *tlscertname; int nametimeo = NFS_DEFAULT_NAMETIMEO; int negnametimeo = NFS_DEFAULT_NEGNAMETIMEO; @@ -943,6 +943,7 @@ nfs_mount(struct mount *mp) newflag = 0; tlscertname = NULL; hst = malloc(MNAMELEN, M_TEMP, M_WAITOK); + dirpath = malloc(MNAMELEN, M_TEMP, M_WAITOK); if (vfs_filteropt(mp->mnt_optnew, nfs_opts)) { error = EINVAL; goto out; @@ -1329,7 +1330,7 @@ nfs_mount(struct mount *mp) goto out; } else if (nfs_mount_parse_from(mp->mnt_optnew, &args.hostname, (struct sockaddr_in **)&nam, dirpath, - sizeof(dirpath), &dirlen) == 0) { + MNAMELEN, &dirlen) == 0) { has_nfs_from_opt = 1; bcopy(args.hostname, hst, MNAMELEN); hst[MNAMELEN - 1] = '\0'; @@ -1387,7 +1388,7 @@ nfs_mount(struct mount *mp) if (has_nfs_from_opt == 0) { if (vfs_getopt(mp->mnt_optnew, "dirpath", (void **)&name, NULL) == 0) - strlcpy(dirpath, name, sizeof (dirpath)); + strlcpy(dirpath, name, MNAMELEN); else dirpath[0] = '\0'; dirlen = strlen(dirpath); @@ -1472,6 +1473,7 @@ out: MNT_IUNLOCK(mp); } free(hst, M_TEMP); + free(dirpath, M_TEMP); return (error); }