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 89C49189516; Tue, 30 Jul 2024 16:17:49 +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=1722356269; cv=none; b=GisgFUiDJxACn1iquhqcLaSsKu0K/+vJZIQlxwSmxjaNZZYKUgVrNw0GR7LplttHDll+YsQdoQUG1Tm/aZk99uayjPvquhEMsfU/bfaShHFkoSybMXSH6+eRIhvbzar/7cXOUhwSz0fIzhPBW9ahR1FAY8j/Lgs8irZkjdQl/yM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722356269; c=relaxed/simple; bh=KznpQmPVfPCQUjV+ktD4gJkEQQHUuj2gk0395HsrzzA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r0Ea2MrWL0XWMCv9dk1tbrH+YGHM1Gp8vjaoQPCjPTRDCHsPbV//H3aSh9a4Nu/Z8VzeQKih64OSSuCaLWMkHhwgb5KQxV8ggbvP7lkyCW2NK+2I1C6sAeO3b//9a8/Do/WUY2O6xl3ugNq6m+xQJKGkv1nfTKU9ueK0d82eUoY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CHTeF3q0; 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="CHTeF3q0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E386C32782; Tue, 30 Jul 2024 16:17:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722356269; bh=KznpQmPVfPCQUjV+ktD4gJkEQQHUuj2gk0395HsrzzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CHTeF3q03cwSn5p40wxafARhb4zev8i1EPSOoBUfjvOhEyXIE8p+ChrcAUSj7lc+S sFjF90x1d+/tU+sgTu6aAlrPUNQfpGMwee2o+afFG4rQxX7e9qAfOQn7xGohuWKlQX ei/ZSHq8en2illvVW1d3b6P98y1m4gayLgj5IAPs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+9c1fe13fcb51574b249b@syzkaller.appspotmail.com, Hugh Dickins , Jan Kara , Theodore Tso , Sasha Levin Subject: [PATCH 6.1 174/440] ext4: avoid writing unitialized memory to disk in EA inodes Date: Tue, 30 Jul 2024 17:46:47 +0200 Message-ID: <20240730151622.670961763@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151615.753688326@linuxfoundation.org> References: <20240730151615.753688326@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Kara [ Upstream commit 65121eff3e4c8c90f8126debf3c369228691c591 ] If the extended attribute size is not a multiple of block size, the last block in the EA inode will have uninitialized tail which will get written to disk. We will never expose the data to userspace but still this is not a good practice so just zero out the tail of the block as it isn't going to cause a noticeable performance overhead. Fixes: e50e5129f384 ("ext4: xattr-in-inode support") Reported-by: syzbot+9c1fe13fcb51574b249b@syzkaller.appspotmail.com Reported-by: Hugh Dickins Signed-off-by: Jan Kara Link: https://patch.msgid.link/20240613150234.25176-1-jack@suse.cz Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/xattr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 28d00ed833db4..f0a45d3ec4ebb 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -1384,6 +1384,12 @@ static int ext4_xattr_inode_write(handle_t *handle, struct inode *ea_inode, goto out; memcpy(bh->b_data, buf, csize); + /* + * Zero out block tail to avoid writing uninitialized memory + * to disk. + */ + if (csize < blocksize) + memset(bh->b_data + csize, 0, blocksize - csize); set_buffer_uptodate(bh); ext4_handle_dirty_metadata(handle, ea_inode, bh); -- 2.43.0