mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alden Tondettar <alden.tondettar@gmail.com>
To: Jan Kara <jack@suse.com>
Cc: Laura Abbott <labbott@fedoraproject.org>,
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alden Tondettar <alden.tondettar@gmail.com>
Subject: [PATCH 2/3] udf: Use IS_ERR when loading metadata mirror file entry
Date: Wed, 18 May 2016 14:09:18 -0700	[thread overview]
Message-ID: <1463605759-7616-4-git-send-email-alden.tondettar@gmail.com> (raw)
In-Reply-To: <1463605759-7616-1-git-send-email-alden.tondettar@gmail.com>

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 <alden.tondettar@gmail.com>
---
 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

  parent reply	other threads:[~2016-05-18 21:12 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-18 21:09 [PATCH 0/3] udf: Metadata partition fixes Alden Tondettar
2016-05-18 21:09 ` Alden Tondettar
2016-05-18 21:09 ` [PATCH 1/3] udf: Don't BUG on missing metadata partition descriptor Alden Tondettar
2016-05-19 10:25   ` Jan Kara
2016-05-18 21:09 ` Alden Tondettar [this message]
2016-05-19 10:25   ` [PATCH 2/3] udf: Use IS_ERR when loading metadata mirror file entry Jan Kara
2016-05-18 21:09 ` [PATCH 3/3] udf: Use correct partition reference number for metadata Alden Tondettar
2016-05-19 11:03   ` Jan Kara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1463605759-7616-4-git-send-email-alden.tondettar@gmail.com \
    --to=alden.tondettar@gmail.com \
    --cc=jack@suse.com \
    --cc=labbott@fedoraproject.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®