Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965438AbeAMC36 (ORCPT + 1 other); Fri, 12 Jan 2018 21:29:58 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:40945 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965368AbeAMC35 (ORCPT ); Fri, 12 Jan 2018 21:29:57 -0500 From: John Johansen Subject: [GIT PULL] apparmor fix for 4.15-rc8 To: Linus Torvalds Cc: LKLM Organization: Canonical Message-ID: Date: Fri, 12 Jan 2018 18:29:45 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="aHKBASJpdmleTVfM8teDfpEesl3jVK0Jm" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --aHKBASJpdmleTVfM8teDfpEesl3jVK0Jm Content-Type: multipart/mixed; boundary="k5W6BP4mRQc8v3Pej1q2rr84qXK64xE16"; protected-headers="v1" From: John Johansen To: Linus Torvalds Cc: LKLM Message-ID: Subject: [GIT PULL] apparmor fix for 4.15-rc8 --k5W6BP4mRQc8v3Pej1q2rr84qXK64xE16 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable Linus, can you please pull the following regression fixes for apparmor. It fixes a couple bugs I have been working with Matthew Garrett on this week. Specifically a regression in the handling of a conflicting profile attachment and label match restrictions for ptrace when profiles are stacked. thanks -- John The following changes since commit c92a9a461dff6140c539c61e457aa97df29517= d6: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/lin= ux/kernel/git/tip/tip (2018-01-12 10:32:11 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor tags/ap= parmor-pr-2018-01-12 for you to fetch changes up to 1a3881d305592d947ed47887306919d50112394d: apparmor: Fix regression in profile conflict logic (2018-01-12 15:56:50= -0800) ---------------------------------------------------------------- - apparmor: fix ptrace label match when matching stacked labels - apparmor: Fix regression in profile conflict logic ---------------------------------------------------------------- John Johansen (1): apparmor: fix ptrace label match when matching stacked labels Matthew Garrett (1): apparmor: Fix regression in profile conflict logic security/apparmor/domain.c | 9 ++++--- security/apparmor/include/perms.h | 3 +++ security/apparmor/ipc.c | 53 +++++++++++++++++++++++----------= ------ 3 files changed, 40 insertions(+), 25 deletions(-) --k5W6BP4mRQc8v3Pej1q2rr84qXK64xE16-- --aHKBASJpdmleTVfM8teDfpEesl3jVK0Jm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJaWW8ZAAoJEAUvNnAY1cPYgn8P/0mrU76sTbxzM2zl4UC9XnTX /UdyCKXLZ4kve3/E7KNcNnuu7y24VZ4FwPc6BCbVCXpQ0fV3pF+v7hqpSKfRY7Xd rtVbShSGIFExP2GLOGcy1djRU87PkCDK6UKfsRQbd2v7wJ1qgh7yofxxRa6L3y8T lyV5PWdRKQoakK7msN0sH0SFtA483gWDSjCdDyHaNArimgFeHzxK5KfRncjh1O+5 pqNfbkCBOUaYtLsMDHxEzAw6cEsV+Te5VzEE2fTVoOU86zyEykpEY7ZDt4VGHcSS 6qZ8C1Qs5IQXX7d+oymIyzP1CYia8UYqAjP9KOw0iQcUzz/dImEOZ6ZgCdkfRcfS kyk9+4df7X8G5PfCCZpKUhLEMbWKL6BI7SynakQvn4pGW96Wdf0ZLe57KkVmKPHs NszwgCsQua8ON/3ptHbuOGHlvujYZq3HymUHmzrvjXaD/3E6CU39+JLGsG3NxifL t0sBqMdmqGPX+D4ONxgbC6gkXVNwnZnQpt4BrBk4MgKtOckKJaQVL0j69aUpk4E6 +0N8eAruQ7Tw2Nl/L4XAgeaQYzUoUHJabvLAfOT8nsS2+LNRTO3K8R5vhJla38mx Wvmqst+MsV3VVIVsHe1JujhRIxr9eJ0qcS6SgJQl/tLApxzudmqfvpvNZu+15QTf ueqe7rxx9Fa4109pjNak =E2F9 -----END PGP SIGNATURE----- --aHKBASJpdmleTVfM8teDfpEesl3jVK0Jm--