From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail-io0-f177.google.com ([209.85.223.177]:50958 "EHLO
        mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753581AbdKJTVy (ORCPT
        <rfc822;stable@vger.kernel.org>); Fri, 10 Nov 2017 14:21:54 -0500
Received: by mail-io0-f177.google.com with SMTP id 97so14633954iok.7
        for <stable@vger.kernel.org>; Fri, 10 Nov 2017 11:21:54 -0800 (PST)
Date: Fri, 10 Nov 2017 11:21:49 -0800
From: Eric Biggers <ebiggers@google.com>
To: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>, ben@decadent.org.uk,
        dhowells@redhat.com, james.l.morris@oracle.com,
        stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] KEYS: trusted: fix writing past end of
 buffer in" failed to apply to 4.9-stable tree
Message-ID: <20171110192149.GB99710@google.com>
References: <150989148916639@kroah.com>
 <1509966379.3416.212.camel@linux.vnet.ibm.com>
 <20171110114934.GD11679@kroah.com>
 <1510329406.3359.57.camel@linux.vnet.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1510329406.3359.57.camel@linux.vnet.ibm.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Fri, Nov 10, 2017 at 10:56:46AM -0500, Mimi Zohar wrote:
> On Fri, 2017-11-10 at 12:49 +0100, Greg KH wrote:
> > On Mon, Nov 06, 2017 at 06:06:19AM -0500, Mimi Zohar wrote:
> > > Hi Greg,
> > > 
> > > On Sun, 2017-11-05 at 15:18 +0100, gregkh@linuxfoundation.org wrote:
> > > > The patch below does not apply to the 4.9-stable tree.
> > > > If someone wants it applied there, or to any other stable or longterm
> > > > tree, then please email the backport, including the original git commit
> > > > id to <stable@vger.kernel.org>.
> > > > 
> > > > thanks,
> > > > 
> > > > greg k-h
> > > 
> > > This commit needs to prereq commit ee618b4619b7 "KEYS: trusted:
> > > sanitize all key material".
> > 
> > Thanks, that fixes the issue for 4.4 and 4.9, but not for 3.18 :(
> 
> Commit 146aa8b "KEYS: Merge the type-specific data with the payload
> data" introduced the change trusted_destroy(), but it is a rather big
> patch.
> 
> @@ -1114,12 +1114,12 @@ static long trusted_read(const struct key
> *key, char __user�
> *buffer,
> � */
> �static void trusted_destroy(struct key *key)
> �{
> -�������struct trusted_key_payload *p = key->payload.data;
> +�������struct trusted_key_payload *p = key->payload.data[0];
> �
> ��������if (!p)
> ����������������return;
> ��������memset(p->key, 0, p->key_len);
> -�������kfree(key->payload.data);
> +�������kfree(key->payload.data[0]);
> �}
> �
> Perhaps David has back ported this patch already. David? �Otherwise,
> Eric could you create a patch that applies directly to the stable tree
> linux-3.18.y?
> 

I'll send backports of "KEYS: trusted: sanitize all key material" and "KEYS:
trusted: fix writing past end of buffer in trusted_read()".  We don't need
"KEYS: Merge the type-specific data with the payload data", as far as I know; it
seems to be cleanup/refactoring only.

Eric