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 63A9A215762; Thu, 12 Dec 2024 17:26: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=1734024409; cv=none; b=M+VQVcxZhkMRJaqISNcuI7wKEz191MGSb9cTaQeB7+fdgfBbUxQe36U3clre6MoTtq4ULADTJLgBSi5t+ClJUHAYcd3feqfNaVbh2o+SYIaujoRG+WMVgecvVBDo1bdEqKATCE5ThbzfomglV1EUc1hwko9CQ/7VdKiyUI1H12Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734024409; c=relaxed/simple; bh=MxGVUedLGdiHnudnNpkcwwK3dwaaPcsGKwDSWGbX7VI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KAnlemKSPmDcP1y5SR6kjIfyhtAwOed60TBSC4AG3hF7MjEHQKuV8X++GYyuw0vMkOu3tHV5Tb2o903noCIr2EtMssdockrRoAFXip8OfdIGfuXKHcnTc5hr6K+vt1IOZmtGz8saf5O8yKPTAQanCUki8WitIYCe1RigU/QT5is= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FIPwJjjH; 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="FIPwJjjH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D67CCC4CED0; Thu, 12 Dec 2024 17:26:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734024409; bh=MxGVUedLGdiHnudnNpkcwwK3dwaaPcsGKwDSWGbX7VI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FIPwJjjHUQKUKgo753T4Cm2Trsk1JrUyssxEV32K7o85a+QTXBkO3vKUIm4Lnxu0N CA2v7EimH5wE8KNUbdgukecOA/NUdPHmWV5VtTaTfaZKY6fPnoZLT3cWdLAf9lHDAl b/DG/XCA1xHuO6Hy+iA93c2sq/wMAqsGB1jMEUA8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Artem Sadovnikov , Dave Kleikamp Subject: [PATCH 5.10 247/459] jfs: xattr: check invalid xattr size more strictly Date: Thu, 12 Dec 2024 15:59:45 +0100 Message-ID: <20241212144303.343940387@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144253.511169641@linuxfoundation.org> References: <20241212144253.511169641@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Artem Sadovnikov commit d9f9d96136cba8fedd647d2c024342ce090133c2 upstream. Commit 7c55b78818cf ("jfs: xattr: fix buffer overflow for invalid xattr") also addresses this issue but it only fixes it for positive values, while ea_size is an integer type and can take negative values, e.g. in case of a corrupted filesystem. This still breaks validation and would overflow because of implicit conversion from int to size_t in print_hex_dump(). Fix this issue by clamping the ea_size value instead. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Cc: stable@vger.kernel.org Signed-off-by: Artem Sadovnikov Signed-off-by: Dave Kleikamp Signed-off-by: Greg Kroah-Hartman --- fs/jfs/xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/jfs/xattr.c +++ b/fs/jfs/xattr.c @@ -559,7 +559,7 @@ static int ea_get(struct inode *inode, s size_check: if (EALIST_SIZE(ea_buf->xattr) != ea_size) { - int size = min_t(int, EALIST_SIZE(ea_buf->xattr), ea_size); + int size = clamp_t(int, ea_size, 0, EALIST_SIZE(ea_buf->xattr)); printk(KERN_ERR "ea_get: invalid extended attribute\n"); print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1,