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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 5AC8DC282C8 for ; Mon, 28 Jan 2019 17:40:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28D7C2147A for ; Mon, 28 Jan 2019 17:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548697254; bh=YHLn/prnYwfXxmI6rCwxAC6wutm+yyTPQp/zrK76Z9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vhA40LpfITxi13Q5BIz+RjaIBBKarUM/MLZZt5GkQzeak24lqq5OEY17IMov27LNA Po7xy6Y9EBppD4tbPBwYwcHCnHf2oeRc7OGwX2rWyPXBIlEVc2x7OqieE0buK/4A2U 8tYIilEkqUyRlFNBlqfAj3nZetwv3oq0Hu+joN/o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728325AbfA1Rkw (ORCPT ); Mon, 28 Jan 2019 12:40:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:38356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728286AbfA1Pvp (ORCPT ); Mon, 28 Jan 2019 10:51:45 -0500 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 1FB1621741; Mon, 28 Jan 2019 15:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690705; bh=YHLn/prnYwfXxmI6rCwxAC6wutm+yyTPQp/zrK76Z9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yGRqDTpbRGzGb10kKm1yhaqlzE/7XnGnoBmWokhYA6rW51FdbgTQMvkaH9GeffuuR nOS4tdFpzjIHGTZBWaQtXffw9rQRZgkKKYNdJUmjiUQUsG8CmS1j2FJKKrzgn9dFzC g34naBcEnR78s41q8fHIh8t2LWJiQVC/LEmEJpZQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jan Kara , Sasha Levin Subject: [PATCH AUTOSEL 4.20 170/304] udf: Fix BUG on corrupted inode Date: Mon, 28 Jan 2019 10:41:27 -0500 Message-Id: <20190128154341.47195-170-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kara [ Upstream commit d288d95842f1503414b7eebce3773bac3390457e ] When inode is corrupted so that extent type is invalid, some functions (such as udf_truncate_extents()) will just BUG. Check that extent type is valid when loading the inode to memory. Reported-by: Anatoly Trosinenko Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/udf/inode.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 5df554a9f9c9..ae796e10f68b 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1357,6 +1357,12 @@ reread: iinfo->i_alloc_type = le16_to_cpu(fe->icbTag.flags) & ICBTAG_FLAG_AD_MASK; + if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_SHORT && + iinfo->i_alloc_type != ICBTAG_FLAG_AD_LONG && + iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) { + ret = -EIO; + goto out; + } iinfo->i_unique = 0; iinfo->i_lenEAttr = 0; iinfo->i_lenExtents = 0; -- 2.19.1