[PATCH 09/11] xfsprogs: xfs_repair: fix possible null dereference in traverse_int_dir2block

[Eric Sandeen]

On 12/2/15 5:19 AM, Vivek Trivedi wrote:
> Fix possible null dereference in traverse_int_dir2block if buffer pointer is NULL.
> Reported by coverity.

Hm, against what version of xfsprogs?

traverse_int_dir2block has been gone for a while now.  Can you please recheck
against current git, and if there's still an issue, explain a bit more;
I don't see offhand how we get a bp back from da_read_buf with a null bp->b_addr.

thanks,
-Eric 

> Signed-off-by: Vivek Trivedi <t.vivek at samsung.com>
> ---
>  repair/dir2.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/repair/dir2.c b/repair/dir2.c
> index 61912d1..fe360dc 100644
> --- a/repair/dir2.c
> +++ b/repair/dir2.c
> @@ -1300,7 +1300,7 @@ _("block %" PRIu64 " for directory inode %" PRIu64 " is missing\n"),
>  		bp = da_read_buf(mp, nex, bmp, &xfs_dir3_data_buf_ops);
>  		if (bmp != &lbmp)
>  			free(bmp);
> -		if (bp == NULL) {
> +		if (bp == NULL || !bp->b_addr) {
>  			do_warn(
>  _("can't read block %" PRIu64 " for directory inode %" PRIu64 "\n"),
>  				dbno, ino);
>