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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 188AEC433E7 for ; Mon, 12 Oct 2020 19:03:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD8FB22228 for ; Mon, 12 Oct 2020 19:03:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602529417; bh=KyFwZq91g0c69Vtm1zs1HoCWvTLdAGjQ987vXshT4rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x73Hn9KOoksUsKt/7waqcb5wAlu0i4CxckHOxF0+1M53xNYhf+M4SiqpAf1u8CO8e XjhvbJp3PEtDBM7IvzNqjrPzMP0BXCV/mG40eZpUKDpfyIcyhU555/d321ZjQxpSpQ FZQdFZQ6VJGb0JiM3sJg47+yddyvVhCe8Hyuinw8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390858AbgJLTD1 (ORCPT ); Mon, 12 Oct 2020 15:03:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:52546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390065AbgJLTDJ (ORCPT ); Mon, 12 Oct 2020 15:03:09 -0400 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 943C12073A; Mon, 12 Oct 2020 19:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602529388; bh=KyFwZq91g0c69Vtm1zs1HoCWvTLdAGjQ987vXshT4rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qOaIM8kuiYRRtVKh+yZFV16ckGXnJbepaSp/mRVRG9gM/3grfBLQFuaV6tXptazwL oAkHEiadVJJbXe4OMT7w+FtU3OyLLeAjPcuhjNjG5vWQ+UOyZcvagVFP10qhPHjE0N GWPxKOu3Ugb9psa3iVN+2NdOXSvfdbIzmErDgK6w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tetsuhiro Kohada , Namjae Jeon , Sasha Levin Subject: [PATCH AUTOSEL 5.8 22/24] exfat: fix pointer error checking Date: Mon, 12 Oct 2020 15:02:37 -0400 Message-Id: <20201012190239.3279198-22-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201012190239.3279198-1-sashal@kernel.org> References: <20201012190239.3279198-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tetsuhiro Kohada [ Upstream commit d6c9efd92443b23307995f34246c2374056ebbd8 ] Fix missing result check of exfat_build_inode(). And use PTR_ERR_OR_ZERO instead of PTR_ERR. Signed-off-by: Tetsuhiro Kohada Signed-off-by: Namjae Jeon Signed-off-by: Sasha Levin --- fs/exfat/namei.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/exfat/namei.c b/fs/exfat/namei.c index 2b9e21094a96d..4b53a3efd6d46 100644 --- a/fs/exfat/namei.c +++ b/fs/exfat/namei.c @@ -578,7 +578,8 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode, i_pos = exfat_make_i_pos(&info); inode = exfat_build_inode(sb, &info, i_pos); - if (IS_ERR(inode)) + err = PTR_ERR_OR_ZERO(inode); + if (err) goto unlock; inode_inc_iversion(inode); @@ -745,10 +746,9 @@ static struct dentry *exfat_lookup(struct inode *dir, struct dentry *dentry, i_pos = exfat_make_i_pos(&info); inode = exfat_build_inode(sb, &info, i_pos); - if (IS_ERR(inode)) { - err = PTR_ERR(inode); + err = PTR_ERR_OR_ZERO(inode); + if (err) goto unlock; - } i_mode = inode->i_mode; alias = d_find_alias(inode); @@ -890,10 +890,9 @@ static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) i_pos = exfat_make_i_pos(&info); inode = exfat_build_inode(sb, &info, i_pos); - if (IS_ERR(inode)) { - err = PTR_ERR(inode); + err = PTR_ERR_OR_ZERO(inode); + if (err) goto unlock; - } inode_inc_iversion(inode); inode->i_mtime = inode->i_atime = inode->i_ctime = -- 2.25.1