From patchwork Thu Jun 14 10:36:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 138540 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1935363lji; Thu, 14 Jun 2018 03:37:58 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIqhlh+Faw5QQ6+v5axuVEcdrfTkUh8oR1U9QerJp47hspUqVhrrHiH2EOLYHznd4jSnpCr X-Received: by 2002:a62:9f16:: with SMTP id g22-v6mr8745698pfe.207.1528972678512; Thu, 14 Jun 2018 03:37:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528972678; cv=none; d=google.com; s=arc-20160816; b=KaiiX+V0mAzLjzsrGETwrRdEUDxAxtEICEOXTlY9/7gf4YKJvER+9vDPf03YcrIqbh WBgrWfGNCCCVqxmWn5TmRmr50nGz7kiAFwvqv6j9tnKiX0W3uROyQaDMOzcrqa5vLQTh 3BxBvEotjPb/tyG0OVTHWgycNzgNaLfXm2WazrvpHp+SfXU+laA6aXV8XosOyU/3p6CQ CPKkURFnHPvLOidWO99O+SNJoQFQeEWLB7ICPtX8t5hTgI7aJQuZOSshaFnwb/WOaloy YqQvWWeXYq7tZ6bn3txTXx1VFZOolU/PLgEgGpO5Zb/4qJlZWMWvJImQteuyTVxVW+2E StYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=D6RBD1FQAs9xM50ah7jHEdg+RGlc5qJNCxFTeU5F4Pw=; b=tAKLJw3VC4QnQQWjQ6hdAGyNxpvzcal++x+32ZJDlLafcGdqXyO74VCMaw6KhoZTQ5 1QnQ+oSeEDkSPandBc5oJvxqnnd4bq0jKGSrFpDNWLiyvupwZIToUZyGRsdXZJx8tadD alMw/RxKuMAfrAseZBhus0kEG5gWqQ+lS34dJ85tb/ueSXidHIFrTDwHCJXz1VrsNpeW J+EswdQullTyub7NsY4E39uYsT8DSr64N/wSrAP9HEYaEABymKMVoOxklgGguVDsJrcw 7B7zBeUDEGactqPDR3wM0BnlneFej2X+31yUcmCpztDo01IgyAoGV12g6fmWW2H1KuzQ hahg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rn9T+m4h; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z14-v6si4250717pgz.264.2018.06.14.03.37.58; Thu, 14 Jun 2018 03:37:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rn9T+m4h; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755030AbeFNKhc (ORCPT + 30 others); Thu, 14 Jun 2018 06:37:32 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:43055 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754860AbeFNKha (ORCPT ); Thu, 14 Jun 2018 06:37:30 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w5EAaqEf008870; Thu, 14 Jun 2018 19:36:53 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w5EAaqEf008870 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1528972613; bh=D6RBD1FQAs9xM50ah7jHEdg+RGlc5qJNCxFTeU5F4Pw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rn9T+m4h6xURvxsypvcdfB0ATPUqvNTuIyqpVBNTYU7RTB/XaQi+YkMHYvpUpv1gE y/CVfcI/r+qI6EatsyBUXPycc7oTBLz2Z6hSdzac4k3WwBKTF4xwneXhn6LO94Ie4l wP+ZvyyulqKTf4Vr9vXJiPxJdyJ+pQQ5207DeZ7XMmilLP2g5ws5bI0Lb/QKkmfcFh 75znwp+t56CYgdQ6mfA7qZxXMfIHXvpqNbD4S3D0qLzC5d6mJM9TYqcBGzaQrS8Kso ZBtnki2GH2jmATvD+w0aXNLjpMAQVU2GYa1/s6hcPbkMuiVykHGlrnzeBV28UljcuP UZpuCC0I8doew== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Linus Torvalds Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , Masahiro Yamada Subject: [PATCH 1/3] x86: fix dependency of X86_32_LAZY_GS Date: Thu, 14 Jun 2018 19:36:43 +0900 Message-Id: <1528972605-24264-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528972605-24264-1-git-send-email-yamada.masahiro@socionext.com> References: <1528972605-24264-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 2a61f4747eea ("stack-protector: test compiler capability in Kconfig and drop AUTO mode") replaced the 'choice' with two boolean symbols, so CC_STACKPROTECTOR_NONE no longer exists. Prior to commit 2bc2f688fdf8 ("Makefile: move stack-protector availability out of Kconfig"), this line was like this: depends on X86_32 && !CC_STACKPROTECTOR The CC_ prefix was dropped by commit 050e9baa9dc9 ("Kbuild: rename CC_STACKPROTECTOR[_STRONG] config variables"), so the dependency now should be: depends on X86_32 && !STACKPROTECTOR Signed-off-by: Masahiro Yamada --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 455a670..d6c6ee6 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -327,7 +327,7 @@ config X86_64_SMP config X86_32_LAZY_GS def_bool y - depends on X86_32 && CC_STACKPROTECTOR_NONE + depends on X86_32 && !STACKPROTECTOR config ARCH_SUPPORTS_UPROBES def_bool y From patchwork Thu Jun 14 10:36:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 138538 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1934997lji; Thu, 14 Jun 2018 03:37:36 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJQAUCE8N3Mt9uzMPzxDphx6VGcQ1J0tQe7G1rz37H6DqCkHIh4ZmT/immj7k3DDOB5oL7d X-Received: by 2002:a17:902:988c:: with SMTP id s12-v6mr2380009plp.304.1528972656613; Thu, 14 Jun 2018 03:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528972656; cv=none; d=google.com; s=arc-20160816; b=gywM2LR0TU3+KECXMkBNN9ggl7SffqysXwJS8l1dTksBU+2+THtZEYqw2+V1QH3Vuk 6msjHb3oKCanpulNt8QGB/2tnQgq5X+l1xVcR9QroKq6Ey4Pkv6fkSzXAiqKariYkp8M +UP3biBSkq8dtrrnIEhzi65p4Rx6w9jXO4ph+3x1Mch3jRIWUy6AnUhjDm+brpBDhvYQ p40pwXRo5C7pBIjhcqQm6gRjvfV1972Q3vbH9cpI4YwNmtumzRLpfX4p3GBJiThmrT7/ plKQQmSxn4Y1+2Of5e/B8Qq0qMK/RgsJ7G15X/ik/0Uu6y19LhB8M6EqEuW3GKv6e5Ow 74kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=goAfbsPn8A6cA25Q2KrraItR1mxigSL66ldGLXQ9+HI=; b=aDcEMA1lEqIbiNcYtM/iRqa1oLNjffEzfFv2OBxdUxn+a37/e2w/tIz3NGrSHZ0Z2c oJhLsm3IP4DPIfB7TLhS937ynguTfgVDZvZdOqBjkHLsXp+CIeRCZ6voNgC7dVjsPOm4 xpD9dM6alqx7BlB2Dkhc3QsmRaUQT9lyjU+c/OlKeQUVzqtvMLXhLHwpayrPp3krmtCy HtA3HRm8QOR34kdWUpNbJnCr+ju1LLxVMO9kP4ToReNodeJh6S91rn/K1kHQdan6ofwa noVR9vPJJW1rmoG5GxPYVPD0RNFHDLNWR0B7gRhLlsP5oPuolmzFLnmmpxSKp51yXzdG 4XEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=NtCaVCao; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t1-v6si4741862plo.241.2018.06.14.03.37.36; Thu, 14 Jun 2018 03:37:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=NtCaVCao; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755095AbeFNKhe (ORCPT + 30 others); Thu, 14 Jun 2018 06:37:34 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:43052 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754870AbeFNKha (ORCPT ); Thu, 14 Jun 2018 06:37:30 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w5EAaqEg008870; Thu, 14 Jun 2018 19:36:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w5EAaqEg008870 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1528972614; bh=goAfbsPn8A6cA25Q2KrraItR1mxigSL66ldGLXQ9+HI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NtCaVCaocq7rOiSf2J9Xm6NgfVGTQocCMXp608QGGe4WvjWetLMpOYNPzCTwNdPQi 3gz2EbcbdroYST8tbRHemg10V8MPkgqBO2IToddbAf9GWltCKrpeCI+KREy8ANLSwD 9T8JyAOAN4MAXwyID/QRiVDKtpLX/qXD7mxhsTwQnx9tAjXeBFau5tzjHK5vDJvLsa /mtwav34TFptcH3+FMaWQbFjFDbrHYTgW4T5GFI+cFwzYzyPflvQZL1o9SoIc96biQ L/iqMQmQm51JgdNbIQUKqMVS70WeUT3GcSriPHomkkTtpUHZ+3MS5MPPfl9nd65DFG ETt6pmf9VVe6A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Linus Torvalds Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , Masahiro Yamada Subject: [PATCH 2/3] kconfig: tinyconfig: remove stale stack protector fixups Date: Thu, 14 Jun 2018 19:36:44 +0900 Message-Id: <1528972605-24264-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528972605-24264-1-git-send-email-yamada.masahiro@socionext.com> References: <1528972605-24264-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Prior to commit 2a61f4747eea ("stack-protector: test compiler capability in Kconfig and drop AUTO mode"), the stack protector was configured by the choice of NONE, REGULAR, STRONG, AUTO. tiny.config needed to explicitly set NONE because the default value of choice, AUTO, did not produce the tiniest kernel. Now that there are only two boolean symbols, STACKPROTECTOR and STACKPROTECTOR_STRONG, they are naturally disabled by "make allnoconfig", which "make tinyconfig" is based on. Remove unnecessary lines from the tiny.config fragment file. Signed-off-by: Masahiro Yamada --- kernel/configs/tiny.config | 4 ---- 1 file changed, 4 deletions(-) -- 2.7.4 diff --git a/kernel/configs/tiny.config b/kernel/configs/tiny.config index 9bfdffc..7fa0c4a 100644 --- a/kernel/configs/tiny.config +++ b/kernel/configs/tiny.config @@ -10,7 +10,3 @@ CONFIG_OPTIMIZE_INLINING=y # CONFIG_SLAB is not set # CONFIG_SLUB is not set CONFIG_SLOB=y -CONFIG_CC_STACKPROTECTOR_NONE=y -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set -# CONFIG_CC_STACKPROTECTOR_AUTO is not set From patchwork Thu Jun 14 10:36:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 138541 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1935537lji; Thu, 14 Jun 2018 03:38:10 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIJU6DIQlk7tejVP+xxGYiBRBcRxBLkbSCVsRao+HoqFGq/u74tWyDT/eZSJ7EvGkDmfNQH X-Received: by 2002:a63:618f:: with SMTP id v137-v6mr1845537pgb.145.1528972690597; Thu, 14 Jun 2018 03:38:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528972690; cv=none; d=google.com; s=arc-20160816; b=WUTgAa/uCcGsTER5D1HhKfvSeVtjYHQWFdj5JVdw5X5hmTJv64JAhMo1OMRC+ZvpNd LpqrQgLkDdf1C0FybLpuh2q9zcP47ML8sqz8GAdBhd0fHe59S8zkksQJVRifldJs1tQy h0HN/1yCOEuYz3A+2oRtjRf9s1OsDmwYMi+whKpwMpJo3zSblJXoVwfULsto2BNI6JyO yO6Pymfh43g7sAlYnS2KUaYM7XNS8rexQoLc8HFILwpQB+xvCc+5U165PCn56Wf+jGSj p1p6bTCmuiqisrqI0E3n2wvex17Ze5pldqjx7i9S4sh7OxiaxxNu7A0WyuXajxeohOUi UC1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=WjkSWmGFVz1Or8CjS2rLrHRKsrHtmrAAZDuotKOY0fQ=; b=J7UHjIJ1zBnjXh3tmc37BhwHzriU5pju+Ninoy6dHr5TB4gyTLpdKJ1rw52vhiH/MA IjlPXgvxLFIO3l3GH/gqn1Y0t+W+o3OgTdo8RoeEVlvH/URLFkr+Cz2rafC8syt5Igb6 LInFONl8rG7GocFhQB1VcyjDVehfX1Xc6x/9vKK9/e+aBTtrczAcfVlxZMJnv3B6BRbz KtMqaD6947ALm47kXqC9250NcFmQccrOrGXwNDMKusdaMPKehSLQMu+BmK51ut+nEmgj fUQHTEkwqVA+vW1tT5WxBc4MDCqMbnpwGTnzlk8uresXl0TbZ3556BT35rdHxNErv13x ccow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=o8SuLLz+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d14-v6si5434640pln.206.2018.06.14.03.38.10; Thu, 14 Jun 2018 03:38:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=o8SuLLz+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935837AbeFNKiH (ORCPT + 30 others); Thu, 14 Jun 2018 06:38:07 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:43053 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754857AbeFNKha (ORCPT ); Thu, 14 Jun 2018 06:37:30 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w5EAaqEh008870; Thu, 14 Jun 2018 19:36:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w5EAaqEh008870 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1528972615; bh=WjkSWmGFVz1Or8CjS2rLrHRKsrHtmrAAZDuotKOY0fQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o8SuLLz+dgablOl32p4xomx5KVlzGEHZHoo1h8/OMTwqVwNpmONo0myAelgUnMrrO dPd1fl3KRc4d/wJZczTGCA3xGnTgsgcemwUzrNkzseofeTvJDjX6pO/r13yLKsSUXe hr3wcO9aMXjiJsK2adlcL5MfizTTmKdMIhvkjmfuOIYq2w/tbaFfQ2xf4E/42m4+ay vmgnh5bDjILuNL2WzGN1tQ6/LSzFFMavkBSSqgohhpG3cl4wXUz7byh/nhHYjqJK2T Ww9sSfvnahk3coMTrUD8kYVCZjr46G6PhHoABrl77fXPuLMjiSCbcDVinNhBKexhcX A/vBA/JeBiIfg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Linus Torvalds Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , Masahiro Yamada Subject: [PATCH 3/3] Kbuild: rename HAVE_CC_STACKPROTECTOR config variable Date: Thu, 14 Jun 2018 19:36:45 +0900 Message-Id: <1528972605-24264-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528972605-24264-1-git-send-email-yamada.masahiro@socionext.com> References: <1528972605-24264-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org HAVE_CC_STACKPROTECTOR should be selected by architectures with stack canary implementation. It is not about the compiler support. For the consistency with commit 050e9baa9dc9 ("Kbuild: rename CC_STACKPROTECTOR[_STRONG] config variables"), remove 'CC_' from the config symbol. I moved the 'select' lines to keep the alphabetical sorting. Signed-off-by: Masahiro Yamada --- Documentation/features/debug/stackprotector/arch-support.txt | 2 +- arch/Kconfig | 4 ++-- arch/arm/Kconfig | 2 +- arch/arm64/Kconfig | 2 +- arch/mips/Kconfig | 2 +- arch/sh/Kconfig | 2 +- arch/x86/Kconfig | 2 +- arch/xtensa/Kconfig | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/Documentation/features/debug/stackprotector/arch-support.txt b/Documentation/features/debug/stackprotector/arch-support.txt index 74b89a9..954ac1c 100644 --- a/Documentation/features/debug/stackprotector/arch-support.txt +++ b/Documentation/features/debug/stackprotector/arch-support.txt @@ -1,6 +1,6 @@ # # Feature name: stackprotector -# Kconfig: HAVE_CC_STACKPROTECTOR +# Kconfig: HAVE_STACKPROTECTOR # description: arch supports compiler driven stack overflow protection # ----------------------- diff --git a/arch/Kconfig b/arch/Kconfig index c302b3d..47b235d 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -549,7 +549,7 @@ config GCC_PLUGIN_RANDSTRUCT_PERFORMANCE in structures. This reduces the performance hit of RANDSTRUCT at the cost of weakened randomization. -config HAVE_CC_STACKPROTECTOR +config HAVE_STACKPROTECTOR bool help An arch should select this symbol if: @@ -560,7 +560,7 @@ config CC_HAS_STACKPROTECTOR_NONE config STACKPROTECTOR bool "Stack Protector buffer overflow detection" - depends on HAVE_CC_STACKPROTECTOR + depends on HAVE_STACKPROTECTOR depends on $(cc-option,-fstack-protector) default y help diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2a78bde..0be4397 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -57,7 +57,6 @@ config ARM select HAVE_ARCH_TRACEHOOK select HAVE_ARM_SMCCC if CPU_V7 select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32 - select HAVE_CC_STACKPROTECTOR select HAVE_CONTEXT_TRACKING select HAVE_C_RECORDMCOUNT select HAVE_DEBUG_KMEMLEAK @@ -92,6 +91,7 @@ config ARM select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE) select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RSEQ + select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select HAVE_UID16 select HAVE_VIRT_CPU_ACCOUNTING_GEN diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 14f204c..42c090c 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -103,7 +103,6 @@ config ARM64 select HAVE_ARM_SMCCC select HAVE_EBPF_JIT select HAVE_C_RECORDMCOUNT - select HAVE_CC_STACKPROTECTOR select HAVE_CMPXCHG_DOUBLE select HAVE_CMPXCHG_LOCAL select HAVE_CONTEXT_TRACKING @@ -128,6 +127,7 @@ config ARM64 select HAVE_PERF_USER_STACK_DUMP select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RCU_TABLE_FREE + select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select HAVE_KPROBES select HAVE_KRETPROBES diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index fe98e45..3f9deec 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -41,7 +41,6 @@ config MIPS select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS) select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS) - select HAVE_CC_STACKPROTECTOR select HAVE_CONTEXT_TRACKING select HAVE_COPY_THREAD_TLS select HAVE_C_RECORDMCOUNT @@ -66,6 +65,7 @@ config MIPS select HAVE_OPROFILE select HAVE_PERF_EVENTS select HAVE_REGS_AND_STACK_ACCESS_API + select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP select IRQ_FORCED_THREADING diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 4d61a08..4bedd1c 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -77,7 +77,7 @@ config SUPERH32 select PERF_EVENTS select ARCH_HIBERNATION_POSSIBLE if MMU select SPARSE_IRQ - select HAVE_CC_STACKPROTECTOR + select HAVE_STACKPROTECTOR config SUPERH64 def_bool "$(ARCH)" = "sh64" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d6c6ee6..f1dbb4e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -130,7 +130,6 @@ config X86 select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64 select HAVE_ARCH_VMAP_STACK if X86_64 select HAVE_ARCH_WITHIN_STACK_FRAMES - select HAVE_CC_STACKPROTECTOR if CC_HAS_SANE_STACKPROTECTOR select HAVE_CMPXCHG_DOUBLE select HAVE_CMPXCHG_LOCAL select HAVE_CONTEXT_TRACKING if X86_64 @@ -182,6 +181,7 @@ config X86 select HAVE_RCU_TABLE_FREE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RELIABLE_STACKTRACE if X86_64 && UNWINDER_FRAME_POINTER && STACK_VALIDATION + select HAVE_STACKPROTECTOR if CC_HAS_SANE_STACKPROTECTOR select HAVE_STACK_VALIDATION if X86_64 select HAVE_RSEQ select HAVE_SYSCALL_TRACEPOINTS diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 17df3322..d575e87 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -17,7 +17,6 @@ config XTENSA select GENERIC_SCHED_CLOCK select GENERIC_STRNCPY_FROM_USER if KASAN select HAVE_ARCH_KASAN if MMU - select HAVE_CC_STACKPROTECTOR select HAVE_DEBUG_KMEMLEAK select HAVE_DMA_CONTIGUOUS select HAVE_EXIT_THREAD @@ -28,6 +27,7 @@ config XTENSA select HAVE_MEMBLOCK select HAVE_OPROFILE select HAVE_PERF_EVENTS + select HAVE_STACKPROTECTOR select IRQ_DOMAIN select MODULES_USE_ELF_RELA select NO_BOOTMEM