From patchwork Tue Oct 27 13:55:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312316 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 3F08BC55179 for ; Tue, 27 Oct 2020 16:30:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2C4C20757 for ; Tue, 27 Oct 2020 16:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603816252; bh=rajoBg90m9v2veNuegkxxzBLUEQ6nFdodXsoaaQtBF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XUUKKS/Teyr8sC3RS5GZDC+oKzPJbDDThORBrVTLb61TMviX2DnncVZkkEqf48Ijo TxkAvcAlQrRlQeUTKIuYBuBryLDQLBo6RG/HeWOUndBxi9IthJh7r7z2OekQI7njV1 rJNLNda0ia/vkuFxlmQ5mFo9xlsT3FuS5e5hNGm4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S368706AbgJ0Qaq (ORCPT ); Tue, 27 Oct 2020 12:30:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:52022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1802636AbgJ0Pug (ORCPT ); Tue, 27 Oct 2020 11:50:36 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A563204EF; Tue, 27 Oct 2020 15:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813835; bh=rajoBg90m9v2veNuegkxxzBLUEQ6nFdodXsoaaQtBF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sJqBG2DbpMEbRnSASoLS/TvkCnchi9Q4pewt4gOy3GJy8BhTOVUCDxr+CbWjFc9C/ ng1FPb59CgvTAkCLFl6DF2Ah2TI0ulQ5oEzLIQZA+qV8BVFO1BXsSx4Fpy8C4Dqu8c yQzavBohYKQ7+TixcEcdSec4Tz4QrJFzcki501/A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+9991561e714f597095da@syzkaller.appspotmail.com, Jan Kara , Sasha Levin Subject: [PATCH 5.9 687/757] udf: Limit sparing table size Date: Tue, 27 Oct 2020 14:55:37 +0100 Message-Id: <20201027135522.754187717@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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 1c42f544096d8..a03b8ce5ef0fd 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -1353,6 +1353,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]);