From nobody Sat Oct 10 18:52:13 2026 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 4j2CWx634Jz6vgGP for ; Sat, 10 Oct 2026 18:52:13 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2CWx5XKwz4sRr for ; Sat, 10 Oct 2026 18:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791658333; 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=VF0tls02bQ5gZuKp1TEYMSDR3Zalt4NDPORbxDf8nK4=; b=n2J8L7aosUd24dMOXAl3B5dGEv7tK+ZxfQA6oNxzibHhi7Xcre76PNJmugrcauoURv7FqO ReqeUEvIdql2dQ9ORFHjt0cxJvq76HA4VEEb0MYGaoEPFweAXQYf4uPST85ldFSWeuDWLh PZypTZPi/mVVel9i10duRHenD/Kbi2YTFF7/aGcuVE9zOadEqNxTpmY31pkDYpjnFDY6bW TefX/BM5OR+mn1BCze/b8fmU9s4SKVxDpMSjQbQIlvh1wGG5vXpCtYM/orIUbU6AfsFVrf 9qc6ZTD3DQR0LXBUtL3GFM6RtWE/7UhL6y6QeaobOX/unOVMqzwJK76l5iEfFw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791658333; b=xiCATEN4WsehMbiiUyc4USpjP4cDQYYTeRIFtr0CRJrwfq3epw2P5qdNh490MP1wYyVS6K BjePvyo03MwMcKPNXP20HeiOEeYC+KPYKotUMKpVGzDUxofCiMVLEgRLD13aS7gIJ8CFb1 aiejankozQemAHx1sPTiy3BOLYDqfVnUJmVcSGQBX+MDn5CyD8OPW3FDakVAsc950k13Oc UPHF4BQG2i8Y8f+oOfH0q6AWi7480OIjS5UTFcVAtcjOmYI+PsXba6rtwOjDqyHz+cv5yA peBCqIaS6EpsS58PiQFn4Gt6Y2qyHQcm9AKS8BwD0hT3Q+Hz91jDTZJPZ3dvHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791658333; 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=VF0tls02bQ5gZuKp1TEYMSDR3Zalt4NDPORbxDf8nK4=; b=EaPhqr0RB7SfLGzKUEOMq2fICdyHGpolWvJC/lotRL7WOT7vcDLLta0/BZ32OrC1t8/+jQ rvIZP2D9tSV8H2QeK+Oa1CD1Dd+SKiM/HiJH4czOo/fGoxrwH7RkS7zThDBjUgifXrHVN5 wgTwsFxlmzaUvMVf6p+sjRBWOcg01t3liAllR+WxjnX9gidZkUhg6M2jlW4Bf2hUxUMJVZ Y0k4cGNzC8HZ7zBVXQHOn2MJxsqle4ZHFobaV5oT2Bt+c73cEleBRn3njS8KI6fDheo3Sr RN8ZJdTI5MzAtyXZx/sdmzxez0qtkc+q8sZcnjQF+Iy9nh9itvLzN0E7CpqbIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j2CWx4b67z15tq for ; Sat, 10 Oct 2026 18:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 241e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 10 Oct 2026 18:52:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Fernando Apeste=?utf-8?Q?gu=C3=ADa?= Subject: git: b8b23cf1122e - stable/15 - virtual_oss(8): Fix cuse.ko check List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b8b23cf1122ed50d18e61f3a7f57cd0c30cbddd9 Auto-Submitted: auto-generated Date: Sat, 10 Oct 2026 18:52:13 +0000 Message-Id: <6aca895d.241e6.7bbdf142@gitrepo.freebsd.org> The branch stable/15 has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=b8b23cf1122ed50d18e61f3a7f57cd0c30cbddd9 commit b8b23cf1122ed50d18e61f3a7f57cd0c30cbddd9 Author: Fernando Apesteguía AuthorDate: 2026-09-19 16:39:19 +0000 Commit: Fernando Apesteguía CommitDate: 2026-10-10 18:51:55 +0000 virtual_oss(8): Fix cuse.ko check There is no need at all to load the cuse module to just access the tool help. kldload always checks for permissions first returning -EPERM if the user can't load modules and -EEXIST if the user can, but the module is already loaded. Approved by: christos@ Differential Revision: https://reviews.freebsd.org/D59844 MFC after: 2 weeks (cherry picked from commit 5aac18d0faec96c768baf1a9de63a50de3796023) --- usr.sbin/virtual_oss/virtual_oss/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index 5b50f8e5ef6c..b0c88f14a023 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -2578,6 +2578,7 @@ int main(int argc, char **argv) { const char *ptrerr; + const char *cuse_mod = "cuse.ko"; struct sigaction sa; struct cuse_dev *pdev = NULL; struct virtual_profile *pvp; @@ -2591,8 +2592,10 @@ main(int argc, char **argv) atomic_init(); - if (kldload("cuse.ko") < 0 && errno != EEXIST) - err(1, "Failed to load cuse kernel module"); + if ((kldfind(cuse_mod) < 0 && errno == ENOENT) && + (kldload(cuse_mod) < 0 && errno != EEXIST)) { + err(1, "Failed to load %s", cuse_mod); + } if (cuse_init() != 0) errx(EX_USAGE, "Could not connect to cuse module");