From patchwork Tue Oct 27 13:50:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 313095 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=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 C4F32C388F9 for ; Tue, 27 Oct 2020 14:00:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8267B21D7B for ; Tue, 27 Oct 2020 14:00:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807258; bh=iUI6R6966a9LouajXCH0TTpKJIFM3Q78qhVfapjRgKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q6DwKnonO4KM7KaCI6cza9G0Zk+4QMmv1LpKvoYNn90fIZTwSzEqjrldH919zF6wC udp0yWhcsxJIMjF7WlbXWZjO/z+TKT9byyeEBj1bQZEACZ+mDpflWzjL87yAfsp2wJ RAZG5ebepW1q/ZPz6jMhBuo3EvEy5WaXb3oAo+vA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753593AbgJ0OA5 (ORCPT ); Tue, 27 Oct 2020 10:00:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:48478 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409141AbgJ0OA4 (ORCPT ); Tue, 27 Oct 2020 10:00:56 -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 0B698221F7; Tue, 27 Oct 2020 14:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807255; bh=iUI6R6966a9LouajXCH0TTpKJIFM3Q78qhVfapjRgKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R3NohsjHS5yCZ4z/OWY9z5aeKdgzuIi+dVtJhoMKbfWH+TB8XQb0wmKjZLcXX+1pG mRW2qCSEFQB8yJnBJRAvGl10IjPP4TwJOb/816HAvg0O3FttITPB9yUNzNyJn0qsx+ n59dSZH2xtXl0r8bt6cIOX/hWa5zCDcHnz/xeOPs= 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 4.4 092/112] udf: Limit sparing table size Date: Tue, 27 Oct 2020 14:50:02 +0100 Message-Id: <20201027134904.900468283@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027134900.532249571@linuxfoundation.org> References: <20201027134900.532249571@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 159977ec8e548..710f1b8fad9bf 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -1390,6 +1390,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]);