From: James Carter <jwcart2@gmail.com>
To: "Christian Göttsche" <cgzones@googlemail.com>
Cc: selinux@vger.kernel.org
Subject: Re: [PATCH 06/15] checkpolicy: clean expression on error
Date: Mon, 4 Mar 2024 14:18:33 -0500 [thread overview]
Message-ID: <CAP+JOzREUGakY7PBB1yXib5tbFbAu1N1k=-RnUrBNLqr2BahMw@mail.gmail.com> (raw)
In-Reply-To: <CAP+JOzRaAH3F7GR-TSabp61hR=etn+KkjwXP0LkkrXfeCjspQw@mail.gmail.com>
On Tue, Feb 13, 2024 at 3:36 PM James Carter <jwcart2@gmail.com> wrote:
>
> On Mon, Jan 22, 2024 at 8:55 AM Christian Göttsche
> <cgzones@googlemail.com> wrote:
> >
> > The passed expression needs to be transferred into the policy or free'd
> > by the sink functions define_constraint() and define_validatetrans().
> >
> > Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
>
> Acked-by: James Carter <jwcart2@gmail.com>
>
Merged.
THanks,
Jim
> > ---
> > checkpolicy/policy_define.c | 68 ++++++++++++++++++++++---------------
> > 1 file changed, 40 insertions(+), 28 deletions(-)
> >
> > diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c
> > index ec19da9d..97582630 100644
> > --- a/checkpolicy/policy_define.c
> > +++ b/checkpolicy/policy_define.c
> > @@ -3428,20 +3428,22 @@ int define_constraint(constraint_expr_t * expr)
> > return 0;
> > }
> >
> > + ebitmap_init(&classmap);
> > +
> > depth = -1;
> > for (e = expr; e; e = e->next) {
> > switch (e->expr_type) {
> > case CEXPR_NOT:
> > if (depth < 0) {
> > yyerror("illegal constraint expression");
> > - return -1;
> > + goto bad;
> > }
> > break;
> > case CEXPR_AND:
> > case CEXPR_OR:
> > if (depth < 1) {
> > yyerror("illegal constraint expression");
> > - return -1;
> > + goto bad;
> > }
> > depth--;
> > break;
> > @@ -3449,51 +3451,48 @@ int define_constraint(constraint_expr_t * expr)
> > case CEXPR_NAMES:
> > if (e->attr & CEXPR_XTARGET) {
> > yyerror("illegal constraint expression");
> > - return -1; /* only for validatetrans rules */
> > + goto bad; /* only for validatetrans rules */
> > }
> > if (depth == (CEXPR_MAXDEPTH - 1)) {
> > yyerror("constraint expression is too deep");
> > - return -1;
> > + goto bad;
> > }
> > depth++;
> > break;
> > default:
> > yyerror("illegal constraint expression");
> > - return -1;
> > + goto bad;
> > }
> > }
> > if (depth != 0) {
> > yyerror("illegal constraint expression");
> > - return -1;
> > + goto bad;
> > }
> >
> > - ebitmap_init(&classmap);
> > while ((id = queue_remove(id_queue))) {
> > if (!is_id_in_scope(SYM_CLASSES, id)) {
> > yyerror2("class %s is not within scope", id);
> > free(id);
> > - return -1;
> > + goto bad;
> > }
> > cladatum =
> > (class_datum_t *) hashtab_search(policydbp->p_classes.table,
> > (hashtab_key_t) id);
> > if (!cladatum) {
> > yyerror2("class %s is not defined", id);
> > - ebitmap_destroy(&classmap);
> > free(id);
> > - return -1;
> > + goto bad;
> > }
> > if (ebitmap_set_bit(&classmap, cladatum->s.value - 1, TRUE)) {
> > yyerror("out of memory");
> > - ebitmap_destroy(&classmap);
> > free(id);
> > - return -1;
> > + goto bad;
> > }
> > node = malloc(sizeof(struct constraint_node));
> > if (!node) {
> > yyerror("out of memory");
> > free(node);
> > - return -1;
> > + goto bad;
> > }
> > memset(node, 0, sizeof(constraint_node_t));
> > if (useexpr) {
> > @@ -3505,7 +3504,7 @@ int define_constraint(constraint_expr_t * expr)
> > if (!node->expr) {
> > yyerror("out of memory");
> > free(node);
> > - return -1;
> > + goto bad;
> > }
> > node->permissions = 0;
> >
> > @@ -3557,8 +3556,7 @@ int define_constraint(constraint_expr_t * expr)
> > yyerror2("permission %s is not"
> > " defined for class %s", id, policydbp->p_class_val_to_name[i]);
> > free(id);
> > - ebitmap_destroy(&classmap);
> > - return -1;
> > + goto bad;
> > }
> > }
> > node->permissions |= (UINT32_C(1) << (perdatum->s.value - 1));
> > @@ -3569,6 +3567,13 @@ int define_constraint(constraint_expr_t * expr)
> > ebitmap_destroy(&classmap);
> >
> > return 0;
> > +
> > +bad:
> > + ebitmap_destroy(&classmap);
> > + if (useexpr)
> > + constraint_expr_destroy(expr);
> > +
> > + return -1;
> > }
> >
> > int define_validatetrans(constraint_expr_t * expr)
> > @@ -3587,20 +3592,22 @@ int define_validatetrans(constraint_expr_t * expr)
> > return 0;
> > }
> >
> > + ebitmap_init(&classmap);
> > +
> > depth = -1;
> > for (e = expr; e; e = e->next) {
> > switch (e->expr_type) {
> > case CEXPR_NOT:
> > if (depth < 0) {
> > yyerror("illegal validatetrans expression");
> > - return -1;
> > + goto bad;
> > }
> > break;
> > case CEXPR_AND:
> > case CEXPR_OR:
> > if (depth < 1) {
> > yyerror("illegal validatetrans expression");
> > - return -1;
> > + goto bad;
> > }
> > depth--;
> > break;
> > @@ -3608,47 +3615,45 @@ int define_validatetrans(constraint_expr_t * expr)
> > case CEXPR_NAMES:
> > if (depth == (CEXPR_MAXDEPTH - 1)) {
> > yyerror("validatetrans expression is too deep");
> > - return -1;
> > + goto bad;
> > }
> > depth++;
> > break;
> > default:
> > yyerror("illegal validatetrans expression");
> > - return -1;
> > + goto bad;
> > }
> > }
> > if (depth != 0) {
> > yyerror("illegal validatetrans expression");
> > - return -1;
> > + goto bad;
> > }
> >
> > - ebitmap_init(&classmap);
> > while ((id = queue_remove(id_queue))) {
> > if (!is_id_in_scope(SYM_CLASSES, id)) {
> > yyerror2("class %s is not within scope", id);
> > free(id);
> > - return -1;
> > + goto bad;
> > }
> > cladatum =
> > (class_datum_t *) hashtab_search(policydbp->p_classes.table,
> > (hashtab_key_t) id);
> > if (!cladatum) {
> > yyerror2("class %s is not defined", id);
> > - ebitmap_destroy(&classmap);
> > free(id);
> > - return -1;
> > + goto bad;
> > }
> > if (ebitmap_set_bit(&classmap, (cladatum->s.value - 1), TRUE)) {
> > yyerror("out of memory");
> > - ebitmap_destroy(&classmap);
> > free(id);
> > - return -1;
> > + goto bad;
> > }
> >
> > node = malloc(sizeof(struct constraint_node));
> > if (!node) {
> > yyerror("out of memory");
> > - return -1;
> > + free(id);
> > + goto bad;
> > }
> > memset(node, 0, sizeof(constraint_node_t));
> > if (useexpr) {
> > @@ -3668,6 +3673,13 @@ int define_validatetrans(constraint_expr_t * expr)
> > ebitmap_destroy(&classmap);
> >
> > return 0;
> > +
> > +bad:
> > + ebitmap_destroy(&classmap);
> > + if (useexpr)
> > + constraint_expr_destroy(expr);
> > +
> > + return -1;
> > }
> >
> > uintptr_t define_cexpr(uint32_t expr_type, uintptr_t arg1, uintptr_t arg2)
> > --
> > 2.43.0
> >
> >
next prev parent reply other threads:[~2024-03-04 19:18 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-22 13:54 [PATCH 01/15] checkpolicy: add libfuzz based fuzzer Christian Göttsche
2024-01-22 13:54 ` [PATCH 02/15] checkpolicy: cleanup resources on parse error Christian Göttsche
2024-02-13 20:34 ` James Carter
2024-03-04 19:16 ` James Carter
2024-01-22 13:54 ` [PATCH 03/15] checkpolicy: cleanup identifiers on error Christian Göttsche
2024-02-13 20:34 ` James Carter
2024-03-04 19:17 ` James Carter
2024-01-22 13:54 ` [PATCH 04/15] checkpolicy: free ebitmap " Christian Göttsche
2024-02-13 20:35 ` James Carter
2024-03-04 19:17 ` James Carter
2024-01-22 13:54 ` [PATCH 05/15] checkpolicy: check allocation and free memory on error at type definition Christian Göttsche
2024-02-13 20:35 ` James Carter
2024-03-04 19:18 ` James Carter
2024-01-22 13:54 ` [PATCH 06/15] checkpolicy: clean expression on error Christian Göttsche
2024-02-13 20:36 ` James Carter
2024-03-04 19:18 ` James Carter [this message]
2024-01-22 13:54 ` [PATCH 07/15] checkpolicy: call YYABORT on parse errors Christian Göttsche
2024-02-13 20:36 ` James Carter
2024-03-04 19:18 ` James Carter
2024-01-22 13:55 ` [PATCH 08/15] checkpolicy: bail out on invalid role Christian Göttsche
2024-02-13 20:36 ` James Carter
2024-03-04 19:19 ` James Carter
2024-01-22 13:55 ` [PATCH 09/15] libsepol: use typedef Christian Göttsche
2024-02-13 20:37 ` James Carter
2024-03-04 19:19 ` James Carter
2024-01-22 13:55 ` [PATCH 10/15] libsepol: add copy member to level_datum Christian Göttsche
2024-02-12 22:30 ` James Carter
2024-01-22 13:55 ` [PATCH 11/15] checkpolicy: fix use-after-free on invalid sens alias Christian Göttsche
2024-01-22 13:55 ` [PATCH 12/15] checkpolicy: provide more descriptive error messages Christian Göttsche
2024-02-13 20:37 ` James Carter
2024-03-04 19:19 ` James Carter
2024-01-22 13:55 ` [PATCH 13/15] checkpolicy: free temporary bounds type Christian Göttsche
2024-02-13 20:38 ` James Carter
2024-03-04 19:20 ` James Carter
2024-01-22 13:55 ` [PATCH 14/15] checkpolicy: avoid assigning garbage values Christian Göttsche
2024-02-13 20:38 ` James Carter
2024-03-04 19:20 ` James Carter
2024-01-22 13:55 ` [PATCH 15/15] checkpolicy: misc policy_define.c cleanup Christian Göttsche
2024-02-13 20:39 ` James Carter
2024-03-04 19:20 ` James Carter
2024-02-13 20:33 ` [PATCH 01/15] checkpolicy: add libfuzz based fuzzer James Carter
2024-03-04 19:16 ` James Carter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAP+JOzREUGakY7PBB1yXib5tbFbAu1N1k=-RnUrBNLqr2BahMw@mail.gmail.com' \
--to=jwcart2@gmail.com \
--cc=cgzones@googlemail.com \
--cc=selinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.