| Message ID | dde8e9a9-3e57-ce15-823d-8097256e44b7@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Lunar,PULL] apparmor fixes | expand |
On Thu, Apr 27, 2023 at 05:21:01AM -0700, John Johansen wrote: > The following changes since commit e182447c03d5025ced03573df8f937d4e5184a8c: > > UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output (2023-04-24 16:07:07 +0200) > > are available in the Git repository at: > > git@gitlab.com:jjohansen/apparmor-kernel.git lunar-fixes > > for you to fetch changes up to 871f2d6ed009718bfeb3b649d9d11663a5df23fb: > > UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas (2023-04-27 05:17:26 -0700) > > ---------------------------------------------------------------- > John Johansen (4): > UBUNTU: SAUCE: apparmor: fix policy_compat perms remap for file dfa > UBUNTU: SAUCE: apparmor: fix profile verification and enable it > UBUNTU: SAUCE: apparmor: fix: add missing failure check in compute_xmatch_perms > UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas > > security/apparmor/apparmorfs.c | 2 +- > security/apparmor/policy.c | 13 +++++++ > security/apparmor/policy_compat.c | 20 +++++++---- > security/apparmor/policy_unpack.c | 72 ++++++++++++++++++++++++--------------- > 4 files changed, 72 insertions(+), 35 deletions(-) Looks good to me. Applied to lunar/linux and lunar/linux-unstable. Thanks! -Andrea
On 27.04.23 14:21, John Johansen wrote: > The following changes since commit > e182447c03d5025ced03573df8f937d4e5184a8c: > > UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output > (2023-04-24 16:07:07 +0200) > > are available in the Git repository at: > > git@gitlab.com:jjohansen/apparmor-kernel.git lunar-fixes > > for you to fetch changes up to 871f2d6ed009718bfeb3b649d9d11663a5df23fb: > > UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas > (2023-04-27 05:17:26 -0700) > > ---------------------------------------------------------------- > John Johansen (4): > UBUNTU: SAUCE: apparmor: fix policy_compat perms remap for file dfa > UBUNTU: SAUCE: apparmor: fix profile verification and enable it > UBUNTU: SAUCE: apparmor: fix: add missing failure check in > compute_xmatch_perms > UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas > > security/apparmor/apparmorfs.c | 2 +- > security/apparmor/policy.c | 13 +++++++ > security/apparmor/policy_compat.c | 20 +++++++---- > security/apparmor/policy_unpack.c | 72 > ++++++++++++++++++++++++--------------- > 4 files changed, 72 insertions(+), 35 deletions(-) > > Rejected for the following reasons: - Lunar has released and now is under SRU rules - I cannot figure out this request has an associated LP bug because - the gitlab URI given does not work - SAUCE patches should have some more justification as to why we have to differ from upstream -Stefan
On Thu, Apr 27, 2023 at 02:37:21PM +0200, Stefan Bader wrote: > On 27.04.23 14:21, John Johansen wrote: > > The following changes since commit > > e182447c03d5025ced03573df8f937d4e5184a8c: > > > > UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output > > (2023-04-24 16:07:07 +0200) > > > > are available in the Git repository at: > > > > git@gitlab.com:jjohansen/apparmor-kernel.git lunar-fixes > > > > for you to fetch changes up to 871f2d6ed009718bfeb3b649d9d11663a5df23fb: > > > > UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas > > (2023-04-27 05:17:26 -0700) > > > > ---------------------------------------------------------------- > > John Johansen (4): > > UBUNTU: SAUCE: apparmor: fix policy_compat perms remap for file dfa > > UBUNTU: SAUCE: apparmor: fix profile verification and enable it > > UBUNTU: SAUCE: apparmor: fix: add missing failure check in > > compute_xmatch_perms > > UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas > > > > security/apparmor/apparmorfs.c | 2 +- > > security/apparmor/policy.c | 13 +++++++ > > security/apparmor/policy_compat.c | 20 +++++++---- > > security/apparmor/policy_unpack.c | 72 > > ++++++++++++++++++++++++--------------- > > 4 files changed, 72 insertions(+), 35 deletions(-) > > > > > > Rejected for the following reasons: > - Lunar has released and now is under SRU rules > - I cannot figure out this request has an associated LP bug because > - the gitlab URI given does not work > - SAUCE patches should have some more justification as to why we > have to differ from upstream > > -Stefan These are definitely valid reasons, I was still considering lunar/linux as devel material, but at this point it's more stable material, so patches should follow the SRU rules. My bad, sorry. I've un-applied them from lunar. I'll take care of creating a proper LP bug for these extra fixes. For the apparmor SAUCE patches in general, it'd be nice to have a description (even a short summary) of the differences from upstream and why/what is using these features (this is probably for John, because I don't have a view of the big picture regarding our SAUCE differences). Thanks, -Andrea
On 4/27/23 05:54, Andrea Righi wrote: > On Thu, Apr 27, 2023 at 02:37:21PM +0200, Stefan Bader wrote: >> On 27.04.23 14:21, John Johansen wrote: >>> The following changes since commit >>> e182447c03d5025ced03573df8f937d4e5184a8c: >>> >>> UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output >>> (2023-04-24 16:07:07 +0200) >>> >>> are available in the Git repository at: >>> >>> git@gitlab.com:jjohansen/apparmor-kernel.git lunar-fixes >>> >>> for you to fetch changes up to 871f2d6ed009718bfeb3b649d9d11663a5df23fb: >>> >>> UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas >>> (2023-04-27 05:17:26 -0700) >>> >>> ---------------------------------------------------------------- >>> John Johansen (4): >>> UBUNTU: SAUCE: apparmor: fix policy_compat perms remap for file dfa >>> UBUNTU: SAUCE: apparmor: fix profile verification and enable it >>> UBUNTU: SAUCE: apparmor: fix: add missing failure check in >>> compute_xmatch_perms >>> UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas >>> >>> security/apparmor/apparmorfs.c | 2 +- >>> security/apparmor/policy.c | 13 +++++++ >>> security/apparmor/policy_compat.c | 20 +++++++---- >>> security/apparmor/policy_unpack.c | 72 >>> ++++++++++++++++++++++++--------------- >>> 4 files changed, 72 insertions(+), 35 deletions(-) >>> >>> >> >> Rejected for the following reasons: >> - Lunar has released and now is under SRU rules >> - I cannot figure out this request has an associated LP bug because >> - the gitlab URI given does not work >> - SAUCE patches should have some more justification as to why we >> have to differ from upstream >> >> -Stefan > > These are definitely valid reasons, I was still considering lunar/linux > as devel material, but at this point it's more stable material, so > patches should follow the SRU rules. My bad, sorry. > > I've un-applied them from lunar. I'll take care of creating a proper > LP bug for these extra fixes. > Andrea, I am working on it > For the apparmor SAUCE patches in general, it'd be nice to have a > description (even a short summary) of the differences from upstream and > why/what is using these features (this is probably for John, because I > don't have a view of the big picture regarding our SAUCE differences). > Ack, will do.
On 4/27/23 05:54, Andrea Righi wrote: > On Thu, Apr 27, 2023 at 02:37:21PM +0200, Stefan Bader wrote: >> On 27.04.23 14:21, John Johansen wrote: >>> The following changes since commit >>> e182447c03d5025ced03573df8f937d4e5184a8c: >>> >>> UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output >>> (2023-04-24 16:07:07 +0200) >>> >>> are available in the Git repository at: >>> >>> git@gitlab.com:jjohansen/apparmor-kernel.git lunar-fixes >>> >>> for you to fetch changes up to 871f2d6ed009718bfeb3b649d9d11663a5df23fb: >>> >>> UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas >>> (2023-04-27 05:17:26 -0700) >>> >>> ---------------------------------------------------------------- >>> John Johansen (4): >>> UBUNTU: SAUCE: apparmor: fix policy_compat perms remap for file dfa >>> UBUNTU: SAUCE: apparmor: fix profile verification and enable it >>> UBUNTU: SAUCE: apparmor: fix: add missing failure check in >>> compute_xmatch_perms >>> UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas >>> >>> security/apparmor/apparmorfs.c | 2 +- >>> security/apparmor/policy.c | 13 +++++++ >>> security/apparmor/policy_compat.c | 20 +++++++---- >>> security/apparmor/policy_unpack.c | 72 >>> ++++++++++++++++++++++++--------------- >>> 4 files changed, 72 insertions(+), 35 deletions(-) >>> >>> >> >> Rejected for the following reasons: >> - Lunar has released and now is under SRU rules >> - I cannot figure out this request has an associated LP bug because >> - the gitlab URI given does not work >> - SAUCE patches should have some more justification as to why we >> have to differ from upstream >> >> -Stefan > > These are definitely valid reasons, I was still considering lunar/linux > as devel material, but at this point it's more stable material, so > patches should follow the SRU rules. My bad, sorry. > > I've un-applied them from lunar. I'll take care of creating a proper > LP bug for these extra fixes. > > For the apparmor SAUCE patches in general, it'd be nice to have a > description (even a short summary) of the differences from upstream and > why/what is using these features (this is probably for John, because I > don't have a view of the big picture regarding our SAUCE differences). > The following changes since commit e182447c03d5025ced03573df8f937d4e5184a8c: UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output (2023-04-24 16:07:07 +0200) are available in the Git repository at: https://gitlab.com/jjohansen/apparmor-kernel.git tags/lunar-fixes-04-27-2023 for you to fetch changes up to cb2216e7eb1feb4b056c226b75bd9d94b4642243: UBUNTU: SAUCE: (no-up) apparmor: fix: kzalloc perms tables for shared dfas (2023-04-27 07:33:32 -0700) ---------------------------------------------------------------- John Johansen (4): UBUNTU: SAUCE: (no-up) apparmor: fix policy_compat perms remap for file dfa UBUNTU: SAUCE: (no-up) apparmor: fix profile verification and enable it UBUNTU: SAUCE: (no-up) apparmor: fix: add missing failure check in compute_xmatch_perms UBUNTU: SAUCE: (no-up) apparmor: fix: kzalloc perms tables for shared dfas security/apparmor/apparmorfs.c | 2 +- security/apparmor/policy.c | 13 +++++++ security/apparmor/policy_compat.c | 20 +++++++---- security/apparmor/policy_unpack.c | 72 ++++++++++++++++++++++++--------------- 4 files changed, 72 insertions(+), 35 deletions(-)
On Thu, Apr 27, 2023 at 07:34:50AM -0700, John Johansen wrote: > On 4/27/23 05:54, Andrea Righi wrote: > > On Thu, Apr 27, 2023 at 02:37:21PM +0200, Stefan Bader wrote: > > > On 27.04.23 14:21, John Johansen wrote: > > > > The following changes since commit > > > > e182447c03d5025ced03573df8f937d4e5184a8c: > > > > > > > > UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output > > > > (2023-04-24 16:07:07 +0200) > > > > > > > > are available in the Git repository at: > > > > > > > > git@gitlab.com:jjohansen/apparmor-kernel.git lunar-fixes > > > > > > > > for you to fetch changes up to 871f2d6ed009718bfeb3b649d9d11663a5df23fb: > > > > > > > > UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas > > > > (2023-04-27 05:17:26 -0700) > > > > > > > > ---------------------------------------------------------------- > > > > John Johansen (4): > > > > UBUNTU: SAUCE: apparmor: fix policy_compat perms remap for file dfa > > > > UBUNTU: SAUCE: apparmor: fix profile verification and enable it > > > > UBUNTU: SAUCE: apparmor: fix: add missing failure check in > > > > compute_xmatch_perms > > > > UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas > > > > > > > > security/apparmor/apparmorfs.c | 2 +- > > > > security/apparmor/policy.c | 13 +++++++ > > > > security/apparmor/policy_compat.c | 20 +++++++---- > > > > security/apparmor/policy_unpack.c | 72 > > > > ++++++++++++++++++++++++--------------- > > > > 4 files changed, 72 insertions(+), 35 deletions(-) > > > > > > > > > > > > > > Rejected for the following reasons: > > > - Lunar has released and now is under SRU rules > > > - I cannot figure out this request has an associated LP bug because > > > - the gitlab URI given does not work > > > - SAUCE patches should have some more justification as to why we > > > have to differ from upstream > > > > > > -Stefan > > > > These are definitely valid reasons, I was still considering lunar/linux > > as devel material, but at this point it's more stable material, so > > patches should follow the SRU rules. My bad, sorry. > > > > I've un-applied them from lunar. I'll take care of creating a proper > > LP bug for these extra fixes. > > > > For the apparmor SAUCE patches in general, it'd be nice to have a > > description (even a short summary) of the differences from upstream and > > why/what is using these features (this is probably for John, because I > > don't have a view of the big picture regarding our SAUCE differences). > > > > The following changes since commit e182447c03d5025ced03573df8f937d4e5184a8c: > > UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output (2023-04-24 16:07:07 +0200) > > are available in the Git repository at: > > https://gitlab.com/jjohansen/apparmor-kernel.git tags/lunar-fixes-04-27-2023 > > for you to fetch changes up to cb2216e7eb1feb4b056c226b75bd9d94b4642243: > > UBUNTU: SAUCE: (no-up) apparmor: fix: kzalloc perms tables for shared dfas (2023-04-27 07:33:32 -0700) > > ---------------------------------------------------------------- > John Johansen (4): > UBUNTU: SAUCE: (no-up) apparmor: fix policy_compat perms remap for file dfa > UBUNTU: SAUCE: (no-up) apparmor: fix profile verification and enable it > UBUNTU: SAUCE: (no-up) apparmor: fix: add missing failure check in compute_xmatch_perms > UBUNTU: SAUCE: (no-up) apparmor: fix: kzalloc perms tables for shared dfas > > security/apparmor/apparmorfs.c | 2 +- > security/apparmor/policy.c | 13 +++++++ > security/apparmor/policy_compat.c | 20 +++++++---- > security/apparmor/policy_unpack.c | 72 ++++++++++++++++++++++++--------------- > 4 files changed, 72 insertions(+), 35 deletions(-) > New pull request applied to lunar/linux-unstable. This also means (for lunar/linux): Acked-by: Andrea Righi <andrea.righi@canonical.com>
On 27.04.23 16:34, John Johansen wrote: > On 4/27/23 05:54, Andrea Righi wrote: >> On Thu, Apr 27, 2023 at 02:37:21PM +0200, Stefan Bader wrote: >>> On 27.04.23 14:21, John Johansen wrote: >>>> The following changes since commit >>>> e182447c03d5025ced03573df8f937d4e5184a8c: >>>> >>>> UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' >>>> output >>>> (2023-04-24 16:07:07 +0200) >>>> >>>> are available in the Git repository at: >>>> >>>> git@gitlab.com:jjohansen/apparmor-kernel.git lunar-fixes >>>> >>>> for you to fetch changes up to >>>> 871f2d6ed009718bfeb3b649d9d11663a5df23fb: >>>> >>>> UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas >>>> (2023-04-27 05:17:26 -0700) >>>> >>>> ---------------------------------------------------------------- >>>> John Johansen (4): >>>> UBUNTU: SAUCE: apparmor: fix policy_compat perms remap for >>>> file dfa >>>> UBUNTU: SAUCE: apparmor: fix profile verification and enable it >>>> UBUNTU: SAUCE: apparmor: fix: add missing failure check in >>>> compute_xmatch_perms >>>> UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for >>>> shared dfas >>>> >>>> security/apparmor/apparmorfs.c | 2 +- >>>> security/apparmor/policy.c | 13 +++++++ >>>> security/apparmor/policy_compat.c | 20 +++++++---- >>>> security/apparmor/policy_unpack.c | 72 >>>> ++++++++++++++++++++++++--------------- >>>> 4 files changed, 72 insertions(+), 35 deletions(-) >>>> >>>> >>> >>> Rejected for the following reasons: >>> - Lunar has released and now is under SRU rules >>> - I cannot figure out this request has an associated LP bug because >>> - the gitlab URI given does not work >>> - SAUCE patches should have some more justification as to why we >>> have to differ from upstream >>> >>> -Stefan >> >> These are definitely valid reasons, I was still considering lunar/linux >> as devel material, but at this point it's more stable material, so >> patches should follow the SRU rules. My bad, sorry. >> >> I've un-applied them from lunar. I'll take care of creating a proper >> LP bug for these extra fixes. >> >> For the apparmor SAUCE patches in general, it'd be nice to have a >> description (even a short summary) of the differences from upstream and >> why/what is using these features (this is probably for John, because I >> don't have a view of the big picture regarding our SAUCE differences). >> > > The following changes since commit > e182447c03d5025ced03573df8f937d4e5184a8c: > > UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output > (2023-04-24 16:07:07 +0200) > > are available in the Git repository at: > > https://gitlab.com/jjohansen/apparmor-kernel.git > tags/lunar-fixes-04-27-2023 > > for you to fetch changes up to cb2216e7eb1feb4b056c226b75bd9d94b4642243: > > UBUNTU: SAUCE: (no-up) apparmor: fix: kzalloc perms tables for shared > dfas (2023-04-27 07:33:32 -0700) > > ---------------------------------------------------------------- > John Johansen (4): > UBUNTU: SAUCE: (no-up) apparmor: fix policy_compat perms remap > for file dfa > UBUNTU: SAUCE: (no-up) apparmor: fix profile verification and > enable it > UBUNTU: SAUCE: (no-up) apparmor: fix: add missing failure check > in compute_xmatch_perms > UBUNTU: SAUCE: (no-up) apparmor: fix: kzalloc perms tables for > shared dfas > > security/apparmor/apparmorfs.c | 2 +- > security/apparmor/policy.c | 13 +++++++ > security/apparmor/policy_compat.c | 20 +++++++---- > security/apparmor/policy_unpack.c | 72 > ++++++++++++++++++++++++--------------- > 4 files changed, 72 insertions(+), 35 deletions(-) > > Would have been better to start a new thread here and refer to the bug report also in the pull-request so one can check it before fetching. But to get this done with: Acked-by: Stefan Bader <stefan.bader@canonical.com>
On 27.04.23 16:34, John Johansen wrote: > On 4/27/23 05:54, Andrea Righi wrote: >> On Thu, Apr 27, 2023 at 02:37:21PM +0200, Stefan Bader wrote: >>> On 27.04.23 14:21, John Johansen wrote: >>>> The following changes since commit >>>> e182447c03d5025ced03573df8f937d4e5184a8c: >>>> >>>> UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' >>>> output >>>> (2023-04-24 16:07:07 +0200) >>>> >>>> are available in the Git repository at: >>>> >>>> git@gitlab.com:jjohansen/apparmor-kernel.git lunar-fixes >>>> >>>> for you to fetch changes up to >>>> 871f2d6ed009718bfeb3b649d9d11663a5df23fb: >>>> >>>> UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas >>>> (2023-04-27 05:17:26 -0700) >>>> >>>> ---------------------------------------------------------------- >>>> John Johansen (4): >>>> UBUNTU: SAUCE: apparmor: fix policy_compat perms remap for >>>> file dfa >>>> UBUNTU: SAUCE: apparmor: fix profile verification and enable it >>>> UBUNTU: SAUCE: apparmor: fix: add missing failure check in >>>> compute_xmatch_perms >>>> UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for >>>> shared dfas >>>> >>>> security/apparmor/apparmorfs.c | 2 +- >>>> security/apparmor/policy.c | 13 +++++++ >>>> security/apparmor/policy_compat.c | 20 +++++++---- >>>> security/apparmor/policy_unpack.c | 72 >>>> ++++++++++++++++++++++++--------------- >>>> 4 files changed, 72 insertions(+), 35 deletions(-) >>>> >>>> >>> >>> Rejected for the following reasons: >>> - Lunar has released and now is under SRU rules >>> - I cannot figure out this request has an associated LP bug because >>> - the gitlab URI given does not work >>> - SAUCE patches should have some more justification as to why we >>> have to differ from upstream >>> >>> -Stefan >> >> These are definitely valid reasons, I was still considering lunar/linux >> as devel material, but at this point it's more stable material, so >> patches should follow the SRU rules. My bad, sorry. >> >> I've un-applied them from lunar. I'll take care of creating a proper >> LP bug for these extra fixes. >> >> For the apparmor SAUCE patches in general, it'd be nice to have a >> description (even a short summary) of the differences from upstream and >> why/what is using these features (this is probably for John, because I >> don't have a view of the big picture regarding our SAUCE differences). >> > > The following changes since commit > e182447c03d5025ced03573df8f937d4e5184a8c: > > UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output > (2023-04-24 16:07:07 +0200) > > are available in the Git repository at: > > https://gitlab.com/jjohansen/apparmor-kernel.git > tags/lunar-fixes-04-27-2023 > > for you to fetch changes up to cb2216e7eb1feb4b056c226b75bd9d94b4642243: > > UBUNTU: SAUCE: (no-up) apparmor: fix: kzalloc perms tables for shared > dfas (2023-04-27 07:33:32 -0700) > > ---------------------------------------------------------------- > John Johansen (4): > UBUNTU: SAUCE: (no-up) apparmor: fix policy_compat perms remap > for file dfa > UBUNTU: SAUCE: (no-up) apparmor: fix profile verification and > enable it > UBUNTU: SAUCE: (no-up) apparmor: fix: add missing failure check > in compute_xmatch_perms > UBUNTU: SAUCE: (no-up) apparmor: fix: kzalloc perms tables for > shared dfas > > security/apparmor/apparmorfs.c | 2 +- > security/apparmor/policy.c | 13 +++++++ > security/apparmor/policy_compat.c | 20 +++++++---- > security/apparmor/policy_unpack.c | 72 > ++++++++++++++++++++++++--------------- > 4 files changed, 72 insertions(+), 35 deletions(-) > > Applied to lunar:linux/master-next. Thanks. -Stefan
The following changes since commit e182447c03d5025ced03573df8f937d4e5184a8c: UBUNTU: [Packaging] debian/rules: Add DKMS info to 'printenv' output (2023-04-24 16:07:07 +0200) are available in the Git repository at: git@gitlab.com:jjohansen/apparmor-kernel.git lunar-fixes for you to fetch changes up to 871f2d6ed009718bfeb3b649d9d11663a5df23fb: UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas (2023-04-27 05:17:26 -0700) ---------------------------------------------------------------- John Johansen (4): UBUNTU: SAUCE: apparmor: fix policy_compat perms remap for file dfa UBUNTU: SAUCE: apparmor: fix profile verification and enable it UBUNTU: SAUCE: apparmor: fix: add missing failure check in compute_xmatch_perms UBUNTU: SAUCE: apparmor: fix: kzalloc perms tables for shared dfas security/apparmor/apparmorfs.c | 2 +- security/apparmor/policy.c | 13 +++++++ security/apparmor/policy_compat.c | 20 +++++++---- security/apparmor/policy_unpack.c | 72 ++++++++++++++++++++++++--------------- 4 files changed, 72 insertions(+), 35 deletions(-)