Re: [PATCH v2] libsepol: Fix memory leak in role_dominates_copy_callback

[Petr Lautrbach <lautrbach@redhat.com>]

Vit Mojzis <vmojzis@redhat.com> writes:

> Free memory allocated by map_ebitmap in case ebitmap_union fails.
>
> Fixes:
>   Defect type: RESOURCE_LEAK
>   libsepol-3.10/src/expand.c:828:2: alloc_arg: "map_ebitmap" allocates memory that is stored into "mapped.node".
>   libsepol-3.10/src/expand.c:68:3: alloc_arg: "ebitmap_set_bit" allocates memory that is stored into "dst->node".
>   libsepol-3.10/src/ebitmap.c:420:2: alloc_fn: Storage is returned from allocation function "malloc".
>   libsepol-3.10/src/ebitmap.c:420:2: assign: Assigning: "new" = "(ebitmap_node_t *)malloc(24UL)".
>   libsepol-3.10/src/ebitmap.c:437:3: assign: Assigning: "e->node" = "new".
>   libsepol-3.10/src/expand.c:831:3: leaked_storage: Variable "mapped" going out of scope leaks the storage "mapped.node" points to.
>   \#   829|   		return -1;
>   \#   830|   	if (ebitmap_union(&new_role->dominates, &mapped))
>   \#   831|-> 		return -1;
>   \#   832|   	ebitmap_destroy(&mapped);
>   \#   833|
>
> Signed-off-by: Vit Mojzis <vmojzis@redhat.com>

Acked-by: Petr Lautrbach <lautrbach@redhat.com>

> ---
> No changes, only added "Signed-off-by".
>
>  libsepol/src/expand.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
> index 5b2b7b03..c7978948 100644
> --- a/libsepol/src/expand.c
> +++ b/libsepol/src/expand.c
> @@ -827,8 +827,10 @@ static int role_dominates_copy_callback(hashtab_key_t key __attribute__ ((unused
>  
>  	if (map_ebitmap(&role->dominates, &mapped, state->rolemap))
>  		return -1;
> -	if (ebitmap_union(&new_role->dominates, &mapped))
> +	if (ebitmap_union(&new_role->dominates, &mapped)) {
> +		ebitmap_destroy(&mapped);
>  		return -1;
> +	}
>  	ebitmap_destroy(&mapped);
>  
>  	return 0;
> -- 
> 2.53.0