[PATCH] xfs: fix two memory leaks in xfs_attr_list.c error paths

[PATCH] xfs: fix two memory leaks in xfs_attr_list.c error paths

[Mateusz Guzik]

This plugs 2 trivial leaks in xfs_attr_shortform_list and
xfs_attr3_leaf_list_int.

Signed-off-by: Mateusz Guzik <mguzik@redhat.com>
Cc: <stable@vger.kernel.org>

---
 fs/xfs/xfs_attr_list.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 0ef7c2e..4fa1482 100644
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -202,8 +202,10 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
 					sbp->namelen,
 					sbp->valuelen,
 					&sbp->name[sbp->namelen]);
-		if (error)
+		if (error) {
+			kmem_free(sbuf);
 			return error;
+		}
 		if (context->seen_enough)
 			break;
 		cursor->offset++;
@@ -454,14 +456,13 @@ xfs_attr3_leaf_list_int(
 				args.rmtblkcnt = xfs_attr3_rmt_blocks(
 							args.dp->i_mount, valuelen);
 				retval = xfs_attr_rmtval_get(&args);
-				if (retval)
-					return retval;
-				retval = context->put_listent(context,
-						entry->flags,
-						name_rmt->name,
-						(int)name_rmt->namelen,
-						valuelen,
-						args.value);
+				if (!retval)
+					retval = context->put_listent(context,
+							entry->flags,
+							name_rmt->name,
+							(int)name_rmt->namelen,
+							valuelen,
+							args.value);
 				kmem_free(args.value);
 			} else {
 				retval = context->put_listent(context,
-- 
1.8.3.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: fix two memory leaks in xfs_attr_list.c error paths

[Eric Sandeen]

On 2/10/16 12:35 PM, Mateusz Guzik wrote:
> This plugs 2 trivial leaks in xfs_attr_shortform_list and
> xfs_attr3_leaf_list_int.
> 
> Signed-off-by: Mateusz Guzik <mguzik@redhat.com>
> Cc: <stable@vger.kernel.org>

Looks good (tho I wonder why coverity didn't spot...)

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> 
> ---
>  fs/xfs/xfs_attr_list.c | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
> index 0ef7c2e..4fa1482 100644
> --- a/fs/xfs/xfs_attr_list.c
> +++ b/fs/xfs/xfs_attr_list.c
> @@ -202,8 +202,10 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
>  					sbp->namelen,
>  					sbp->valuelen,
>  					&sbp->name[sbp->namelen]);
> -		if (error)
> +		if (error) {
> +			kmem_free(sbuf);
>  			return error;
> +		}
>  		if (context->seen_enough)
>  			break;
>  		cursor->offset++;
> @@ -454,14 +456,13 @@ xfs_attr3_leaf_list_int(
>  				args.rmtblkcnt = xfs_attr3_rmt_blocks(
>  							args.dp->i_mount, valuelen);
>  				retval = xfs_attr_rmtval_get(&args);
> -				if (retval)
> -					return retval;
> -				retval = context->put_listent(context,
> -						entry->flags,
> -						name_rmt->name,
> -						(int)name_rmt->namelen,
> -						valuelen,
> -						args.value);
> +				if (!retval)
> +					retval = context->put_listent(context,
> +							entry->flags,
> +							name_rmt->name,
> +							(int)name_rmt->namelen,
> +							valuelen,
> +							args.value);
>  				kmem_free(args.value);
>  			} else {
>  				retval = context->put_listent(context,
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: fix two memory leaks in xfs_attr_list.c error paths

[Christoph Hellwig]

On Wed, Feb 10, 2016 at 07:35:37PM +0100, Mateusz Guzik wrote:
> This plugs 2 trivial leaks in xfs_attr_shortform_list and
> xfs_attr3_leaf_list_int.

Can you please add a out: label before the kmem_free at the end of
the function, return the actual error value there and make all others
returns after the kmem_alloc jump to that label?

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs