Skip to content

Commit 15f3434

Browse files
echo-alezbrauner
authored andcommitted
fs: Fix uninitialized value issue in from_kuid and from_kgid
ocfs2_setattr() uses attr->ia_mode, attr->ia_uid and attr->ia_gid in a trace point even though ATTR_MODE, ATTR_UID and ATTR_GID aren't set. Initialize all fields of newattrs to avoid uninitialized variables, by checking if ATTR_MODE, ATTR_UID, ATTR_GID are initialized, otherwise 0. Reported-by: syzbot+6c55f725d1bdc8c52058@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=6c55f725d1bdc8c52058 Signed-off-by: Alessandro Zanni <alessandro.zanni87@gmail.com> Link: https://lore.kernel.org/r/20241017120553.55331-1-alessandro.zanni87@gmail.com Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 229fd15 commit 15f3434

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

fs/ocfs2/file.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,9 +1129,12 @@ int ocfs2_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
11291129
trace_ocfs2_setattr(inode, dentry,
11301130
(unsigned long long)OCFS2_I(inode)->ip_blkno,
11311131
dentry->d_name.len, dentry->d_name.name,
1132-
attr->ia_valid, attr->ia_mode,
1133-
from_kuid(&init_user_ns, attr->ia_uid),
1134-
from_kgid(&init_user_ns, attr->ia_gid));
1132+
attr->ia_valid,
1133+
attr->ia_valid & ATTR_MODE ? attr->ia_mode : 0,
1134+
attr->ia_valid & ATTR_UID ?
1135+
from_kuid(&init_user_ns, attr->ia_uid) : 0,
1136+
attr->ia_valid & ATTR_GID ?
1137+
from_kgid(&init_user_ns, attr->ia_gid) : 0);
11351138

11361139
/* ensuring we don't even attempt to truncate a symlink */
11371140
if (S_ISLNK(inode->i_mode))

0 commit comments

Comments
 (0)