From nobody Thu Apr 16 13:27:23 2026 X-Original-To: dev-commits-src-all@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 4fxJhx1j1yz6Zfdj for ; Thu, 16 Apr 2026 13:27:29 +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 4fxJhx0rWSz42cw for ; Thu, 16 Apr 2026 13:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776346049; 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=Dc7RlXV8oB/8M++pO1HSy/q6j+7E0vQTSuUIsBcBrVU=; b=uP5w2QmRVlgpbDYE0eOf7QOmCzZlLjCQYEsd8UvzT6izdv3xul0Agk1JL6O//1yyvZtCLM 2RsODBtuDWJ7oUS1egryd0N0CxZ/330LehRkXKLAiov9+CX7BsUoCXnWcpjr4D8FR3DqPX dkHq8iqXEbsDDQZ9LIheqdvUE78UhHeawAq9Dx/VH+iWq+27loU1sUuu4h66X5JnO3i/sh aZSHjHeWzyJZDqHi4C8zFMxseOcmpgMFWz2RnCyonrYyGcYpn25+WWkLykNqQtBO2h/rC8 DR8qNmzxW+9W0xxiK16qxzWhe2Xx2Yi837iLxI37MXd6ORbF2Oh5ba7/2/2G+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776346049; a=rsa-sha256; cv=none; b=v/TpnzNGbIkYLM1rImQR6D4jmSVSEvmeohHt1hvwduOyumWWZoJuZ93eoNy/uyNbw0me0t zfbGy1jHuoUhsv1ZraDCGhQEtHHtUM/S8fMQXCMyiubjEzajl/w2Ky3ixdgUBqJExZmcW1 xxddn93bPAsE/SelvXIzWJ1xHXH2mHb+U+o1HRmdDSh9Unp76YgNXXD2WnPPbKzvK3uPtc I63O9NoXrBo/2agjBWmuVt3Qo4W7GuhyrkwWP26PN97pK9tvM7MlwBHHsFRPYj5RoUkHoO HllgdfsBiWr7JxQIhUgKxMfc9s8SnDQ2BPyc/hbrgtFPjX5l68AyJAZ0xcaCUA== 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=1776346049; 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=Dc7RlXV8oB/8M++pO1HSy/q6j+7E0vQTSuUIsBcBrVU=; b=wFFbJ+eL1H24nrqHENCoy+GJtnAW9HeyvQRzKVodVvLtXZakyKToCYbHMjLs1qfz2mcyL3 T3XXmUvorQgZJN1nckYRuh/45wWCfkif2rP6xaq+LkwJSqA0KjEvJV5LNlBwGyfVJtCR7M d3PA/qsczfg1UuqB9wNzeYQBya0NaTRSCwIuIG8cbfdHdWlQFD4LaO6EV3OAWnml1pTB4G hj1YHVo24Ixow+CwY+BbDuRL2diHYmtI9VFxRLg1CQK3mO5/y/VWcUrsoN2W1AvLNaJQtZ //JmTPRH/wwQrFMheiRX7DHspvgv18hqG0m7afZ4l4Ti+lfyT9XgxmiVxR+Uww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxJhw6lYTz17vT for ; Thu, 16 Apr 2026 13:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43678 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 13:27:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8a5601cff1ea - main - openat(2): check that userspace pass known and allowed flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 8a5601cff1ea32ab63df1377f61620e4f91999b3 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 13:27:23 +0000 Message-Id: <69e0e3bb.43678.8e3a03e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8a5601cff1ea32ab63df1377f61620e4f91999b3 commit 8a5601cff1ea32ab63df1377f61620e4f91999b3 Author: Konstantin Belousov AuthorDate: 2026-04-12 10:48:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-16 13:26:53 +0000 openat(2): check that userspace pass known and allowed flags Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56365 --- 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 06500909589e..0c4eeb584d41 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)