From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F5CA188CDB; Fri, 15 Nov 2024 06:51:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731653494; cv=none; b=pNOEZJIQGCjBrW67ifEFf2EpNvdSFAU17uhyYNp2HjVMOs4iSE8pfZkyhoEkSbFheKWA+2Mw8WAzdH9EAFd48TfmlFow15cDy2lNsIvgj4C8+q5wcc761Gi8dmK1+zZYePlRoFh2wjs6rxA0riCs7mFhSteqwc46KHBCC939zdo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731653494; c=relaxed/simple; bh=+rzZsOoegnrOI0BmdpMG3dt6yM0AHwwglx/LNCpjnPw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KujVng9vzYmYUxMPIO3Ah/GhV9+J8j4yh3tSOerRSfyURmV91ls/EymEGEgOAqYMstZBzX4S5mGzBXHb8vpIWDMJbBv/AbrrS70oq6ikP9DeVLjM3HMfdYpSmPi3tGCt1J6P1/BclfC4q+HGQaOeBbTYA3pPFnCzy+vlPHSrC9g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ACeMkv7i; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ACeMkv7i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1042FC4CECF; Fri, 15 Nov 2024 06:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731653494; bh=+rzZsOoegnrOI0BmdpMG3dt6yM0AHwwglx/LNCpjnPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ACeMkv7iJ6HQBtadaaiQTuToy2cxyiXcmsyvVAALTVmSAZsS//D1BbZAak1RVDU9s B1gq04GYl8ThC/NjHaN+0Fz/3zo1DYBXaPBw1cgajNbu3e56prUKFgEvAy9u2ilMc2 LUpsG8o9ojqt1HPvc7qhZstnAzo5Iav+avIO4A7g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+6c55f725d1bdc8c52058@syzkaller.appspotmail.com, Alessandro Zanni , Jan Kara , Christian Brauner , Sasha Levin Subject: [PATCH 6.6 31/48] fs: Fix uninitialized value issue in from_kuid and from_kgid Date: Fri, 15 Nov 2024 07:38:20 +0100 Message-ID: <20241115063724.088038198@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241115063722.962047137@linuxfoundation.org> References: <20241115063722.962047137@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alessandro Zanni [ 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 Link: https://lore.kernel.org/r/20241017120553.55331-1-alessandro.zanni87@gmail.com Reviewed-by: Jan Kara Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/ocfs2/file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index aa39d5d2d94f1..e4acb795d1190 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1128,9 +1128,12 @@ int ocfs2_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 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)) -- 2.43.0