Commit ea181a34 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

tomoyo: Use str_yes_no() 



Remove the local yesno() implementation and adopt the str_yes_no() from
linux/string_helpers.h.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220126093951.1470898-11-lucas.demarchi@intel.com
parent b8c75bd9

security/tomoyo/audit.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static char *tomoyo_print_header(struct tomoyo_request_info *r) 
		       "#%04u/%02u/%02u %02u:%02u:%02u# profile=%u mode=%s granted=%s (global-pid=%u) task={ pid=%u ppid=%u uid=%u gid=%u euid=%u egid=%u suid=%u sgid=%u fsuid=%u fsgid=%u }",

		       stamp.year, stamp.month, stamp.day, stamp.hour,

		       stamp.min, stamp.sec, r->profile, tomoyo_mode[r->mode],

		       tomoyo_yesno(r->granted), gpid, tomoyo_sys_getpid(),

		       str_yes_no(r->granted), gpid, tomoyo_sys_getpid(),

		       tomoyo_sys_getppid(),

		       from_kuid(&init_user_ns, current_uid()),

		       from_kgid(&init_user_ns, current_gid()),

security/tomoyo/common.c

+5 −14
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/uaccess.h>

#include <linux/slab.h>

#include <linux/security.h>

#include <linux/string_helpers.h>

#include "common.h"



/* String table for operation mode. */
@@ -174,16 +175,6 @@ static bool tomoyo_manage_by_non_root; 


/* Utility functions. */



/**

 * tomoyo_yesno - Return "yes" or "no".

 *

 * @value: Bool value.

 */

const char *tomoyo_yesno(const unsigned int value)

{

	return value ? "yes" : "no";

}



/**

 * tomoyo_addprintf - strncat()-like-snprintf().

 *
@@ -730,8 +721,8 @@ static void tomoyo_print_config(struct tomoyo_io_buffer *head, const u8 config) 
{

	tomoyo_io_printf(head, "={ mode=%s grant_log=%s reject_log=%s }\n",

			 tomoyo_mode[config & 3],

			 tomoyo_yesno(config & TOMOYO_CONFIG_WANT_GRANT_LOG),

			 tomoyo_yesno(config & TOMOYO_CONFIG_WANT_REJECT_LOG));

			 str_yes_no(config & TOMOYO_CONFIG_WANT_GRANT_LOG),

			 str_yes_no(config & TOMOYO_CONFIG_WANT_REJECT_LOG));

}



/**
@@ -1354,7 +1345,7 @@ static bool tomoyo_print_condition(struct tomoyo_io_buffer *head, 
	case 3:

		if (cond->grant_log != TOMOYO_GRANTLOG_AUTO)

			tomoyo_io_printf(head, " grant_log=%s",

					 tomoyo_yesno(cond->grant_log ==

					 str_yes_no(cond->grant_log ==

						    TOMOYO_GRANTLOG_YES));

		tomoyo_set_lf(head);

		return true;

security/tomoyo/common.h

+0 −1
Original line number Diff line number Diff line
@@ -959,7 +959,6 @@ char *tomoyo_read_token(struct tomoyo_acl_param *param); 
char *tomoyo_realpath_from_path(const struct path *path);

char *tomoyo_realpath_nofollow(const char *pathname);

const char *tomoyo_get_exe(void);

const char *tomoyo_yesno(const unsigned int value);

const struct tomoyo_path_info *tomoyo_compare_name_union

(const struct tomoyo_path_info *name, const struct tomoyo_name_union *ptr);

const struct tomoyo_path_info *tomoyo_get_domainname