From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752249AbdAZBRA (ORCPT <rfc822;w@1wt.eu>);
        Wed, 25 Jan 2017 20:17:00 -0500
Received: from mx1.redhat.com ([209.132.183.28]:37988 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751886AbdAZBQ7 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 25 Jan 2017 20:16:59 -0500
Date: Thu, 26 Jan 2017 09:16:57 +0800
From: Baoquan He <bhe@redhat.com>
To: Kees Cook <keescook@chromium.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
        "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Subject: Re: About commit 65fe935d ("x86/KASLR, x86/power: Remove x86
 hibernation restrictions")
Message-ID: <20170126011657.GA28076@x1>
References: <20170122105318.GD5672@x1>
 <CAGXu5j+eB-Bww2_t4GVH3fyqBcR5KRZBsHFnBUvvZoGwN09acQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAGXu5j+eB-Bww2_t4GVH3fyqBcR5KRZBsHFnBUvvZoGwN09acQ@mail.gmail.com>
User-Agent: Mutt/1.7.0 (2016-08-17)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 26 Jan 2017 01:17:00 +0000 (UTC)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 01/25/17 at 05:06pm, Kees Cook wrote:
> On Sun, Jan 22, 2017 at 2:53 AM, Baoquan He <bhe@redhat.com> wrote:
> > Hi Kees,
> >
> > In your commit 65fe935dd, you mentioned with the fix of 70595b479ce1,
> > the x86 hibernation restrictions can be removed. However I didn't find
> > it in Linus's tree. I found commit 65c0554 ("x86/power/64: Fix kernel text
> > mapping corruption during image restoration"), it should be the one you
> > mentioned, but not very sure since it was merged later than your commit.
> > Could you help confirm this?
> 
> That sounds correct, yes. There was some last minute additional fixing
> which I think made the referenced commit vanish before Linus merged or
> something like that. 65c0554 looks like the fix it was meaning to
> reference. :)

Thanks for confirming!

> 
> >
> > commit 65fe935dd2387a4faf15314c73f5e6d31ef0217e
> > Author: Kees Cook <keescook@chromium.org>
> > Date:   Mon Jun 13 15:10:02 2016 -0700
> >
> >     x86/KASLR, x86/power: Remove x86 hibernation restrictions
> >
> >     With the following fix:
> >
> >       70595b479ce1 ("x86/power/64: Fix crash whan the hibernation code passes control to the image kernel")
> >
> >     ... there is no longer a problem with hibernation resuming a
> >     KASLR-booted kernel image, so remove the restriction.
> >
> > commit 65c0554b73c920023cc8998802e508b798113b46
> > Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > Date:   Thu Jun 30 18:11:41 2016 +0200
> >
> >     x86/power/64: Fix kernel text mapping corruption during image restoration
> >
> >     Logan Gunthorpe reports that hibernation stopped working reliably for
> >     him after commit ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table
> >     and rodata).
> >
> > Thanks
> > Baoquan
> 
> 
> 
> -- 
> Kees Cook
> Nexus Security