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 22C6AC433DF for ; Sun, 18 Oct 2020 19:35:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E709B207DE for ; Sun, 18 Oct 2020 19:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049728; bh=IWk44sx7GrIK1LwwY141DQgDJvGPoD7OCWS+WVpUCZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j16abPmeiAgyR7tyveru9PamI7PIkesWuM+mt5/DYE7P9Zzkw1/4AAUg8xoR1yQKc WbO5vMLVtcylDnQvMJX4qBK7qlylLRYI8LLfGu2Dhy/VJLpgOhTyySJTLqfDvaZjj1 8Ny+AmDds8kzQr5m4AyjZOCmJsJDSr+dHM1+/XTg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733007AbgJRTf1 (ORCPT ); Sun, 18 Oct 2020 15:35:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:41094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731542AbgJRT0F (ORCPT ); Sun, 18 Oct 2020 15:26:05 -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 D761B222EC; Sun, 18 Oct 2020 19:26:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049165; bh=IWk44sx7GrIK1LwwY141DQgDJvGPoD7OCWS+WVpUCZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVE/6WbY1pmFF+ZiwHzjaSuyBLIBUzLtVRww5AIRkVmiWkJO7ebnAlh4u8J8xWqlv xvMr+WkGTS2U37PKbq2mHzgaw1yIKHSOG+P4JZuFR+fXJJN8ZvHmnk6tYbAoHPN4DO Ui4ffmLjrosb6hcG45Cn1cZoc/oGw2kLm8TL0LPs= 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.14 29/52] udf: Limit sparing table size Date: Sun, 18 Oct 2020 15:25:06 -0400 Message-Id: <20201018192530.4055730-29-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018192530.4055730-1-sashal@kernel.org> References: <20201018192530.4055730-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 51de27685e185..2b8147ecd97fb 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -1385,6 +1385,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