Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795054544; b=W300CBjGjh0vRnzEqx7B/Cxrtp/XO0BPIoCyEOCKWs6mSlcC7Ro8EYcbL9BoNK0SZoCI PZkEchH336OsxGNQq5TpCSs8GM8tBSutqVg3Ubivjrz/JjVCBiWap8oz+LXbN34zM85L0 ZxeoMohGxv6gQr0CQle4d8/73vlWXMVS+7CyyANp5a1ePzEi1bv1KO8vVpLHeZMH/qqmb DeRzVWz46lbzfRUQbOyA44Y8rVBo8eJdYsTYzmeszW7yBhKhTi0hRztDSQgJXyY9bezxx ruRZn6vxfL+sZTbQFzfJP4iuzD6EoDQuttAEEHay+Ix4Tt1rsK3TRQ6D7etl3CyFYRw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795054544; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=gf3xmEXr4eN1W3jRb2YMvlSqXWN475IYu0+DhMk7wHE=; b=IO1jf2Ao5qS/0vJdAQNtF2Mfy2dVK02eeaOFdGOdZ9xiS44uvt4kp5W5P5AFTM6xcSRR l9bZ2PzRNtzLa0IwM5E0LGKljV1zWUxRHzF0w3P2FN5Zt9Wzhw6lYGmQL6SSioV7rY2Lp 8lkTa8rULA4kRH6VADEWjdnCY+N0iwDaX/pvIzN+o+GykWTLw8fwce5K+l1dk39uaiYNP F28HOnvqamriCK6N4O+vyJLLgZYWf88hqMsggD1cATXIk2TZloq0jSDIoq9odv8Hhaa4u u77166DpVNdjL7nbkAcTlTRjsA/07RzeA0E8x2xTOMdRjQbw10EdoLngWt8u/cp/Wvg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=T38yC5Gd; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7353A606A325; Thu, 19 Nov 2026 02:15:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=T38yC5Gd Received: by smtp.kernel.org (Postfix) with ESMTPSA id B185B1F000C5; Thu, 19 Nov 2026 02:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795054544; bh=gf3xmEXr4eN1W3jRb2YMvlSqXWN475IYu0+DhMk7wHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=T38yC5GdFPx8VsvW/aJzoXP6DtY3weW2DRylevr2Tnu9e9Jb1nn4/bouqdM6buKMw xRU2d8IFLhO7fYGI1eTtTz1l4vaR9lOZHDBIPbZFOJGKWirm70x56RDQafTUOwms7i BT3HYNZ2MS2+segV6VAw38oWJ+p0OOD0P8oTD8MQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Edvard Conrad , Amir Goldstein , Sasha Levin Subject: [PATCH 5.15 1312/2214] ovl: inherit FMODE_NONOTIFY when reading directory layers Date: Wed, 18 Nov 2026 15:49:48 +0100 Message-ID: <20261118150103.982071064@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Amir Goldstein [ Upstream commit 9ff338af0e002fe217cfa16b1289b76f6b21fc72 ] Listing a merged or impure overlay directory opens the real layer directories from ovl_dir_read(), when the readdir cache is filled. Those opens use plain ovl_path_open(), so when the directory fd is one that fanotify created for a permission event, they can still raise FS_OPEN_PERM. A listener that also marks the backing filesystem and calls getdents() on the event fd before answering then deadlocks the same way as with the directory open fixed by the previous commit. Store the overlay user file in struct ovl_readdir_data and pass it to ovl_path_open_realfile() from ovl_dir_read(), for both the merged and the impure cache. Internal readers such as ovl_check_empty_dir() and the mount-time workdir cleanup still pass no user file. A note about severity and real world impact: The FAN_OPEN_PERM event is traditionally used by anti-malware protection agents and security/audit agents. The scope that is often used in those use cases is FAN_MARK_MOUNT and agents typically monitor multiple mounts in a mount namespace. FAN_OPEN_PERM from directory open requires user opt-in with FAN_ONDIR. It is often not the case that anti-malware agents monitor open of directories. Security/audit engines are more likely to opt-into FAN_OPEN_PERM on directories, but are less likely to list the content of a directory within the scope of FAN_OPEN_PERM event, so the real world impact of this bug is likely not significant. Reported-by: Edvard Conrad Closes: https://lore.kernel.org/all/P5Qu3co--N-9@tuta.io/ Cc: stable@vger.kernel.org Tested-by: Edvard Conrad Link: https://lore.kernel.org/ltp/P5WKBbq--F-9@tuta.io/ Co-developed-by: Edvard Conrad Signed-off-by: Edvard Conrad Signed-off-by: Amir Goldstein [ sashal: replaced ovl_path_open_realfile() with ovl_path_open() using an inline FMODE_NONOTIFY check to set __FMODE_NONOTIFY ] Signed-off-by: Sasha Levin --- fs/overlayfs/readdir.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c index eef6c5d1b1f8b..2de2e433530ee 100644 --- a/fs/overlayfs/readdir.c +++ b/fs/overlayfs/readdir.c @@ -37,6 +37,7 @@ struct ovl_dir_cache { struct ovl_readdir_data { struct dir_context ctx; + const struct file *user_file; struct dentry *dentry; bool is_lowest; struct rb_root *root; @@ -295,9 +296,13 @@ static inline int ovl_dir_read(struct path *realpath, struct ovl_readdir_data *rdd) { struct file *realfile; + int flags = O_RDONLY | O_LARGEFILE; int err; - realfile = ovl_path_open(realpath, O_RDONLY | O_LARGEFILE); + if (rdd->user_file && (rdd->user_file->f_mode & FMODE_NONOTIFY)) + flags |= __FMODE_NONOTIFY; + + realfile = ovl_path_open(realpath, flags); if (IS_ERR(realfile)) return PTR_ERR(realfile); @@ -341,12 +346,13 @@ static void ovl_dir_reset(struct file *file) } static int ovl_dir_read_merged(struct dentry *dentry, struct list_head *list, - struct rb_root *root) + struct rb_root *root, const struct file *user_file) { int err; struct path realpath; struct ovl_readdir_data rdd = { .ctx.actor = ovl_fill_merge, + .user_file = user_file, .dentry = dentry, .list = list, .root = root, @@ -390,9 +396,10 @@ static void ovl_seek_cursor(struct ovl_dir_file *od, loff_t pos) od->cursor = p; } -static struct ovl_dir_cache *ovl_cache_get(struct dentry *dentry) +static struct ovl_dir_cache *ovl_dir_cache_get(struct file *file) { int res; + struct dentry *dentry = file->f_path.dentry; struct ovl_dir_cache *cache; cache = ovl_dir_cache(d_inode(dentry)); @@ -411,7 +418,7 @@ static struct ovl_dir_cache *ovl_cache_get(struct dentry *dentry) INIT_LIST_HEAD(&cache->entries); cache->root = RB_ROOT; - res = ovl_dir_read_merged(dentry, &cache->entries, &cache->root); + res = ovl_dir_read_merged(dentry, &cache->entries, &cache->root, file); if (res) { ovl_cache_free(&cache->entries); kfree(cache); @@ -547,14 +554,15 @@ static int ovl_fill_plain(struct dir_context *ctx, const char *name, return 0; } -static int ovl_dir_read_impure(struct path *path, struct list_head *list, - struct rb_root *root) +static int ovl_dir_read_impure(struct path *path, struct list_head *list, + struct rb_root *root, const struct file *user_file) { int err; struct path realpath; struct ovl_cache_entry *p, *n; struct ovl_readdir_data rdd = { .ctx.actor = ovl_fill_plain, + .user_file = user_file, .list = list, .root = root, }; @@ -592,9 +600,10 @@ static int ovl_dir_read_impure(struct path *path, struct list_head *list, return 0; } -static struct ovl_dir_cache *ovl_cache_get_impure(struct path *path) +static struct ovl_dir_cache *ovl_cache_get_impure(struct file *file) { int res; + struct path *path = &file->f_path; struct dentry *dentry = path->dentry; struct ovl_fs *ofs = OVL_FS(dentry->d_sb); struct ovl_dir_cache *cache; @@ -611,7 +620,7 @@ static struct ovl_dir_cache *ovl_cache_get_impure(struct path *path) if (!cache) return ERR_PTR(-ENOMEM); - res = ovl_dir_read_impure(path, &cache->entries, &cache->root); + res = ovl_dir_read_impure(path, &cache->entries, &cache->root, file); if (res) { ovl_cache_free(&cache->entries); kfree(cache); @@ -726,7 +735,7 @@ static int ovl_iterate_real(struct file *file, struct dir_context *ctx) dput(parent); if (ovl_is_impure_dir(file)) { - rdt.cache = ovl_cache_get_impure(&file->f_path); + rdt.cache = ovl_cache_get_impure(file); if (IS_ERR(rdt.cache)) return PTR_ERR(rdt.cache); } @@ -773,7 +782,7 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx) if (!od->cache) { struct ovl_dir_cache *cache; - cache = ovl_cache_get(dentry); + cache = ovl_dir_cache_get(file); err = PTR_ERR(cache); if (IS_ERR(cache)) goto out; @@ -987,7 +996,7 @@ int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list) const struct cred *old_cred; old_cred = ovl_override_creds(dentry->d_sb); - err = ovl_dir_read_merged(dentry, list, &root); + err = ovl_dir_read_merged(dentry, list, &root, NULL); revert_creds(old_cred); if (err) return err; -- 2.53.0