6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mickaël Salaün <mic@xxxxxxxxxxx> [ Upstream commit 49440290a0935f428a1e43a5ac8dc275a647ff80 ] A corrupted filesystem (e.g. bcachefs) might return weird files. Instead of throwing a warning and allowing access to such file, treat them as regular files. Cc: Dave Chinner <david@xxxxxxxxxxxxx> Cc: Kent Overstreet <kent.overstreet@xxxxxxxxx> Cc: Paul Moore <paul@xxxxxxxxxxxxxx> Reported-by: syzbot+34b68f850391452207df@xxxxxxxxxxxxxxxxxxxxxxxxx Closes: https://lore.kernel.org/r/000000000000a65b35061cffca61@xxxxxxxxxx Reported-by: syzbot+360866a59e3c80510a62@xxxxxxxxxxxxxxxxxxxxxxxxx Closes: https://lore.kernel.org/r/67379b3f.050a0220.85a0.0001.GAE@xxxxxxxxxx Reported-by: Ubisectech Sirius <bugreport@xxxxxxxxxxxxxx> Closes: https://lore.kernel.org/r/c426821d-8380-46c4-a494-7008bbd7dd13.bugreport@xxxxxxxxxxxxxx Fixes: cb2c7d1a1776 ("landlock: Support filesystem access-control") Reviewed-by: Günther Noack <gnoack3000@xxxxxxxxx> Link: https://lore.kernel.org/r/20250110153918.241810-1-mic@xxxxxxxxxxx Signed-off-by: Mickaël Salaün <mic@xxxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> --- security/landlock/fs.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/security/landlock/fs.c b/security/landlock/fs.c index 1bdd049e3d636..fe4622d88eb15 100644 --- a/security/landlock/fs.c +++ b/security/landlock/fs.c @@ -664,10 +664,6 @@ static inline access_mask_t get_mode_access(const umode_t mode) switch (mode & S_IFMT) { case S_IFLNK: return LANDLOCK_ACCESS_FS_MAKE_SYM; - case 0: - /* A zero mode translates to S_IFREG. */ - case S_IFREG: - return LANDLOCK_ACCESS_FS_MAKE_REG; case S_IFDIR: return LANDLOCK_ACCESS_FS_MAKE_DIR; case S_IFCHR: @@ -678,9 +674,12 @@ static inline access_mask_t get_mode_access(const umode_t mode) return LANDLOCK_ACCESS_FS_MAKE_FIFO; case S_IFSOCK: return LANDLOCK_ACCESS_FS_MAKE_SOCK; + case S_IFREG: + case 0: + /* A zero mode translates to S_IFREG. */ default: - WARN_ON_ONCE(1); - return 0; + /* Treats weird files as regular files. */ + return LANDLOCK_ACCESS_FS_MAKE_REG; } } -- 2.39.5
