[pve-devel] [PATCH lxc 2/2] apparmor: add rule for allowing remount of boot_id

[Thomas Lamprecht]

On 22.07.20 13:59, Stoiko Ivanov wrote:
> On Wed, 22 Jul 2020 13:51:19 +0200
> Thomas Lamprecht <t.lamprecht at proxmox.com> wrote:
> 
>> On 22.07.20 13:05, Stoiko Ivanov wrote:
>>> commit 863845075d3f77d27c91bd9f47d2f8ddc4867bd5 in upstream only partially
>>> fixes the apparmor deny for mounting boot_id (used for example for identifying
>>> different boots with `journalctl`) inside the container.
>>>
>>> Tested by editing the profile and replacing it disregarding the cache:
>>> `apparmor_parser -W -T -r /etc/apparmor.d/usr.bin.lxc-start`
>>>   
>>
>> was this proposed to upstream as pull request? Did not found it on the
>> LXC GitHub page.
> 
> sorry my phrasing in the cover-letter was misleading: I want to make a
> pull request upstream for this patch, after somebody else sanity-checks it
> -> if it looks ok to you - I'll open the PR.
> 

Haha, and I wanted the reverse: get upstream to review it with their
in-depth knowledge so that I can rely on that check ;-P

> 
>>
>>> Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
>>> ---
>>>  ...apparmor-Allow-ro-remount-of-boot_id.patch | 26 +++++++++++++++++++
>>>  debian/patches/series                         |  1 +
>>>  2 files changed, 27 insertions(+)
>>>  create mode 100644 debian/patches/pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch
>>>
>>> diff --git a/debian/patches/pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch b/debian/patches/pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch
>>> new file mode 100644
>>> index 0000000..fefc586
>>> --- /dev/null
>>> +++ b/debian/patches/pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch
>>> @@ -0,0 +1,26 @@
>>> +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
>>> +From: Stoiko Ivanov <s.ivanov at proxmox.com>
>>> +Date: Wed, 22 Jul 2020 12:17:24 +0200
>>> +Subject: [PATCH lxc] apparmor: Allow ro remount of boot_id
>>> +
>>> +The rule added in 863845075d3f77d27c91bd9f47d2f8ddc4867bd5 did not cover all
>>> +necessary mount calls for /proc/sys/kernel/random/boot_id
>>> +(in src/lxc/conf.c: lxc_setup_boot_id) - the ro remount is missing.
>>> +
>>> +Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
>>> +---
>>> + config/apparmor/abstractions/start-container.in | 1 +
>>> + 1 file changed, 1 insertion(+)
>>> +
>>> +diff --git a/config/apparmor/abstractions/start-container.in b/config/apparmor/abstractions/start-container.in
>>> +index 9998f1121..9f64c2727 100644
>>> +--- a/config/apparmor/abstractions/start-container.in
>>> ++++ b/config/apparmor/abstractions/start-container.in
>>> +@@ -22,6 +22,7 @@
>>> +   mount -> /var/lib/lxc/{**,},
>>> + 
>>> +   mount /dev/.lxc-boot-id -> /proc/sys/kernel/random/boot_id,
>>> ++  mount options=(ro, nosuid, nodev, noexec, remount, bind) -> /proc/sys/kernel/random/boot_id,
>>> + 
>>> +   # required for some pre-mount hooks
>>> +   mount fstype=overlayfs,
>>> diff --git a/debian/patches/series b/debian/patches/series
>>> index ee20ef5..f588081 100644
>>> --- a/debian/patches/series
>>> +++ b/debian/patches/series
>>> @@ -1,3 +1,4 @@
>>>  pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch
>>>  pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
>>>  pve/0003-PVE-Config-attach-always-use-getent.patch
>>> +pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch
>>>   
>>
>