apparmor: fix display of .ns_name for containers
commit040d9e2bce
upstream. 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/1746463 Fixes:d9f02d9c23
("apparmor: fix display of ns name") Cc: Stable <stable@vger.kernel.org> Reported-by: Serge Hallyn <serge@hallyn.com> Tested-by: Serge Hallyn <serge@hallyn.com> Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
1d0d8beb35
Коммит
a0358f6052
|
@ -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)
|
static int seq_ns_name_show(struct seq_file *seq, void *v)
|
||||||
{
|
{
|
||||||
struct aa_label *label = begin_current_label_crit_section();
|
struct aa_label *label = begin_current_label_crit_section();
|
||||||
|
seq_printf(seq, "%s\n", labels_ns(label)->base.name);
|
||||||
seq_printf(seq, "%s\n", aa_ns_name(labels_ns(label),
|
|
||||||
labels_ns(label), true));
|
|
||||||
end_current_label_crit_section(label);
|
end_current_label_crit_section(label);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче