From nobody Fri Apr 17 00:42:51 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 4fxbhC2lRFz6b0Pr for ; Fri, 17 Apr 2026 00:42:51 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxbhC0lPBz3fCW for ; Fri, 17 Apr 2026 00:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386571; 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=Z0x1Ra5OaqsOC5oEunT0Zcz7r+Nf9Ui6pJWpARiiItY=; b=j1J2Enit3E59pbsF4eIetZi5wjxnIDQ0eTj5tWp6pOJT42Dr7jDWf3pR1qj/0i070MuGJ2 w9BjLHyEh1xpvIXMwHb8dA7oK+GbM61gOYuVnJ+VaND8veDLXYugD/xiGVaRQg9B1ortfr wYt53g76sez9wAWYMiIJZ/aVx3KNt+xZfHHuMoB7oQ3mpD4Hl7PXatIW0s8LEDUWdKuUIz aLVceC193m6xxguiDFXMl3oIVK/dgMv3GSkNFTULmVS0jW+Jc3scLXV+jupI8RP1FL1Lqz EJxJuXMaDa0XolUGzZBvES2e2FmOpAHTR1ZOMUPTRkm5SA2tcP9iaTDQubJSxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776386571; a=rsa-sha256; cv=none; b=QzUYM58eGN7dniJPkBO9u5yEW1iW98TR4HhUMKBhjnH/eoSKUb3MDTKLoAngkWfnSLWIwy Tk8dI525mD9qCL51/vRfyHKOMw4njd6izbrwyAlZMCFkM6GJ90xUuG+Y3Ymd18RXsWtiA/ SsEbRySNsLInu4Zy7TrU8bVa65RsZRmkxIT98Y6OuTBx0CSke+/8HRXQJlxGLTUu7KJ8JG mE/Ks2lF28JbcNEEGtwTzSGVj9HOCz7Lx18bKjF1pNm5NHtiX2INuKoEcpVD/s7fWcVRmj pqMNu75sgrOUMsAMDz6vljSfVxJilIwc+/ywDnvx3gNN3Pare84j8KEcoEH4Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386571; 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=Z0x1Ra5OaqsOC5oEunT0Zcz7r+Nf9Ui6pJWpARiiItY=; b=hbDXQtZAjQe3/KRzejZv4+QXQ12xiJPD23nhtkqjQeSdpegduie2HFH/RulEL9mp7zKi3V IuchL7rcDkUbr7iiH3w38bRzNaNxWWk+qQRUmq75sNJUzVVDbxS2HXEzuPp2ytpupsfng5 aDnOuIpIto2l7ZjTw+dIFYjaFAJw4lpotwQQY71YP1qL6WH/TBVuvWosyoy7OZpXoMw1on SrxWY7SK3tNJV9+eA2GstZ6WhAd4uYLB7YfDogqvfhhzQSa/I7qO2RM0xCvCUwmhErFKTL AyBf28TuC8RNsZRsTSCRPBupNBGl6jRr/eVPu8gCjKwidldoDDVsmU0Y+Di5WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxbhC0HZKzXQH for ; Fri, 17 Apr 2026 00:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42da5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:42:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 65ccf925415f - stable/15 - openat(2): check that userspace pass known and allowed flags 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 65ccf925415fd3b88385da018f15e3c999bab003 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:42:51 +0000 Message-Id: <69e1820b.42da5.82436e7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=65ccf925415fd3b88385da018f15e3c999bab003 commit 65ccf925415fd3b88385da018f15e3c999bab003 Author: Konstantin Belousov AuthorDate: 2026-04-12 10:48:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-17 00:42:39 +0000 openat(2): check that userspace pass known and allowed flags (cherry picked from commit 8a5601cff1ea32ab63df1377f61620e4f91999b3) --- sys/kern/vfs_syscalls.c | 5 ++++- sys/sys/fcntl.h | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 92b43672bae0..dc02e3351fee 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1168,12 +1168,15 @@ openflags(int *flagsp) { int flags; + flags = *flagsp; + if ((flags & ~FUSERALLOWED) != 0) + return (EINVAL); + /* * Only one of the O_EXEC, O_RDONLY, O_WRONLY and O_RDWR flags * may be specified. On the other hand, for O_PATH any mode * except O_EXEC is ignored. */ - flags = *flagsp; if ((flags & O_PATH) != 0) { flags &= ~O_ACCMODE; } else if ((flags & O_EXEC) != 0) { diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 8f2fc1e2debb..0b13241f0ee3 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -171,6 +171,12 @@ typedef __pid_t pid_t; #define FOPENFAILED O_TTY_INIT /* Only for O_PATH files which passed ACCESS FREAD check on open */ #define FKQALLOWED O_RESOLVE_BENEATH +/* Flags userspace is allowed to pass to openat() */ +#define FUSERALLOWED (O_ACCMODE | O_NONBLOCK | O_APPEND | O_SHLOCK | \ + O_EXLOCK | O_ASYNC | O_SYNC | O_NOFOLLOW | O_CREAT | O_TRUNC | \ + O_EXCL | O_NOCTTY | O_DIRECT | O_DIRECTORY | O_EXEC | O_TTY_INIT | \ + O_CLOEXEC | O_VERIFY | O_PATH | O_RESOLVE_BENEATH | O_DSYNC | \ + O_EMPTY_PATH | O_NAMEDATTR | O_CLOFORK) /* convert from open() flags to/from fflags; convert O_RD/WR to FREAD/FWRITE */ #define FFLAGS(oflags) ((oflags) & O_EXEC ? (oflags) : (oflags) + 1)