[RESEND PATCH] apparmor: Use str_yes_no() helper function
John Johansen
john.johansen at canonical.com
Fri Dec 20 20:19:46 UTC 2024
On 12/20/24 11:22, Thorsten Blum wrote:
> Remove hard-coded strings by using the str_yes_no() helper function.
>
> Fix a typo in a comment: s/unpritable/unprintable/
>
> Signed-off-by: Thorsten Blum <thorsten.blum at linux.dev>
Hey Thorsten,
sorry for the delay on this I am just really backlogged and will try to catch-up
on the mailing list traffic this weekend.
Acked-by: John Johansen <john.johansen at canonical.com>
I have pulled this into my tree and it should migrate into linux-next soon
> ---
> security/apparmor/apparmorfs.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index 2c0185ebc900..1bce9a7d2129 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -997,7 +997,7 @@ static int aa_sfs_seq_show(struct seq_file *seq, void *v)
>
> switch (fs_file->v_type) {
> case AA_SFS_TYPE_BOOLEAN:
> - seq_printf(seq, "%s\n", fs_file->v.boolean ? "yes" : "no");
> + seq_printf(seq, "%s\n", str_yes_no(fs_file->v.boolean));
> break;
> case AA_SFS_TYPE_STRING:
> seq_printf(seq, "%s\n", fs_file->v.string);
> @@ -1006,7 +1006,7 @@ static int aa_sfs_seq_show(struct seq_file *seq, void *v)
> seq_printf(seq, "%#08lx\n", fs_file->v.u64);
> break;
> default:
> - /* Ignore unpritable entry types. */
> + /* Ignore unprintable entry types. */
> break;
> }
>
> @@ -1152,7 +1152,7 @@ static int seq_ns_stacked_show(struct seq_file *seq, void *v)
> struct aa_label *label;
>
> label = begin_current_label_crit_section();
> - seq_printf(seq, "%s\n", label->size > 1 ? "yes" : "no");
> + seq_printf(seq, "%s\n", str_yes_no(label->size > 1));
> end_current_label_crit_section(label);
>
> return 0;
> @@ -1175,7 +1175,7 @@ static int seq_ns_nsstacked_show(struct seq_file *seq, void *v)
> }
> }
>
> - seq_printf(seq, "%s\n", count > 1 ? "yes" : "no");
> + seq_printf(seq, "%s\n", str_yes_no(count > 1));
> end_current_label_crit_section(label);
>
> return 0;
More information about the Linux-security-module-archive
mailing list