Skip to content

Commit e010fa2

Browse files
committed
libselinux: explicitly ignore return values
Tell GCC, see [1], to actually no issue warnings about explicitly ignored return values. Also explicitly ignored return values in cleanup handlers. togglesebool.c: In function ‘rollback’: togglesebool.c:18:17: error: ignoring return value of ‘security_set_boolean’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result] 18 | security_set_boolean(argv[i], | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 19 | security_get_boolean_active(argv[i])); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ load_policy.c: In function ‘selinux_init_load_policy’: load_policy.c:329:17: error: ‘security_disable’ is deprecated: SELinux runtime disable is deprecated [-Werror=deprecated-declarations] 329 | rc = security_disable(); | ^~ booleans.c: In function ‘rollback’: booleans.c:332:17: error: ignoring return value of ‘security_set_boolean’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result] 332 | security_set_boolean(boollist[i].name, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 333 | security_get_boolean_active(boollist[i]. | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 334 | name)); | ~~~~~~ checkAccess.c: In function ‘selinux_check_access’: checkAccess.c:42:16: error: ignoring return value of ‘selinux_status_updated’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result] 42 | (void) selinux_status_updated(); | ^~~~~~~~~~~~~~~~~~~~~~~~ avc.c: In function ‘avc_has_perm_noaudit’: avc.c:761:24: error: ignoring return value of ‘selinux_status_updated’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result] 761 | (void) selinux_status_updated(); | ^~~~~~~~~~~~~~~~~~~~~~~~ [1]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425 Signed-off-by: Christian Göttsche <[email protected]>
1 parent 42365d9 commit e010fa2

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

libselinux/src/avc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ int avc_has_perm_noaudit(security_id_t ssid,
757757
avd_init(avd);
758758

759759
if (!avc_using_threads && !avc_app_main_loop) {
760-
(void) selinux_status_updated();
760+
(void)! selinux_status_updated();
761761
}
762762

763763
if (!aeref) {

libselinux/src/booleans.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ static void rollback(SELboolean * boollist, int end)
327327
int i;
328328

329329
for (i = 0; i < end; i++)
330-
security_set_boolean(boollist[i].name,
330+
(void)! security_set_boolean(boollist[i].name,
331331
security_get_boolean_active(boollist[i].
332332
name));
333333
}

libselinux/src/checkAccess.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int selinux_check_access(const char *scon, const char *tcon, const char *class,
3939
if (rc < 0)
4040
return rc;
4141

42-
(void) selinux_status_updated();
42+
(void)! selinux_status_updated();
4343

4444
sclass = string_to_security_class(class);
4545
if (sclass == 0) {

libselinux/src/load_policy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ int selinux_init_load_policy(int *enforce)
238238
* Get desired mode (disabled, permissive, enforcing) from
239239
* /etc/selinux/config.
240240
*/
241-
selinux_getenforcemode(&seconfig);
241+
(void)! selinux_getenforcemode(&seconfig);
242242

243243
/* Check for an override of the mode via the kernel command line. */
244244
rc = mount("proc", "/proc", "proc", 0, 0);

libselinux/utils/togglesebool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static __attribute__ ((__noreturn__)) void rollback(int argc, char **argv)
1515
int i;
1616

1717
for (i = 1; i < argc; i++)
18-
security_set_boolean(argv[i],
18+
(void)! security_set_boolean(argv[i],
1919
security_get_boolean_active(argv[i]));
2020
exit(1);
2121
}

0 commit comments

Comments
 (0)