From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAEAEC433E7 for ; Sun, 18 Oct 2020 19:32:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BAB9207DE for ; Sun, 18 Oct 2020 19:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049538; bh=grUqw/DYVQzulCJPfyXD4JR5EqVAtyYq6JiU5FRZc6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WqkBMGmueoG1Pn4iLs1NuuVTRuI87ZyHaD0bBwoQPqWlH0HgbFXY2TKa9Lp7oc2oB MoAR8DC8UGxb45ciUXw7Of+3G6VnhZXHuXg/GgD48V/0csQbvXoxwC4PzMyRpXaU9H mM9tm6w7LBCYrpKgVFLKYTBuFjBR4uaLKO8ZKpBk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731929AbgJRTcR (ORCPT ); Sun, 18 Oct 2020 15:32:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:42636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730991AbgJRT1E (ORCPT ); Sun, 18 Oct 2020 15:27:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9A6BF222EC; Sun, 18 Oct 2020 19:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049224; bh=grUqw/DYVQzulCJPfyXD4JR5EqVAtyYq6JiU5FRZc6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wl4hM3y19jR1tbyyHMRGV23+VoMkvAdnSycvbLcN/pfF4Rp8cCDqn1IjVmpbRP3uo w9ACeakK/CXi9CFydaVPMb1/aT2l+lrfqmz1U3lnLDBuDR838Cp5zgSqy7pec2TFNE cgOvGHueCML/pJk6OrW5ZHmb/AoTVESnfRo8Bmnc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jan Kara , syzbot+9991561e714f597095da@syzkaller.appspotmail.com, Sasha Levin Subject: [PATCH AUTOSEL 4.9 23/41] udf: Limit sparing table size Date: Sun, 18 Oct 2020 15:26:17 -0400 Message-Id: <20201018192635.4056198-23-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018192635.4056198-1-sashal@kernel.org> References: <20201018192635.4056198-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kara [ Upstream commit 44ac6b829c4e173fdf6df18e6dd86aecf9a3dc99 ] Although UDF standard allows it, we don't support sparing table larger than a single block. Check it during mount so that we don't try to access memory beyond end of buffer. Reported-by: syzbot+9991561e714f597095da@syzkaller.appspotmail.com Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/udf/super.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/udf/super.c b/fs/udf/super.c index 4abdba453885e..c8c037e8e57b5 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -1391,6 +1391,12 @@ static int udf_load_sparable_map(struct super_block *sb, (int)spm->numSparingTables); return -EIO; } + if (le32_to_cpu(spm->sizeSparingTable) > sb->s_blocksize) { + udf_err(sb, "error loading logical volume descriptor: " + "Too big sparing table size (%u)\n", + le32_to_cpu(spm->sizeSparingTable)); + return -EIO; + } for (i = 0; i < spm->numSparingTables; i++) { loc = le32_to_cpu(spm->locSparingTable[i]); -- 2.25.1