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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 83ED8C282CE for ; Mon, 11 Feb 2019 15:08:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55A0B222B9 for ; Mon, 11 Feb 2019 15:08:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897697; bh=0l7JFCr135AclVB2A/E2/O7I/PlcTA8I99gRbCZrzmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WffirUMSfWOx0Ky0vuM6fuxx4aSGUqU1/sb3mQwmxYkiVOgW9zsp4EzlB3yZZtc9S OYSGd0IEbCKjiKkfAftHyq7RO5V+Eir884D0YTEpVqs/XSUcHaI6QEZ58TACuXtRPe +ubL1Y5BQM45RhoOY8MEubYElA2wuLAyiUA7a2kg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391462AbfBKPIP (ORCPT ); Mon, 11 Feb 2019 10:08:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:58088 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391446AbfBKPIL (ORCPT ); Mon, 11 Feb 2019 10:08:11 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 77374222AD; Mon, 11 Feb 2019 15:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897690; bh=0l7JFCr135AclVB2A/E2/O7I/PlcTA8I99gRbCZrzmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r/SWUZi2pNVHYq9SzDlQxt3RdLXMD7/MVopdZ1iHSnhaRxfCITNQDS62KYb27QYOT +6IItXHydPO6Jo7pEagLIZDNKA9U0V7BHdxSbtgIR1PnoUSIir/pkTe6OyVtU5hGDu +nikzu4Ixq1Z4nJelR5XI6tCTjI8gAHLBkNSEUjk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anatoly Trosinenko , Jan Kara , Sasha Levin Subject: [PATCH 4.9 051/137] udf: Fix BUG on corrupted inode Date: Mon, 11 Feb 2019 15:18:52 +0100 Message-Id: <20190211141816.732184283@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141811.964925535@linuxfoundation.org> References: <20190211141811.964925535@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 035943501b9f..fd817022cb9b 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1372,6 +1372,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