From 588b5cb1706ce01471ee80f49cb3fe867c8684e7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 12 Jun 2010 20:55:01 +0200 Subject: [PATCH] --- yaml --- r: 201889 b: refs/heads/master c: 38184c522249dc377366d4edc41dc500c2c3bb9e h: refs/heads/master i: 201887: 8fdab4dd19eda3484ff5ee19870f0e52cd72f767 v: v3 --- [refs] | 2 +- trunk/security/selinux/ss/conditional.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 987df83d51b0..bfa240a6d146 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc5c126e4733e6fb3080d3d822ca63226e74fc84 +refs/heads/master: 38184c522249dc377366d4edc41dc500c2c3bb9e diff --git a/trunk/security/selinux/ss/conditional.c b/trunk/security/selinux/ss/conditional.c index a2b3b298e604..0389263b99ce 100644 --- a/trunk/security/selinux/ss/conditional.c +++ b/trunk/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 rc; + p->bool_val_to_struct = NULL; p->cond_list = NULL; - if (avtab_init(&p->te_cond_avtab)) - return -1; + + rc = avtab_init(&p->te_cond_avtab); + if (rc) + return rc; return 0; }