From nobody Mon Nov 17 23:47:51 2025 X-Original-To: dev-commits-src-branches@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 4d9PZ016ZYz6HBRq; Mon, 17 Nov 2025 23:47:52 +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 4d9PZ00LK4z3qw4; Mon, 17 Nov 2025 23:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763423272; 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=HCZ+gVxI2SqL9Dbm9ehyeeXxfETxaJGeO29MivCS6sU=; b=dkNWAIQiHEPAcyzRDnLn6MYK/cjJ1M+uuRKXTI0skpUdI1BKu+dGnEIgLbEsNnZRAwePVK WGTfUHtwQKlEhtDTCOPOZ/SjMz+fUa7CxxKgrt8nxYDiERSOIaQgKYjH6sCLkqAI2cEldl eKxtBxCLIsLmglMkjTXWBh0FJW5VOWB6voZVpSlUn7aDMYyleAav2ytYKUvsu2RtW4rnCQ 2UtJb8HkK8QUmX/wJuiMhsHt+9xSjAbGFT4Ks7v2PKW5/+YnjaFZe2iwthgZD2FRQJJIcB O+SXKz/JCjRxBHDy8zMSaEZFCMMLwRHd4WFQ+BLb9Y51fX9FLv7udSsObYPGxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763423272; 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=HCZ+gVxI2SqL9Dbm9ehyeeXxfETxaJGeO29MivCS6sU=; b=nXzOEaYnaOXfi/6lV6HfvCGrRyR+wpTzMe8BNacotwmW75mBChvAYZ6k4ylrgdW3FTJQJh NFT17SpNyJDgNk/9f4Ez3q01uaxkcqOwslx8hgNjBvP3NpCUCqDIp6Ojo1bi+lcPo1KUoR 6DdZRDOOP8NNOqQ6WVcHPT2JjLJQmBVJkaQJ1thxXg4J949LuUFWUqOQRFvEEUJsr5hetC GDojox7+oNbXHzmDl2woYcn340V6SfOrUorQl33ZcwsSyV7CkhqTAQra39/OihnV6G4jnS Ehti0yCHvoDJEFvK5PLf4fZDIbbfJvfi/EzMpZ9NiBcof78mP0yZ5LldJ27NDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763423272; a=rsa-sha256; cv=none; b=ObQPwHWB4zrbOmRDI2l6Tz28t52BoaOlkMAlYCRjMdwDijl8XNe35h8xdQL+9/qaAXzCdI RsYWy3s/qckXkCZdM0XjHtaW61wZSIMTNVjXUjVnf2I/rKjtjpg+bPaOkornnHmcTdvXex 8cYk3Era6cDoKzxScaprcXSwNSwsOAduQdatmZSBJ7zNkZuGtj4GM/QBjPhSHp5rg75u7L hTleg6vxfTRa/TvRuPIj1M5NoRWfedCtAEhsG44xz8HFtjdlyWb/CwiiRQ9N5vl4hR4Row A+xj3g+B9LeEtV7DC7708WPA8r343sigxMTXJjikQcOi070l/zHMAsfkHwYfTg== 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 4d9PYz6mkwzDT0; Mon, 17 Nov 2025 23:47:51 +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 5AHNlpuU019608; Mon, 17 Nov 2025 23:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHNlpqe019605; Mon, 17 Nov 2025 23:47:51 GMT (envelope-from git) Date: Mon, 17 Nov 2025 23:47:51 GMT Message-Id: <202511172347.5AHNlpqe019605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 45197d29ced2 - stable/14 - Fix getmntpoint(3) to operate as it is documented in its manual page. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 45197d29ced2f57941a771dc8ec37243a52b9a7e Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=45197d29ced2f57941a771dc8ec37243a52b9a7e commit 45197d29ced2f57941a771dc8ec37243a52b9a7e Author: Kirk McKusick AuthorDate: 2025-10-22 18:01:03 +0000 Commit: Kirk McKusick CommitDate: 2025-11-17 23:47:36 +0000 Fix getmntpoint(3) to operate as it is documented in its manual page. The -libutil function getmntpoint(3) is documented as accepting a device name “with or without /dev/ prepended to it” but did not attempt to prepend /dev/. This patch corrects the problem by prepending /dev/ to names that do not begin with a '/'. Reported-by: Dag-Erling Smørgrav Differential Revision: https://reviews.freebsd.org/D53185 Sponsored-by: Netflix (cherry picked from commit 99bf680a8499dea71db5da705dfe41f4bb5e00ab) --- sbin/mount/getmntopts.c | 53 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index fab25466425f..32f2920eb9c5 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -152,6 +152,18 @@ checkpath_allow_file(const char *path, char *resolved) return (0); } +static char * +prependdevtopath(const char *path, char *buf, u_long buflen) +{ + u_long len; + + if ((len = strlen(_PATH_DEV) + strlen(path) + 1) > buflen) + return NULL; + strncpy(buf, _PATH_DEV, len); + strncat(buf, path, len - sizeof(_PATH_DEV)); + return (buf); +} + /* * Get the mount point information for name. Name may be mount point name * or device name (with or without /dev/ preprended). @@ -160,19 +172,27 @@ struct statfs * getmntpoint(const char *name) { struct stat devstat, mntdevstat; - char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; - char *ddevname; + char *devname; struct statfs *mntbuf, *statfsp; - int i, mntsize, isdev; - u_long len; + int i, len, isdev, mntsize, mntfromnamesize; + char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; + u_long devlen; - if (stat(name, &devstat) != 0) + devlen = sizeof(device); + /* + * Note that stat(NULL, &statbuf) returns -1 (EBADF) which will + * cause us to return NULL if prependdevtopath() returns NULL. + */ + if (stat(name, &devstat) != 0 && + (name[0] != '/' && + stat(prependdevtopath(name, device, devlen), &devstat) != 0)) return (NULL); if (S_ISCHR(devstat.st_mode) || S_ISBLK(devstat.st_mode)) isdev = 1; else isdev = 0; mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); + mntfromnamesize = sizeof(statfsp->f_mntfromname); for (i = 0; i < mntsize; i++) { statfsp = &mntbuf[i]; if (isdev == 0) { @@ -180,19 +200,20 @@ getmntpoint(const char *name) continue; return (statfsp); } - ddevname = statfsp->f_mntfromname; - if (*ddevname != '/') { - if ((len = strlen(_PATH_DEV) + strlen(ddevname) + 1) > - sizeof(statfsp->f_mntfromname) || - len > sizeof(device)) + devname = statfsp->f_mntfromname; + if (*devname == '/') { + if (stat(devname, &mntdevstat) != 0) + continue; + } else { + devname = prependdevtopath(devname, device, devlen); + if (devname == NULL || + (len = strlen(devname)) > mntfromnamesize) + continue; + if (stat(devname, &mntdevstat) != 0) continue; - strncpy(device, _PATH_DEV, len); - strncat(device, ddevname, len); - if (stat(device, &mntdevstat) == 0) - strncpy(statfsp->f_mntfromname, device, len); + strncpy(statfsp->f_mntfromname, devname, len); } - if (stat(ddevname, &mntdevstat) == 0 && - S_ISCHR(mntdevstat.st_mode) && + if (S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); }