]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
fs: Fix uninitialized value issue in from_kuid and from_kgid
authorAlessandro Zanni <alessandro.zanni87@gmail.com>
Thu, 17 Oct 2024 12:05:51 +0000 (14:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Nov 2024 13:58:08 +0000 (14:58 +0100)
[ Upstream commit 15f34347481648a567db67fb473c23befb796af5 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/ocfs2/file.c

index 3c71c05a0581bcdc1be4a6d7948a101bdda29107..9062002fd56c607ac1ce901ff151ce5bfeb0184b 100644 (file)
@@ -1143,9 +1143,12 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
        trace_ocfs2_setattr(inode, dentry,
                            (unsigned long long)OCFS2_I(inode)->ip_blkno,
                            dentry->d_name.len, dentry->d_name.name,
-                           attr->ia_valid, attr->ia_mode,
-                           from_kuid(&init_user_ns, attr->ia_uid),
-                           from_kgid(&init_user_ns, attr->ia_gid));
+                           attr->ia_valid,
+                               attr->ia_valid & ATTR_MODE ? attr->ia_mode : 0,
+                               attr->ia_valid & ATTR_UID ?
+                                       from_kuid(&init_user_ns, attr->ia_uid) : 0,
+                               attr->ia_valid & ATTR_GID ?
+                                       from_kgid(&init_user_ns, attr->ia_gid) : 0);
 
        /* ensuring we don't even attempt to truncate a symlink */
        if (S_ISLNK(inode->i_mode))