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 B3335223E6B; Thu, 12 Dec 2024 16:57:59 +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=1734022679; cv=none; b=CGgs90Qgl2YQUS5Z4adJRKi2sEIlMyzg8bQ3jXNh3p6gKhRs/QpJbG4s2h+qtaO7NIE2eXIxXfyjjGvUG4NfSRpgfclYcrFGMIsa0MrIa1uGLfB8ijWpRNhXVoqVEJ0fxG8AJ4J1FSNlEM7u72GzexTUUAxe8FQN2uvRlJvbc+E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734022679; c=relaxed/simple; bh=gehzdTi3J4nxncNMvo3P65HzSfpNs7GdzidOrqNl864=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F54PNvMevY5Ez4iOPg7GUyl9I7sdOGP4Mq5W7vmP1C77hrFAAvqj2jVbgUhNNRuKdL/KMPIXyRfh9olxgQ9CHvLo56/wHwfBRUS7eTRNLaB8fk8CDToRPb/9SMhCTu5LUrI2bap5TkVVsHiW4rZRDkxbDUNsWKX9fg1FOKkbut0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=H3PyVpKS; 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="H3PyVpKS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 324BFC4CECE; Thu, 12 Dec 2024 16:57:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734022679; bh=gehzdTi3J4nxncNMvo3P65HzSfpNs7GdzidOrqNl864=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H3PyVpKSmGELgNThr9rainievftHycg2CL+f0MzznLK252wBcXNsHZ4/BBBBGgBdP PnhIS3ufO+9mQ8TN2f4D+ex7Hv5S7liA05pbpdm/ULfsr0b6bEVbp0FSqOEiM52JmE neGAr9LbbPfPvtromRpQu+54D+emBD7Maa190WFQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Artem Sadovnikov , Dave Kleikamp Subject: [PATCH 5.15 306/565] jfs: xattr: check invalid xattr size more strictly Date: Thu, 12 Dec 2024 15:58:21 +0100 Message-ID: <20241212144323.565824895@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144311.432886635@linuxfoundation.org> References: <20241212144311.432886635@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.15-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,