[PATCH] udf: Check for IS_ERR in udf_get_pblock_meta25

[PATCH] udf: Check for IS_ERR in udf_get_pblock_meta25

[Laura Abbott]

udf_find_metadata_inode_efe returns an error pointer, not just
NULL. Check the return with IS_ERR appropriately.

Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
---
Came out of https://bugzilla.redhat.com/show_bug.cgi?id=1301295, I never
heard back from the reporter so I've had this sitting around for a bit and
haven't been able to confirm it fixes the crash. The logic makes sense
for the crash though.
---
 fs/udf/partition.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/udf/partition.c b/fs/udf/partition.c
index 5f861ed2..a8ee7fc 100644
--- a/fs/udf/partition.c
+++ b/fs/udf/partition.c
@@ -329,7 +329,7 @@ uint32_t udf_get_pblock_meta25(struct super_block *sb, uint32_t block,
 		}
 
 		inode = mdata->s_mirror_fe;
-		if (!inode)
+		if (IS_ERR(inode))
 			return 0xFFFFFFFF;
 		retblk = udf_try_read_meta(inode, block, partition, offset);
 	}
-- 
2.5.5

Re: [PATCH] udf: Check for IS_ERR in udf_get_pblock_meta25

[Jan Kara]

On Wed 18-05-16 10:35:31, Laura Abbott wrote:
> udf_find_metadata_inode_efe returns an error pointer, not just
> NULL. Check the return with IS_ERR appropriately.
> 
> Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
> ---
> Came out of https://bugzilla.redhat.com/show_bug.cgi?id=1301295, I never
> heard back from the reporter so I've had this sitting around for a bit and
> haven't been able to confirm it fixes the crash. The logic makes sense
> for the crash though.

Thanks for the patch. I've just merged a more comprehensive set of fixes
from Alden which fix this issue as well.

								Honza

> ---
>  fs/udf/partition.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/udf/partition.c b/fs/udf/partition.c
> index 5f861ed2..a8ee7fc 100644
> --- a/fs/udf/partition.c
> +++ b/fs/udf/partition.c
> @@ -329,7 +329,7 @@ uint32_t udf_get_pblock_meta25(struct super_block *sb, uint32_t block,
>  		}
>  
>  		inode = mdata->s_mirror_fe;
> -		if (!inode)
> +		if (IS_ERR(inode))
>  			return 0xFFFFFFFF;
>  		retblk = udf_try_read_meta(inode, block, partition, offset);
>  	}
> -- 
> 2.5.5
> 
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR