From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59340 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727021AbeIQTZ7 (ORCPT ); Mon, 17 Sep 2018 15:25:59 -0400 Date: Mon, 17 Sep 2018 15:58:27 +0200 From: Greg KH To: John Johansen Cc: Loic , stable@vger.kernel.org, arnd@arndb.de, james.l.morris@oracle.com Subject: Re: [PATCH] apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling Message-ID: <20180917135827.GA28797@kroah.com> References: <77adc4c42d68501927b5a9150f9f0d62@search.opensec.fr> <20180917114913.GI13057@kroah.com> <8d87110d-eeab-17ad-b131-a12e321bff4b@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8d87110d-eeab-17ad-b131-a12e321bff4b@canonical.com> Sender: stable-owner@vger.kernel.org List-ID: On Mon, Sep 17, 2018 at 06:40:20AM -0700, John Johansen wrote: > 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 Great, thanks for reviewing this! greg k-h