From: "Jokke Hämäläinen" <jokke.hamalainen@kolttonen.fi>
To: selinux@vger.kernel.org
Subject: [PATCH] conf-parse.y checks (with style fixes removed)
Date: Sat, 18 May 2019 19:57:03 +0300 (EEST) [thread overview]
Message-ID: <alpine.LFD.2.21.1905181955170.29988@34-41-5D-CA-59-C7> (raw)
diff --git a/libsemanage/src/conf-parse.y b/libsemanage/src/conf-parse.y
index b527e893..64b53c2d 100644
--- a/libsemanage/src/conf-parse.y
+++ b/libsemanage/src/conf-parse.y
@@ -221,6 +221,9 @@ usepasswd: USEPASSWD '=' ARG {
ignoredirs: IGNOREDIRS '=' ARG {
current_conf->ignoredirs = strdup($3);
+ if (current_conf->ignoredirs == NULL) {
+ yyerror("could not allocate memory for current_conf->ignoredirs");
+ }
free($3);
}
@@ -240,8 +243,8 @@ handle_unknown: HANDLE_UNKNOWN '=' ARG {
bzip_blocksize: BZIP_BLOCKSIZE '=' ARG {
int blocksize = atoi($3);
free($3);
- if (blocksize > 9)
- yyerror("bzip-blocksize can only be in the range 0-9");
+ if (blocksize < 1 || blocksize > 9)
+ yyerror("bzip-blocksize can only be in the range 1-9");
else
current_conf->bzip_blocksize = blocksize;
}
@@ -339,9 +342,18 @@ static int semanage_conf_init(semanage_conf_t * conf)
{
conf->store_type = SEMANAGE_CON_DIRECT;
conf->store_path = strdup(basename(selinux_policy_root()));
+ if (conf->store_path == NULL) {
+ return -1;
+ }
conf->ignoredirs = NULL;
conf->store_root_path = strdup("/var/lib/selinux");
+ if (conf->store_root_path == NULL) {
+ return -1;
+ }
conf->compiler_directory_path = strdup("/usr/libexec/selinux/hll");
+ if (conf->compiler_directory_path == NULL) {
+ return -1;
+ }
conf->policyvers = sepol_policy_kern_vers_max();
conf->target_platform = SEPOL_TARGET_SELINUX;
conf->expand_check = 1;
@@ -515,7 +527,10 @@ static int parse_module_store(char *arg)
}
}
}
- return 0;
+
+ if (current_conf->store_path)
+ return 0;
+ return -3;
}
static int parse_store_root_path(char *arg)
@@ -526,6 +541,10 @@ static int parse_store_root_path(char *arg)
free(current_conf->store_root_path);
current_conf->store_root_path = strdup(arg);
+ if (current_conf->store_root_path == NULL) {
+ return -2;
+ }
+
return 0;
}
@@ -536,6 +555,9 @@ static int parse_compiler_path(char *arg)
}
free(current_conf->compiler_directory_path);
current_conf->compiler_directory_path = strdup(arg);
+ if (current_conf->compiler_directory_path = NULL) {
+ return -2;
+ }
return 0;
}
next reply other threads:[~2019-05-18 16:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-18 16:57 Jokke Hämäläinen [this message]
2019-05-24 17:07 ` [PATCH] conf-parse.y checks (with style fixes removed) Stephen Smalley
2019-05-24 17:40 ` selinux
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=alpine.LFD.2.21.1905181955170.29988@34-41-5D-CA-59-C7 \
--to=jokke.hamalainen@kolttonen.fi \
--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;
as well as URLs for NNTP newsgroup(s).