On Mon, Jun 7, 2010 at 5:08 PM, Dan Carpenter <error27@xxxxxxxxx> wrote:
> It's better to propagate the error code from avtab_init() instead of
> returning -1 (-EPERM). It turns out that avtab_init() never fails so
> this patch doesn't change how the code runs but it's still a clean up.
>
> Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
>
> diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
> index f0de637..7447be0 100644
> --- a/security/selinux/ss/conditional.c
> +++ b/security/selinux/ss/conditional.c
> @@ -117,10 +117,14 @@ int evaluate_cond_node(struct policydb *p, struct cond_node *node)
>
> int cond_policydb_init(struct policydb *p)
> {
> + int ret;
I know, I'm being pedantic, but int rc, not int ret; All of the rest
of the code uses rc.
> +
> p->bool_val_to_struct = NULL;
> p->cond_list = NULL;
> - if (avtab_init(&p->te_cond_avtab))
> - return -1;
> +
> + ret = avtab_init(&p->te_cond_avtab);
> + if (ret < 0)
if (rc) not if (rc < 0)
> + return ret;
>
> return 0;
> }
-Eric
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
