From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41606 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751456AbeBWHIF (ORCPT ); Fri, 23 Feb 2018 02:08:05 -0500 Date: Fri, 23 Feb 2018 08:08:04 +0100 From: Greg Kroah-Hartman To: Kees Cook Cc: stable@vger.kernel.org, Patrick McLean , "Maciej S. Szmigiero" Subject: Re: [PATCH 4.15,4.14] path.h: Include compiler types to avoid missed struct attributes Message-ID: <20180223070804.GA19052@kroah.com> References: <20180222233429.GA43713@beast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180222233429.GA43713@beast> Sender: stable-owner@vger.kernel.org List-ID: On Thu, Feb 22, 2018 at 03:34:29PM -0800, Kees Cook wrote: > commit 28128c61e08eaeced9cc8ec0e6b5d677b5b94690 upstream. > > The header files for some structures could get included in such a way > that struct attributes (specifically __randomize_layout from path.h) would > be parsed as variable names instead of attributes. This could lead to > some instances of a structure being unrandomized, causing nasty GPFs, etc. > > This patch makes sure the compiler_types.h header is included in path.h. > > Reported-by: Patrick McLean > Root-caused-by: Maciej S. Szmigiero > Suggested-by: Linus Torvalds > Tested-by: Maciej S. Szmigiero > Fixes: 3859a271a003 ("randstruct: Mark various structs for randomization") > Signed-off-by: Kees Cook > Signed-off-by: Linus Torvalds > [kees: Adjusted to just path.h for -stable, as this is a smaller change] > Signed-off-by: Kees Cook > --- > This is a much more narrow fix for the issue. I adjusted the commit subject > and body, but still reference the "full" upstream commit. Is this the best > way to handle this? What's wrong with just taking the original upstream commit here? It's only 2 lines, in kconfig.h instead of path.h. What is the reason this has to be in path.h for 4.14.y and 4.15.y? thanks, greg k-h