Merge: ovl: Filter invalid inodes with missing lookup function

ptalbert · ptalbert · commit 7223a3a2f3ee · 2025-02-17T12:00:33.000-05:00
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6168 ovl: Filter invalid inodes with missing lookup function JIRA: https://issues.redhat.com/browse/RHEL-72307 CVE: CVE-2024-56570 Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> Approved-by: David Howells <dhowells@redhat.com> Approved-by: Ian Kent <ikent@redhat.com> Approved-by: Carlos Maiolino <cmaiolino@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Patrick Talbert <ptalbert@redhat.com>
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
@@ -171,6 +171,9 @@ void ovl_dentry_init_flags(struct dentry *dentry, struct dentry *upperdentry,
 
 bool ovl_dentry_weird(struct dentry *dentry)
 {
+	if (!d_can_lookup(dentry) && !d_is_file(dentry) && !d_is_symlink(dentry))
+		return true;
+
 	return dentry->d_flags & (DCACHE_NEED_AUTOMOUNT |
 				  DCACHE_MANAGE_TRANSIT |
 				  DCACHE_OP_HASH |

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,9 @@ void ovl_dentry_init_flags(struct dentry dentry, struct dentry upperdentry,`
`171`	`171`
`172`	`172`	`bool ovl_dentry_weird(struct dentry *dentry)`
`173`	`173`	`{`
	`174`	`+ if (!d_can_lookup(dentry) && !d_is_file(dentry) && !d_is_symlink(dentry))`
	`175`	`+ return true;`
	`176`	`+`
`174`	`177`	`return dentry->d_flags & (DCACHE_NEED_AUTOMOUNT \|`
`175`	`178`	`DCACHE_MANAGE_TRANSIT \|`
`176`	`179`	`DCACHE_OP_HASH \|`