libselinux: refactor selinux_getenforcemode
PATCH 1/1 libselinux: refactor selinux_getenforcemode
Invert the check for cfg being a nullptr and early return.
--- libselinux/src/selinux_config.c | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-)
libselinux/src/selinux_config.c +37 -38
@@ -88,47 +88,46 @@ static const uint16_t file_path_suffixes_idx[NEL] = {int selinux_getenforcemode (int *enforce) { -int ret =-1 ;FILE *cfg =fopen (SELINUXCONFIG ,"re" ); -if (cfg) { -char *buf; -char *tag; -int len =sizeof (SELINUXTAG ) -1 ; - buf =malloc (selinux_page_size); -if (!buf) { -fclose (cfg); -return -1 ; - } -while (fgets_unlocked (buf, selinux_page_size, cfg)) { -if (strncmp (buf,SELINUXTAG , len)) -continue ; - tag = buf+len; -while (isspace ((unsigned char )*tag)) - tag++; -if (!strncasecmp - (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { - *enforce =1 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"permissive" , -sizeof ("permissive" ) -1 )) { - *enforce =0 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"disabled" , -sizeof ("disabled" ) -1 )) { - *enforce =-1 ; - ret =0 ; -break ; - } - } +if (!cfg) +return -1 ; + +char *buf =malloc (selinux_page_size); +if (!buf) {fclose (cfg); -free (buf); +return -1 ; } + +int ret =-1 ; +static const int len =sizeof (SELINUXTAG ) -1 ; +while (fgets_unlocked (buf, selinux_page_size, cfg)) { +if (strncmp (buf,SELINUXTAG , len)) +continue ; + +char *tag = buf + len; +while (isspace ((unsigned char )*tag)) + tag++; + +if (!strncasecmp (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { + *enforce =1 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"permissive" , +sizeof ("permissive" ) -1 )) { + *enforce =0 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"disabled" , +sizeof ("disabled" ) -1 )) { + *enforce =-1 ; + ret =0 ; +break ; + } + } + +fclose (cfg); +free (buf); +return ret; }
Signature · 1 line
2.50.1
Quoted 4 lines · Rahul Sandhu
Invert the check for cfg being a nullptr and early return.
Signed-off-by Rahul Sandhu <[email protected]>
Quoted 97 lines
--- libselinux/src/selinux_config.c | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-)libselinux/src/selinux_config.c +37
-39@@ -88,47 +88,46 @@ static const uint16_t file_path_suffixes_idx[NEL] = {int selinux_getenforcemode (int *enforce) { -int ret =-1 ;FILE *cfg =fopen (SELINUXCONFIG ,"re" ); -if (cfg) { -char *buf; -char *tag; -int len =sizeof (SELINUXTAG ) -1 ; - buf =malloc (selinux_page_size); -if (!buf) { -fclose (cfg); -return -1 ; - } -while (fgets_unlocked (buf, selinux_page_size, cfg)) { -if (strncmp (buf,SELINUXTAG , len)) -continue ; - tag = buf+len; -while (isspace ((unsigned char )*tag)) - tag++; -if (!strncasecmp - (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { - *enforce =1 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"permissive" , -sizeof ("permissive" ) -1 )) { - *enforce =0 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"disabled" , -sizeof ("disabled" ) -1 )) { - *enforce =-1 ; - ret =0 ; -break ; - } - } +if (!cfg) +return -1 ; + +char *buf =malloc (selinux_page_size); +if (!buf) {fclose (cfg); -free (buf); +return -1 ; } + +int ret =-1 ; +static const int len =sizeof (SELINUXTAG ) -1 ; +while (fgets_unlocked (buf, selinux_page_size, cfg)) { +if (strncmp (buf,SELINUXTAG , len)) +continue ; + +char *tag = buf + len; +while (isspace ((unsigned char )*tag)) + tag++; + +if (!strncasecmp (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { + *enforce =1 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"permissive" , +sizeof ("permissive" ) -1 )) { + *enforce =0 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"disabled" , +sizeof ("disabled" ) -1 )) { + *enforce =-1 ; + ret =0 ; +break ; + } + } + +fclose (cfg); +free (buf); +return ret; } --2.50.1
Jul 29, 2025 16:34:02 Stephen Smalley <[email protected]>:
Quoted 62 lines · Rahul Sandhu
Quoted 4 lines
Invert the check for cfg being a nullptr and early return.
Signed-off-by Rahul Sandhu <[email protected]>Acked-by Stephen Smalley <[email protected]>Quoted 54 lines
---
libselinux/src/selinux_config.c| 75 ++++++++++++++++-----------------1 file changed, 37 insertions(+), 38 deletions(-)libselinux/src/selinux_config.c +4
-37@@ -88,47 +88,46 @@ static const uint16_t file_path_suffixes_idx[NEL] = {int selinux_getenforcemode (int *enforce) { - int ret = -1; FILE *cfg = fopen(SELINUXCONFIG, "re"); - if (cfg) { - char *buf; - char *tag; - int len = sizeof(SELINUXTAG) - 1; - buf = malloc(selinux_page_size); - if (!buf) { - fclose(cfg); - return -1; - } - while (fgets_unlocked(buf, selinux_page_size, cfg)) { - if (strncmp(buf, SELINUXTAG, len)) - continue; - tag = buf+len; - while (isspace((unsigned char)*tag)) - tag++; - if (!strncasecmp - (tag, "enforcing", sizeof("enforcing") - 1)) { - *enforce = 1; - ret = 0; - break; - } else - if (!strncasecmp - (tag, "permissive", - sizeof("permissive") - 1)) { - *enforce = 0; - ret = 0; - break; - } else - if (!strncasecmp - (tag, "disabled", - sizeof("disabled") - 1)) { - *enforce = -1; - ret = 0; - break; - } - } + if (!cfg) + return -1; + + char *buf = malloc(selinux_page_size);
Quoted 8 lines
libselinux/src/selinux_config.c static const uint16_t file_path_suffixes_idx[NEL] = { · line 102
Quoted 8 lines
libselinux/src/selinux_config.c +5
-1+ if (!buf) { fclose(cfg); - free(buf); + return -1; } + + int ret = -1; + static const int len = sizeof(SELINUXTAG) - 1;
Does this constant need to be static?
Quoted 35 lines
Quoted 35 lines
libselinux/src/selinux_config.c +28
-1+ while (fgets_unlocked(buf, selinux_page_size, cfg)) { + if (strncmp(buf, SELINUXTAG, len)) + continue; + + char *tag = buf + len; + while (isspace((unsigned char)*tag)) + tag++; + + if (!strncasecmp(tag, "enforcing", sizeof("enforcing") - 1)) { + *enforce = 1; + ret = 0; + break; + } else if (!strncasecmp(tag, "permissive", + sizeof("permissive") - 1)) { + *enforce = 0; + ret = 0; + break; + } else if (!strncasecmp(tag, "disabled", + sizeof("disabled") - 1)) { + *enforce = -1; + ret = 0; + break; + } + } + + fclose(cfg); + free(buf); + return ret; } --2.50.1
PATCH v2 1/1 libselinux: refactor selinux_getenforcemode
Invert the check for cfg being a nullptr and early return.
--- libselinux/src/selinux_config.c | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-)
v2: Don't mark len static.
libselinux/src/selinux_config.c +37 -38
@@ -88,47 +88,46 @@ static const uint16_t file_path_suffixes_idx[NEL] = {int selinux_getenforcemode (int *enforce) { -int ret =-1 ;FILE *cfg =fopen (SELINUXCONFIG ,"re" ); -if (cfg) { -char *buf; -char *tag; -int len =sizeof (SELINUXTAG ) -1 ; - buf =malloc (selinux_page_size); -if (!buf) { -fclose (cfg); -return -1 ; - } -while (fgets_unlocked (buf, selinux_page_size, cfg)) { -if (strncmp (buf,SELINUXTAG , len)) -continue ; - tag = buf+len; -while (isspace ((unsigned char )*tag)) - tag++; -if (!strncasecmp - (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { - *enforce =1 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"permissive" , -sizeof ("permissive" ) -1 )) { - *enforce =0 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"disabled" , -sizeof ("disabled" ) -1 )) { - *enforce =-1 ; - ret =0 ; -break ; - } - } +if (!cfg) +return -1 ; + +char *buf =malloc (selinux_page_size); +if (!buf) {fclose (cfg); -free (buf); +return -1 ; } + +int ret =-1 ; +const int len =sizeof (SELINUXTAG ) -1 ; +while (fgets_unlocked (buf, selinux_page_size, cfg)) { +if (strncmp (buf,SELINUXTAG , len)) +continue ; + +char *tag = buf + len; +while (isspace ((unsigned char )*tag)) + tag++; + +if (!strncasecmp (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { + *enforce =1 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"permissive" , +sizeof ("permissive" ) -1 )) { + *enforce =0 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"disabled" , +sizeof ("disabled" ) -1 )) { + *enforce =-1 ; + ret =0 ; +break ; + } + } + +fclose (cfg); +free (buf); +return ret; }
Signature · 1 line
2.50.1
Quoted 4 lines · Rahul Sandhu
Invert the check for cfg being a nullptr and early return.
Signed-off-by Rahul Sandhu <[email protected]>
Quoted 98 lines
--- libselinux/src/selinux_config.c | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-)v2: Don't mark len static.
libselinux/src/selinux_config.c +37
-39@@ -88,47 +88,46 @@ static const uint16_t file_path_suffixes_idx[NEL] = {int selinux_getenforcemode (int *enforce) { -int ret =-1 ;FILE *cfg =fopen (SELINUXCONFIG ,"re" ); -if (cfg) { -char *buf; -char *tag; -int len =sizeof (SELINUXTAG ) -1 ; - buf =malloc (selinux_page_size); -if (!buf) { -fclose (cfg); -return -1 ; - } -while (fgets_unlocked (buf, selinux_page_size, cfg)) { -if (strncmp (buf,SELINUXTAG , len)) -continue ; - tag = buf+len; -while (isspace ((unsigned char )*tag)) - tag++; -if (!strncasecmp - (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { - *enforce =1 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"permissive" , -sizeof ("permissive" ) -1 )) { - *enforce =0 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"disabled" , -sizeof ("disabled" ) -1 )) { - *enforce =-1 ; - ret =0 ; -break ; - } - } +if (!cfg) +return -1 ; + +char *buf =malloc (selinux_page_size); +if (!buf) {fclose (cfg); -free (buf); +return -1 ; } + +int ret =-1 ; +const int len =sizeof (SELINUXTAG ) -1 ; +while (fgets_unlocked (buf, selinux_page_size, cfg)) { +if (strncmp (buf,SELINUXTAG , len)) +continue ; + +char *tag = buf + len; +while (isspace ((unsigned char )*tag)) + tag++; + +if (!strncasecmp (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { + *enforce =1 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"permissive" , +sizeof ("permissive" ) -1 )) { + *enforce =0 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"disabled" , +sizeof ("disabled" ) -1 )) { + *enforce =-1 ; + ret =0 ; +break ; + } + } + +fclose (cfg); +free (buf); +return ret; } --2.50.1
Quoted 8 lines · Stephen Smalley
Quoted 4 lines · Rahul Sandhu
Invert the check for cfg being a nullptr and early return.
Signed-off-by Rahul Sandhu <[email protected]>Acked-by Stephen Smalley <[email protected]>
Thanks, applied.
Quoted 99 lines
Quoted 99 lines
--- libselinux/src/selinux_config.c | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-)v2: Don't mark len static.
libselinux/src/selinux_config.c +37
-39@@ -88,47 +88,46 @@ static const uint16_t file_path_suffixes_idx[NEL] = {int selinux_getenforcemode (int *enforce) { -int ret =-1 ;FILE *cfg =fopen (SELINUXCONFIG ,"re" ); -if (cfg) { -char *buf; -char *tag; -int len =sizeof (SELINUXTAG ) -1 ; - buf =malloc (selinux_page_size); -if (!buf) { -fclose (cfg); -return -1 ; - } -while (fgets_unlocked (buf, selinux_page_size, cfg)) { -if (strncmp (buf,SELINUXTAG , len)) -continue ; - tag = buf+len; -while (isspace ((unsigned char )*tag)) - tag++; -if (!strncasecmp - (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { - *enforce =1 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"permissive" , -sizeof ("permissive" ) -1 )) { - *enforce =0 ; - ret =0 ; -break ; - }else -if (!strncasecmp - (tag,"disabled" , -sizeof ("disabled" ) -1 )) { - *enforce =-1 ; - ret =0 ; -break ; - } - } +if (!cfg) +return -1 ; + +char *buf =malloc (selinux_page_size); +if (!buf) {fclose (cfg); -free (buf); +return -1 ; } + +int ret =-1 ; +const int len =sizeof (SELINUXTAG ) -1 ; +while (fgets_unlocked (buf, selinux_page_size, cfg)) { +if (strncmp (buf,SELINUXTAG , len)) +continue ; + +char *tag = buf + len; +while (isspace ((unsigned char )*tag)) + tag++; + +if (!strncasecmp (tag,"enforcing" ,sizeof ("enforcing" ) -1 )) { + *enforce =1 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"permissive" , +sizeof ("permissive" ) -1 )) { + *enforce =0 ; + ret =0 ; +break ; + }else if (!strncasecmp (tag,"disabled" , +sizeof ("disabled" ) -1 )) { + *enforce =-1 ; + ret =0 ; +break ; + } + } + +fclose (cfg); +free (buf); +return ret; } --2.50.1