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 8E8131E230D; Wed, 6 Nov 2024 12:56: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=1730897809; cv=none; b=hYagGbOEjy1nyUnC0tUniVrbzymCG8i1GJbZoNnufC0iAifZNHLyn+rHHG6ByoS6pMLLRyve3rVGReImMbBzHksqAwipwoTuH4b0vbN34J1bHB+drc6TxxfkupeKmaDwHoIrAiU/Lw4c9RqqRZxTab5gmuVZswOWaE+WlmVJ2eU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897809; c=relaxed/simple; bh=Zt6Ms78x9ge3vaakqM1E2ZSWpNdAER0KJ0fhA+h1Hiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EMpfgIv4rc7nX/rsrrmJAl6DEXI+T9RoGv0iWeLmGB8WfnJ5rsGBLvlsmZp5qcIf1w/yW1tqDpa5432vSJ2o6GsQjfVQOfQyq63Cx0VGr8lPaG9rgYeH85Zl2vRWDuLLhU+zxUlV9/sFNyIwawkAKzobTXZWY1F0WgFYD79oJcU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RGSl8iSK; 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="RGSl8iSK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90E4CC4CECD; Wed, 6 Nov 2024 12:56:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730897809; bh=Zt6Ms78x9ge3vaakqM1E2ZSWpNdAER0KJ0fhA+h1Hiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RGSl8iSKUvQMng+vKbKf0I4EJSWCGuQDlMpI2ygs8AxO0o0HO5Pw6Fb5hOnRqh78Q 4RG5N/q6wJse/nmbjFLUr2+m/7yvqBqZcNkjOqQGh1XTjqCVcG4ipCJJd7YoGKjanx K0RY9+kGqpUsXleXsbBcdn/gjxlar+x3QfV+fLls= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ferry Meng , Joseph Qi , lei lu , Changwei Ge , Gang He , Joel Becker , Jun Piao , Junxiao Bi , Mark Fasheh , Andrew Morton , Sasha Levin Subject: [PATCH 5.4 026/462] ocfs2: strict bound check before memcmp in ocfs2_xattr_find_entry() Date: Wed, 6 Nov 2024 12:58:39 +0100 Message-ID: <20241106120332.163369191@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120331.497003148@linuxfoundation.org> References: <20241106120331.497003148@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 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ferry Meng [ Upstream commit af77c4fc1871847b528d58b7fdafb4aa1f6a9262 ] xattr in ocfs2 maybe 'non-indexed', which saved with additional space requested. It's better to check if the memory is out of bound before memcmp, although this possibility mainly comes from crafted poisonous images. Link: https://lkml.kernel.org/r/20240520024024.1976129-2-joseph.qi@linux.alibaba.com Signed-off-by: Ferry Meng Signed-off-by: Joseph Qi Reported-by: lei lu Reviewed-by: Joseph Qi Cc: Changwei Ge Cc: Gang He Cc: Joel Becker Cc: Jun Piao Cc: Junxiao Bi Cc: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- fs/ocfs2/xattr.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 16bf7bb8f0db0..495fb5b7a0876 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -1074,7 +1074,7 @@ static int ocfs2_xattr_find_entry(struct inode *inode, int name_index, { struct ocfs2_xattr_entry *entry; size_t name_len; - int i, cmp = 1; + int i, name_offset, cmp = 1; if (name == NULL) return -EINVAL; @@ -1089,10 +1089,15 @@ static int ocfs2_xattr_find_entry(struct inode *inode, int name_index, cmp = name_index - ocfs2_xattr_get_type(entry); if (!cmp) cmp = name_len - entry->xe_name_len; - if (!cmp) - cmp = memcmp(name, (xs->base + - le16_to_cpu(entry->xe_name_offset)), - name_len); + if (!cmp) { + name_offset = le16_to_cpu(entry->xe_name_offset); + if ((xs->base + name_offset + name_len) > xs->end) { + ocfs2_error(inode->i_sb, + "corrupted xattr entries"); + return -EFSCORRUPTED; + } + cmp = memcmp(name, (xs->base + name_offset), name_len); + } if (cmp == 0) break; entry += 1; -- 2.43.0