SELinux Security Module development
 help / color / mirror / Atom feed
From: James Carter <jwcart2@gmail.com>
To: selinux@vger.kernel.org
Cc: nicolas.iooss@m4x.org, James Carter <jwcart2@gmail.com>
Subject: [PATCH 2/7 v2] libsepol/cil: Check the token type after getting the next token
Date: Mon, 16 Aug 2021 15:57:47 -0400	[thread overview]
Message-ID: <20210816195752.923028-3-jwcart2@gmail.com> (raw)
In-Reply-To: <20210816195752.923028-1-jwcart2@gmail.com>

In add_hll_linemark(), cil_lexer_next() is called and the token
type is not checked after the call for the expected type (SYMBOL).

Check that the token type is SYMBOL after calling cil_lexer_next().

Signed-off-by: James Carter <jwcart2@gmail.com>
---
 libsepol/cil/src/cil_parser.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libsepol/cil/src/cil_parser.c b/libsepol/cil/src/cil_parser.c
index fb95f401..fc90caec 100644
--- a/libsepol/cil/src/cil_parser.c
+++ b/libsepol/cil/src/cil_parser.c
@@ -111,6 +111,10 @@ static int add_hll_linemark(struct cil_tree_node **current, uint32_t *hll_lineno
 	unsigned long val;
 
 	cil_lexer_next(&tok);
+	if (tok.type != SYMBOL) {
+		cil_log(CIL_ERR, "Invalid line mark syntax\n");
+		goto exit;
+	}
 	hll_type = cil_strpool_add(tok.value);
 	if (hll_type == CIL_KEY_HLL_LME) {
 		if (cil_stack_is_empty(stack)) {
-- 
2.31.1


  parent reply	other threads:[~2021-08-16 19:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-16 19:57 [PATCH 0/7 v2] libsepol/cil: Line mark cleanup and fix James Carter
2021-08-16 19:57 ` [PATCH 1/7 v2] libsepol/cil: Check syntax of src_info statement James Carter
2021-08-16 19:57 ` James Carter [this message]
2021-08-16 19:57 ` [PATCH 3/7 v2] libsepol/cil: Check for valid line mark type immediately James Carter
2021-08-16 19:57 ` [PATCH 4/7 v4] libsepol/cil: Push line mark state first when processing a line mark James Carter
2021-08-16 19:57 ` [PATCH 5/7 v2] libsepol/cil: Create common string-to-unsigned-integer functions James Carter
2021-08-16 19:57 ` [PATCH 6/7 v2] libsepol/cil: Add line mark kind and line number to src info James Carter
2021-08-16 19:57 ` [PATCH 7/7 v2] libsepol/cil: Report correct high-level language line numbers James Carter
2021-08-17 19:34 ` [PATCH 0/7 v2] libsepol/cil: Line mark cleanup and fix Nicolas Iooss
2021-08-17 20:15   ` James Carter
2021-08-17 20:43     ` Nicolas Iooss
2021-08-19 19:20       ` 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=20210816195752.923028-3-jwcart2@gmail.com \
    --to=jwcart2@gmail.com \
    --cc=nicolas.iooss@m4x.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox