Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2364576imu; Thu, 24 Jan 2019 11:27:20 -0800 (PST) X-Google-Smtp-Source: ALg8bN70eqSHh1bYg/v9aBtpQCMLFEmh7/I04PHoDJGBP9y6Sg41d8S2Zmd9ms9wzmg9aQrR2Syr X-Received: by 2002:a65:590b:: with SMTP id f11mr7188271pgu.60.1548358040056; Thu, 24 Jan 2019 11:27:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548358040; cv=none; d=google.com; s=arc-20160816; b=dgoO5yRcLyTzXdCJJhlww39vp/77DqR8HNQPTZgZdHT5jCBWkLu6MVnyV0VZeeo8UO doW3Xl+Y3d3MzohMNaINLR9W10HVik8HDJRVFDo6ISyImUd3FMOhWpCqzPKTgk33/GZu ke11rhlADKWd1LpbtiSzXVWHwLgkUZeKttT4ApbfVw7QN/NGOO88k+ZWtKqEYXFriVVR AAHCzq8fCYXgvYjq2MemTbQ6XAu5EWOw2buaFk5hHT7rgGrZvJ0omQP/berjeUE++5VZ EwYKdvdWXt2wI3JV5wJR6Pwlal6dhLMbGSvingMeLcFKeBszqDA1p0+5Umv1Nw1I6Raf vQ8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tzx1QtcbZrkLJJR5oaBwEWD7zijB7DCjXTS/ZeDmwmU=; b=lMuFfL6M4VZVvzOHbblXwRNq4Oj1cNU63NBDgWo4KsBShrLSB3XsYfFtKX0lByk6YA WoOho+70cZg6hadVeyq8d9gMs0B12EHH1tA396PxXucRfQGR3xwvxMZR9lfVE8Eu+TWJ gHbJcSQ8FRi+XYhpjxT3aNwDmu/swiZHFeg6TeRsSnmlNFDVWfp2w0d8MWLQfpYMkJI1 k9K7AlzI93n5Ki+GVYjQYNbI0aAfb9TRtR1Yqdv0ye0ZejyK6OFGLO3W8fTlgyqU/MC/ WDzWueMNtdtIpOprCTOUYSDB/4P6vzlV7rRAWDTEBNqelH3I1AEqrm4NiHpRE8NOwoui oz6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HPVDtL1d; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c10si22983205pll.271.2019.01.24.11.27.05; Thu, 24 Jan 2019 11:27:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HPVDtL1d; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730313AbfAXTZI (ORCPT + 99 others); Thu, 24 Jan 2019 14:25:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:50514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730272AbfAXTZF (ORCPT ); Thu, 24 Jan 2019 14:25:05 -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 3E4A1218FC; Thu, 24 Jan 2019 19:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548357904; bh=hwH7LT3VlbcFyMQQAS2qJK6osh39n6Lx6rXHse8xLKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HPVDtL1dJzIRn57zcbeDMJW4I3QfoulgWKnD7Dq/X282Ei9YoTEDyTMJ3QzUkwGf1 TfhoMNs27FErBI/N5F2hAOge3w7R9IKPFZeFk1tQzaH3MPpPWQd3tkyddDW2qXxgFp E+boDBoZsuKF8+CG1xXPxBtKrVv7P2BWdiLZG05Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jaegeuk Kim , Chao Yu , Ben Hutchings Subject: [PATCH 4.4 029/104] f2fs: Add sanity_check_inode() function Date: Thu, 24 Jan 2019 20:19:18 +0100 Message-Id: <20190124190158.280017406@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190154.968308875@linuxfoundation.org> References: <20190124190154.968308875@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.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ben Hutchings This was done as part of commits 5d64600d4f33 "f2fs: avoid bug_on on corrupted inode" and 76d56d4ab4f2 "f2fs: fix to do sanity check with extra_attr feature" upstream, but the specific checks they added are not applicable to 4.4. Cc: Jaegeuk Kim Cc: Chao Yu Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/inode.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -95,6 +95,13 @@ static void __recover_inline_status(stru return; } +static bool sanity_check_inode(struct inode *inode) +{ + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + + return true; +} + static int do_read_inode(struct inode *inode) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); @@ -143,6 +150,11 @@ static int do_read_inode(struct inode *i get_inline_info(fi, ri); + if (!sanity_check_inode(inode)) { + f2fs_put_page(node_page, 1); + return -EINVAL; + } + /* check data exist */ if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode)) __recover_inline_status(inode, node_page);