From nobody Mon Jun 15 13:47:24 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 4gfBJD6kBtz6hNDx for ; Mon, 15 Jun 2026 13:47:24 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gfBJD26ZRz3gsH for ; Mon, 15 Jun 2026 13:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781531244; 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=HebHFieGrAHXLwohbuQc60PzZSwxhdA9Q7hL7u7sA4g=; b=rR6XGfUnU/NRNeLjcS+7wNvovfZ+KEspPFfnJi+LHMfjrqiANUWAzx9xuE5IiKteexke1R MAWUUAymANaNHrj8gHzXwcvi3pn67ZrHI/fR4W8eooh0huwBaqLWu+vvmgOujxHnzOz7F+ XmgJxNVlav1N7TiKtra3NPcQ2BDBtxSxve81ZlPzbbjcMEUwHS00BVIiS+cKHMEXegKx/H IFrsYLpw47LW61jWos1HG2WFdozHgV5eLq9/a1wEkrW4gsLOGaNvcLUZenc2Zb2RUunp5p OsO7n9MUCqHuu2ufRwHRU0rK9cg056cOsYjqo3lUT1buhSf7UwU3gelSlPzk9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781531244; a=rsa-sha256; cv=none; b=iF2CNWGCa8nBuiyFoJkbPKzUB74FwHTCbqFf/ZHK62S5X4xyiqMpmlOQfXgdPrf6Zjrxz5 daOrS5OWboLl6uqrkQhqcbwMYWjQYQL+voO1zhXi2b+l1lo+s4Hy+gtaU1SSvbFuBm6s5P B6is1yFdcM2fQFzpeMvL9G1MgPAc1hTl5mYsi6DVMKDBXABBcDo49oIN1bsLvPaxA/7wnC 1vTuMlhyI/hxBCScllCF6cQx6kZKRVyxupvcRBpFSEcodR7YUlI+ZPOekMDF7GNP79dWUz ZMZ+uS+mkqkwYjcsqgEd2ZUmEEtwL8cJiz5sQrxn31DNIWQfBxrCFRW8ZtC0sQ== 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=1781531244; 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=HebHFieGrAHXLwohbuQc60PzZSwxhdA9Q7hL7u7sA4g=; b=dGK8odFO9CgKMOx1xggk99/0lMFE0gZZEoadxhOCrN4Li5v58ZqOcjIJUAfogaEAF3xc5m YXxgl8rZpWbJVZaKUYlGc7FdBZpZ2g6gJowl2nOsukRzV8bFyJh3zCuVhOalqxLLlvnBCA v8ZyjN943kstVbQPZgvCg+gvo69/2syV5Ohj35sSTyzy3eX0trrvtAtHDMxLT9iLGDdi1S 0Y4uVxQgk3iryIWbm9LwADTv2frlkDEiZESPUYppRjtavnEswbYAZj2xA8FbPjZkPAn0EZ FaTRLXnVhskxtFMfollet43lywS3viZh+dGecIzNFuPLQV0+zQBvnnWCsPoXjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfBJD1SnVzxf8 for ; Mon, 15 Jun 2026 13:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31ce9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Jun 2026 13:47:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e26c01080991 - stable/15 - linuxulator: Return EINVAL for invalid inotify 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 List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e26c01080991ac8bbd9e8e659600b16840ca063d Auto-Submitted: auto-generated Date: Mon, 15 Jun 2026 13:47:24 +0000 Message-Id: <6a30026c.31ce9.6a4ec956@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e26c01080991ac8bbd9e8e659600b16840ca063d commit e26c01080991ac8bbd9e8e659600b16840ca063d Author: Ed Maste AuthorDate: 2026-06-01 18:22:09 +0000 Commit: Ed Maste CommitDate: 2026-06-15 13:44:59 +0000 linuxulator: Return EINVAL for invalid inotify flags We implement all of the currently-defined Linux inotify mask bits and flags, with the same values as Linux. Return EINVAL for unknown bits, as Linux does. This also moves the translation inline into linux_inotify_add_watch. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57387 (cherry picked from commit f77d37cffdf3951b7f28b97005467241aa27c183) --- sys/compat/linux/linux_file.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 30e79a53ad2a..9a1f21d5feb7 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -2034,23 +2034,17 @@ _Static_assert(LINUX_IN_ONESHOT == IN_ONESHOT, _Static_assert(LINUX_IN_EXCL_UNLINK == IN_EXCL_UNLINK, "IN_EXCL_UNLINK mismatch"); -static int -linux_inotify_watch_flags(int l_flags) -{ - if ((l_flags & ~(LINUX_IN_ALL_EVENTS | LINUX_IN_ALL_FLAGS)) != 0) { - linux_msg(NULL, "inotify_add_watch unsupported flags 0x%x", - l_flags); - } - - return (l_flags); -} - int linux_inotify_add_watch(struct thread *td, struct linux_inotify_add_watch_args *args) { + if ((args->mask & ~(LINUX_IN_ALL_EVENTS | LINUX_IN_ALL_FLAGS)) != 0) { + linux_msg(NULL, "inotify_add_watch unsupported flags 0x%x", + args->mask); + return (EINVAL); + } return (kern_inotify_add_watch(args->fd, AT_FDCWD, args->pathname, - linux_inotify_watch_flags(args->mask), td)); + args->mask, td)); } int