apparmor: Explicitly pass options we use while remounting root filesystem

As a result of AppArmor commit d4b0fef10a4a ("parser: fix rule flag
generation change_mount type rules"), we can't expect anymore to
get permission to mount() / read-write, with MS_REC | MS_UNBINDABLE
("runbindable", in AppArmor terms), if we don't explicitly pass those
flags as options. It used to work by mistake.

Now, the reasonable expectation would be that we could just change the
existing rule into:

  mount options=(rw, runbindable) "" -> /,

...but this now fails to load too, I think as a result of AppArmor
commit 9d3f8c6cc05d ("parser: fix parsing of source as mount point
for propagation type flags"). It works with 'rw' alone, but
'runbindable' is indeed a propagation type flag.

Skip the source specification, it doesn't add anything meaningful to
the rule anyway.

Reported-by: Paul Holzinger <pholzing@redhat.com>
Link: https://github.com/containers/podman/pull/19751
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2023-09-06 20:54:52 +02:00
parent 6d3e426d2f
commit b686afa23e

View file

@ -26,7 +26,7 @@
capability sys_ptrace, capability sys_ptrace,
/ r, # isolate_prefork(), isolation.c / r, # isolate_prefork(), isolation.c
mount "" -> "/", mount options=(rw, runbindable) /,
mount "" -> "/tmp/", mount "" -> "/tmp/",
pivot_root "/tmp/" -> "/tmp/", pivot_root "/tmp/" -> "/tmp/",
umount "/", umount "/",