Re: [PATCH 1/3] selinux: return -ENOMEM when memory allocationfails

[James Morris]

On Thu, 20 Jan 2011, Davidlohr Bueso wrote:

> From: Davidlohr Bueso <dave@xxxxxxx>
> 
> Signed-off-by: Davidlohr Bueso <dave@xxxxxxx>
> ---
>  security/selinux/ss/conditional.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
> index c3f845c..a533732 100644
> --- a/security/selinux/ss/conditional.c
> +++ b/security/selinux/ss/conditional.c
> @@ -178,7 +178,7 @@ int cond_init_bool_indexes(struct policydb *p)
>  	p->bool_val_to_struct = (struct cond_bool_datum **)
>  		kmalloc(p->p_bools.nprim * sizeof(struct cond_bool_datum *), GFP_KERNEL);
>  	if (!p->bool_val_to_struct)
> -		return -1;
> +		return -ENOMEM;
>  	return 0;

The caller has already set -ENOMEM, so the code should probably be updated 
there, too, e.g.

	rc = cond_init_bool_indexes();
	if (rc)
		goto out;



-- 
James Morris
<jmorris@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/