From nobody Sat Nov 4 22:10:55 2023 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 4SNBdX28Sfz4yvHw; Sat, 4 Nov 2023 22:10:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNBdX1XfSz4ct7; Sat, 4 Nov 2023 22:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699135856; 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=5OXMsagkV18ME3jgWG+cZFnpBUBeol33eNZwcL3GpDM=; b=pjOEBOggoqGVUKigXKmFlFC7qVmbsmJnUC9aZmuahzQZjPJpc7x0SEY5O75C1NruDugeUx x53Cu/uskYw5KRLUNe4FaKsYU6R70JrbrVDzly4Vpqgv3ePVEexu4CZ1uDXTCWzIBcWRDl VLiVgClY5U8SObrzkMfNGqOEE154r9T4RvFHVt/WJfXH65u5pEik/2NwIjGd6uJcOR7YnJ /tTFRL4WatW3kSnwPxsLpsNaNaMbEQxJZNhqd0FdFZjNdqn59CrvbP01hAbdYB6H9qU1pH 1Ibz9zB6SRAGm3b4jMle/KmplrXppqsWW/QTpUBntolsn9tINGzg23bnWWMOjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699135856; 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=5OXMsagkV18ME3jgWG+cZFnpBUBeol33eNZwcL3GpDM=; b=Y8Ox4tRXB4lhFWYyR9gxQV5oh2dqLqkngrEiFDwtASrt7iB2HVC5IfiE25dsQY8VkHdfI9 3iPFWovlTnU2ZGt61UMOOkeJJpr7dBIZEGal0z1TviNwA0q1GM3YDJ+XZeTWQUKM9JEApB XWZlzg/Ue8T3b/07XWJUfEPy2wss1hKEVGvdxVIMGq2nfJU3GRsuZVS7Y5ovW+0+afovFS QR4i+UrbJmyhTGV7Kq3k2eziCutXw0VmLdvpUecXETNblFGl9zOHgi28DY+I/11qw1X0sy jvCizLIuiq8FJHNQ4kvEUAw0z8lvPZY1yLzGKd5iFoQSgMzkk47g+LJtbWqCKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699135856; a=rsa-sha256; cv=none; b=Yg79XH52GMozpySM9HWXgHQaXIw0L2OLo9TWZGdjSbIos3vwpkl70nLp0aHg762NU3EZCI N/D5h9+ip3p6zrnR6H/P3uy2RifAAGYxVejWOr4VwmSjGwcF6AqNXaAFYJQ0teS8mxfn2L 4qcSRUyPPzjuZZKMXjcz7H31pFTeynkuy1ZyJ+9sL21TviyCZPgXZeumfIEd3jZXmEsooP Vp03esZ8WPuzR8YyFJ5/0LMMwWxcETKcE7vrujzE13FzdAqbg+k90u1M/tNUgECPiI8Auk zv2dAngnAt2om79dZcMLkTdRSL3xqyXCCtdy1TQFqYZ0Q47WtZH4mdre+Skm6w== 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 4SNBdX0b75z1DvX; Sat, 4 Nov 2023 22:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A4MAtWU000142; Sat, 4 Nov 2023 22:10:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4MAtRd000139; Sat, 4 Nov 2023 22:10:55 GMT (envelope-from git) Date: Sat, 4 Nov 2023 22:10:55 GMT Message-Id: <202311042210.3A4MAtRd000139@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: 7c5146da1286 - main - mountd: Add support for spaces in exported directories 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 7c5146da128688ba2bb6bdad5e98716087a47281 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=7c5146da128688ba2bb6bdad5e98716087a47281 commit 7c5146da128688ba2bb6bdad5e98716087a47281 Author: Dan Mcgregor AuthorDate: 2023-11-04 22:07:56 +0000 Commit: Rick Macklem CommitDate: 2023-11-04 22:07:56 +0000 mountd: Add support for spaces in exported directories The previous code would correctly parse strings including quotation marks (") or backslash (/), but the tests when creating the export includes them in the final string. This prevents exporting paths with embedded spaces, for example "/exports/with space". Trying results in log lines resembling: mountd[1337]: bad exports list line '/exports/with\ space': /exports/with\ space: lstat() failed: No such file or directory. Turns out that when creating its exports list, zfs escapes strings in a format compatible with vis(3). Since I expect that zfs sharenfs is the dominating use case for generating an exports list, use strunvis(3) to parse the export path. The result is lines like the following allowing spaces: /exports/with\040space -network 192.168.0 -mask 255.255.255.0 A man page update will be done as a separate commit. MFC after: 1 month Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D42432 --- usr.sbin/mountd/mountd.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 6602dbc09aa0..33c19a81a0cf 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -83,6 +83,7 @@ static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95"; #include #include #include +#include #include "pathnames.h" #include "mntopts.h" @@ -1561,10 +1562,13 @@ get_exportlist_one(int passno) char *err_msg = NULL; int len, has_host, got_nondir, dirplen, netgrp; uint64_t exflags; + char unvis_dir[PATH_MAX + 1]; + int unvis_len; v4root_phase = 0; anon.cr_groups = NULL; dirhead = (struct dirlist *)NULL; + unvis_dir[0] = '\0'; while (get_line()) { if (debug) warnx("got line %s", line); @@ -1631,17 +1635,25 @@ get_exportlist_one(int passno) } else if (*cp == '/') { savedc = *endcp; *endcp = '\0'; + unvis_len = strnunvis(unvis_dir, sizeof(unvis_dir), + cp); + if (unvis_len <= 0) { + getexp_err(ep, tgrp, "Cannot strunvis " + "decode dir"); + goto nextline; + } if (v4root_phase > 1) { if (dirp != NULL) { getexp_err(ep, tgrp, "Multiple V4 dirs"); goto nextline; } } - if (check_dirpath(cp, &err_msg) && - check_statfs(cp, &fsb, &err_msg)) { + if (check_dirpath(unvis_dir, &err_msg) && + check_statfs(unvis_dir, &fsb, &err_msg)) { if ((fsb.f_flags & MNT_AUTOMOUNTED) != 0) syslog(LOG_ERR, "Warning: exporting of " - "automounted fs %s not supported", cp); + "automounted fs %s not supported", + unvis_dir); if (got_nondir) { getexp_err(ep, tgrp, "dirs must be first"); goto nextline; @@ -1652,16 +1664,17 @@ get_exportlist_one(int passno) goto nextline; } if (strlen(v4root_dirpath) == 0) { - strlcpy(v4root_dirpath, cp, + strlcpy(v4root_dirpath, unvis_dir, sizeof (v4root_dirpath)); - } else if (strcmp(v4root_dirpath, cp) + } else if (strcmp(v4root_dirpath, unvis_dir) != 0) { syslog(LOG_ERR, - "different V4 dirpath %s", cp); + "different V4 dirpath %s", + unvis_dir); getexp_err(ep, tgrp, NULL); goto nextline; } - dirp = cp; + dirp = unvis_dir; v4root_phase = 2; got_nondir = 1; ep = get_exp(); @@ -1699,8 +1712,9 @@ get_exportlist_one(int passno) /* * Add dirpath to export mount point. */ - dirp = add_expdir(&dirhead, cp, len); - dirplen = len; + dirp = add_expdir(&dirhead, unvis_dir, + unvis_len); + dirplen = unvis_len; } } else { if (err_msg != NULL) {