From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754220AbcERVMc (ORCPT ); Wed, 18 May 2016 17:12:32 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35303 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753863AbcERVM2 (ORCPT ); Wed, 18 May 2016 17:12:28 -0400 From: Alden Tondettar To: Jan Kara Cc: Laura Abbott , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Alden Tondettar Subject: [PATCH 2/3] udf: Use IS_ERR when loading metadata mirror file entry Date: Wed, 18 May 2016 14:09:18 -0700 Message-Id: <1463605759-7616-4-git-send-email-alden.tondettar@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1463605759-7616-1-git-send-email-alden.tondettar@gmail.com> References: <1463605759-7616-1-git-send-email-alden.tondettar@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently when udf_get_pblock_meta25() fails to map a block using the primary metadata file, it will attempt to load the mirror file entry by calling udf_find_metadata_inode_efe(). That function will return a ERR_PTR if it fails, but the return value is only checked against NULL. Test the return value using IS_ERR() and change it to NULL if needed. Signed-off-by: Alden Tondettar --- fs/udf/partition.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/udf/partition.c b/fs/udf/partition.c index e4e9e70..ca3cde3 100644 --- a/fs/udf/partition.c +++ b/fs/udf/partition.c @@ -326,6 +326,8 @@ uint32_t udf_get_pblock_meta25(struct super_block *sb, uint32_t block, if (!(mdata->s_flags & MF_MIRROR_FE_LOADED)) { mdata->s_mirror_fe = udf_find_metadata_inode_efe(sb, mdata->s_mirror_file_loc, map->s_partition_num); + if (IS_ERR(mdata->s_mirror_fe)) + mdata->s_mirror_fe = NULL; mdata->s_flags |= MF_MIRROR_FE_LOADED; } -- 2.1.4