Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935703AbZDCRxe (ORCPT ); Fri, 3 Apr 2009 13:53:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S935318AbZDCRxF (ORCPT ); Fri, 3 Apr 2009 13:53:05 -0400 Received: from hera.kernel.org ([140.211.167.34]:49343 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933728AbZDCRxD (ORCPT ); Fri, 3 Apr 2009 13:53:03 -0400 Date: Fri, 3 Apr 2009 17:51:36 GMT From: Joseph Cihula To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, arjan@linux.intel.com, joseph.cihula@intel.com, chrisw@sous-sol.org, tj@kernel.org, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, chrisw@sous-sol.org, arjan@linux.intel.com, tj@kernel.org, tglx@linutronix.de, joseph.cihula@intel.com, mingo@elte.hu In-Reply-To: <49D13385.5060900@intel.com> References: <49D13385.5060900@intel.com> Subject: [tip:x86/urgent] x86: disable stack-protector for __restore_processor_state() Message-ID: Git-Commit-ID: 9b7b89efa3bdaceaa2efb93e2d635391835da209 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Fri, 03 Apr 2009 17:51:37 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1947 Lines: 49 Commit-ID: 9b7b89efa3bdaceaa2efb93e2d635391835da209 Gitweb: http://git.kernel.org/tip/9b7b89efa3bdaceaa2efb93e2d635391835da209 Author: Joseph Cihula AuthorDate: Mon, 30 Mar 2009 14:03:01 -0700 Committer: Ingo Molnar CommitDate: Fri, 3 Apr 2009 19:48:41 +0200 x86: disable stack-protector for __restore_processor_state() The __restore_processor_state() fn restores %gs on resume from S3. As such, it cannot be protected by the stack-protector guard since %gs will not be correct on function entry. There are only a few other fns in this file and it should not negatively impact kernel security that they will also have the stack-protector guard removed (and so it's not worth moving them to another file). Without this change, S3 resume on a kernel built with CONFIG_CC_STACKPROTECTOR_ALL=y will fail. Signed-off-by: Joseph Cihula Tested-by: Chris Wright Cc: Arjan van de Ven Cc: Tejun Heo LKML-Reference: <49D13385.5060900@intel.com> Signed-off-by: Ingo Molnar --- arch/x86/power/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile index 9ff4d5b..58b32db 100644 --- a/arch/x86/power/Makefile +++ b/arch/x86/power/Makefile @@ -1,2 +1,7 @@ +# __restore_processor_state() restores %gs after S3 resume and so should not +# itself be stack-protected +nostackp := $(call cc-option, -fno-stack-protector) +CFLAGS_cpu_$(BITS).o := $(nostackp) + obj-$(CONFIG_PM_SLEEP) += cpu_$(BITS).o obj-$(CONFIG_HIBERNATION) += hibernate_$(BITS).o hibernate_asm_$(BITS).o -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/