[PATCH] erofs-utils: check the return value of erofs_d_alloc

[PATCH] erofs-utils: check the return value of erofs_d_alloc

[Huang Jianan via Linux-erofs]

Need to check whether the allocation of erofs_dentry is successful.

Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
 lib/inode.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/inode.c b/lib/inode.c
index 5cbfc78..2fa74e2 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -162,11 +162,15 @@ int erofs_prepare_dir_file(struct erofs_inode *dir, unsigned int nr_subdirs)
 
 	/* dot is pointed to the current dir inode */
 	d = erofs_d_alloc(dir, ".");
+	if (IS_ERR(d))
+		return PTR_ERR(d);
 	d->inode = erofs_igrab(dir);
 	d->type = EROFS_FT_DIR;
 
 	/* dotdot is pointed to the parent dir */
 	d = erofs_d_alloc(dir, "..");
+	if (IS_ERR(d))
+		return PTR_ERR(d);
 	d->inode = erofs_igrab(dir->i_parent);
 	d->type = EROFS_FT_DIR;
 
-- 
2.25.1

[PATCH] erofs-utils: fix memory leak when get blob chunk

[Huang Jianan via Linux-erofs]

Release memory allocated for chunk before return error.

Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
 lib/blobchunk.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/blobchunk.c b/lib/blobchunk.c
index 5cbb831..b605b0b 100644
--- a/lib/blobchunk.c
+++ b/lib/blobchunk.c
@@ -78,6 +78,7 @@ static struct erofs_blobchunk *erofs_blob_getchunk(int fd,
 
 		hashmap_entry_init(&key, hash);
 		hashmap_remove(&blob_hashmap, &key, sha256);
+		free(chunk);
 		chunk = ERR_PTR(-ENOSPC);
 		goto out;
 	}
-- 
2.25.1

Re: [PATCH] erofs-utils: check the return value of erofs_d_alloc

[Yue Hu]

On Wed, 17 Nov 2021 18:21:19 +0800
Huang Jianan via Linux-erofs <linux-erofs@lists.ozlabs.org> wrote:

> Need to check whether the allocation of erofs_dentry is successful.
> 
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
> ---
>  lib/inode.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/lib/inode.c b/lib/inode.c
> index 5cbfc78..2fa74e2 100644
> --- a/lib/inode.c
> +++ b/lib/inode.c
> @@ -162,11 +162,15 @@ int erofs_prepare_dir_file(struct erofs_inode *dir, unsigned int nr_subdirs)
>  
>  	/* dot is pointed to the current dir inode */
>  	d = erofs_d_alloc(dir, ".");
> +	if (IS_ERR(d))
> +		return PTR_ERR(d);
>  	d->inode = erofs_igrab(dir);
>  	d->type = EROFS_FT_DIR;
>  
>  	/* dotdot is pointed to the parent dir */
>  	d = erofs_d_alloc(dir, "..");
> +	if (IS_ERR(d))
> +		return PTR_ERR(d);
>  	d->inode = erofs_igrab(dir->i_parent);
>  	d->type = EROFS_FT_DIR;
>  

Looks good to me

Reviewed-by: Yue Hu <huyue2@yulong.com>