[PATCH][SRU Artful][Bionic] apparmor: fix display of .ns_name for containers

[Kleber Souza]

On 01/31/18 11:06, John Johansen wrote:
> The .ns_name should not be virtualized by the current ns view. It
> needs to report the ns base name as that is being used during startup
> as part of determining apparmor policy namespace support.
> 
> BugLink: http://bugs.launchpad.net/bugs/????
> Fixes: d9f02d9c237aa ("apparmor: fix display of ns name")
> Reported-by: Serge Hallyn <serge at hallyn.com>
> Tested-by: Serge Hallyn <serge at hallyn.com>
> Signed-off-by: John Johansen <john.johansen at canonical.com>

If this patch doesn't come from upstream, please add a "UBUNTU: SAUCE:"
prefix to the subject.


Thanks,
Kleber

> ---
>  security/apparmor/apparmorfs.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index d4fa04d91439..a23b0ca19fd0 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -1189,9 +1189,7 @@ static int seq_ns_level_show(struct seq_file *seq, void *v)
>  static int seq_ns_name_show(struct seq_file *seq, void *v)
>  {
>  	struct aa_label *label = begin_current_label_crit_section();
> -
> -	seq_printf(seq, "%s\n", aa_ns_name(labels_ns(label),
> -					   labels_ns(label), true));
> +	seq_printf(seq, "%s\n", labels_ns(label)->base.name);
>  	end_current_label_crit_section(label);
>  
>  	return 0;
>