From: "Christian Göttsche" <cgzones@googlemail.com>
To: selinux@vger.kernel.org
Subject: [PATCH 3/3] libsepol: more strict validation
Date: Wed, 1 Nov 2023 17:38:30 +0100 [thread overview]
Message-ID: <20231101163830.177769-3-cgzones@googlemail.com> (raw)
In-Reply-To: <20231101163830.177769-1-cgzones@googlemail.com>
Ensure the ibendport port is not 0 (similar to the kernel).
More general depth test for boolean expressions.
Ensure the boolean id is not set for logic operators.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
libsepol/src/policydb_validate.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/libsepol/src/policydb_validate.c b/libsepol/src/policydb_validate.c
index c6a66fb3..0e4805ef 100644
--- a/libsepol/src/policydb_validate.c
+++ b/libsepol/src/policydb_validate.c
@@ -1002,13 +1002,15 @@ static int validate_cond_expr(sepol_handle_t *handle, const struct cond_expr *ex
case COND_BOOL:
if (validate_value(expr->boolean, boolean))
goto bad;
- if (depth == (COND_EXPR_MAXDEPTH - 1))
+ if (depth >= (COND_EXPR_MAXDEPTH - 1))
goto bad;
depth++;
break;
case COND_NOT:
if (depth < 0)
goto bad;
+ if (expr->boolean != 0)
+ goto bad;
break;
case COND_OR:
case COND_AND:
@@ -1017,6 +1019,8 @@ static int validate_cond_expr(sepol_handle_t *handle, const struct cond_expr *ex
case COND_NEQ:
if (depth < 1)
goto bad;
+ if (expr->boolean != 0)
+ goto bad;
depth--;
break;
default:
@@ -1199,6 +1203,8 @@ static int validate_ocontexts(sepol_handle_t *handle, const policydb_t *p, valid
goto bad;
break;
case OCON_IBENDPORT:
+ if (octx->u.ibendport.port == 0)
+ goto bad;
if (!octx->u.ibendport.dev_name)
goto bad;
break;
--
2.42.0
next prev parent reply other threads:[~2023-11-01 16:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-01 16:38 [PATCH 1/3] libsepol: validate default type of transition is not an attribute Christian Göttsche
2023-11-01 16:38 ` [PATCH 2/3] libsepol: validate constraint depth Christian Göttsche
2023-11-02 19:29 ` James Carter
2023-11-01 16:38 ` Christian Göttsche [this message]
2023-11-02 19:29 ` [PATCH 3/3] libsepol: more strict validation James Carter
2023-11-02 19:28 ` [PATCH 1/3] libsepol: validate default type of transition is not an attribute 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=20231101163830.177769-3-cgzones@googlemail.com \
--to=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.