From: John Johansen <john.johansen@canonical.com>
To: Greg KH <gregkh@linuxfoundation.org>, Loic <hackurx@opensec.fr>
Cc: stable@vger.kernel.org, arnd@arndb.de, james.l.morris@oracle.com
Subject: Re: [PATCH] apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling
Date: Mon, 17 Sep 2018 06:40:20 -0700 [thread overview]
Message-ID: <8d87110d-eeab-17ad-b131-a12e321bff4b@canonical.com> (raw)
In-Reply-To: <20180917114913.GI13057@kroah.com>
On 09/17/2018 04:49 AM, Greg KH wrote:
> On Sun, Sep 09, 2018 at 04:04:18PM +0200, Loic wrote:
>> Hello,
>>
>> Tested without any problem so please picked up this for 4.4 to fix the
>> problem.
>> The patch below is slightly modified to adapt to this version.
>
> I would like to get an ack from one of the developers/maintainers of
> this patch before I accept it, as it does differ from the in-tree
> version a bit.
>
Greg the patch is good. Full explanation below
cherry-picking the original patch to 4.4, I get 2 conflicts
both modified: security/apparmor/lsm.c
both modified: security/apparmor/policy_unpack.c
the lsm.c conflict is do to surrounding code changes and is handled
correctly. The patch drops the policy_unpack.c change
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index b9b1c66a32a5..138120698f83 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -778,8 +778,7 @@ int aa_unpack(void *udata, size_t size, struct list_head *lh, const char **ns)
if (error)
goto fail_profile;
- if (aa_g_hash_policy)
- error = aa_calc_profile_hash(profile, e.version, start,
+ error = aa_calc_profile_hash(profile, e.version, start,
e.pos - start);
if (error)
goto fail_profile;
The conflict is caused by commit
31f75bfecd9cef7d485b1cda3c6c38cc0b4a5c6c in 4.11, which adds the
conditional check that the upstream version of this patch is dropping
again.
next prev parent reply other threads:[~2018-09-17 19:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-09 14:04 [PATCH] apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling Loic
2018-09-17 11:49 ` Greg KH
2018-09-17 13:40 ` John Johansen [this message]
2018-09-17 13:58 ` Greg KH
2018-09-17 13:58 ` Greg KH
2018-09-17 19:45 ` Loic
2018-09-17 21:15 ` Greg KH
2018-09-17 21:37 ` Greg KH
2018-09-17 21:56 ` Nathan Chancellor
2018-09-17 22:12 ` John Johansen
2018-09-21 5:40 ` Loic
-- strict thread matches above, loose matches on Subject: below --
2016-07-25 17:59 [Patch 0/1] apparmor: fix to 4.8 pull request John Johansen
2016-07-25 17:59 ` [PATCH] apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling John Johansen
2016-07-26 11:38 ` James Morris
2016-07-26 16:56 ` John Johansen
2016-07-13 20:50 Arnd Bergmann
2016-07-13 21:14 ` John Johansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8d87110d-eeab-17ad-b131-a12e321bff4b@canonical.com \
--to=john.johansen@canonical.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=hackurx@opensec.fr \
--cc=james.l.morris@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.