From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4E4819F411 for ; Thu, 23 Jan 2025 19:07:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737659281; cv=none; b=NHgxQwTpACRBhOwJ20lgWwBt4f9ka+UZKwPtwQBvQjNNzBJeP2wG9SOQKeGgyTfQp5qgk5nqQOrSgtOluUZFORhuJ1YqVIcarN0tl3Jq7b0+f4Du1x4SOMqOEL0ic8fkC0vzA7LrNoJP3jJSWex0m/xTuin9dYmWfMOIU6FfSkQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737659281; c=relaxed/simple; bh=6FrefWtnhT+pcoYN2zTzQW1S4RGvBE46M3lRKrE1ZGM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kLQqAbTcTzwtSIcszn00t32gEMbv/cvLM1wb1A3JDJzsK49eV7KOv5z5pH1dNM2hqtyzXJvFhgja2stft6r2vr3KqV+T6uo7lsetyoucnKUbCjFR2+OIMu4QiYxBoZnLCCpqII8y+ZZZjC1UFxeY0CX0/yhq88TcStxDtRNCLA0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Jkp2YgFy; arc=none smtp.client-ip=209.85.222.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Jkp2YgFy" Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-7b702c3c021so120886485a.3 for ; Thu, 23 Jan 2025 11:07:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737659277; x=1738264077; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZkczgK/MjIL0RoIyDooXI2VvDc+efThUvAqWRsXi4Pk=; b=Jkp2YgFyfXX10dQX2L/nAx1FoMA+S5bhb0R0hQvUDqZwgcv4e9/j4k03C1AGX9Bdl4 qa8Mhyj8c0BrCidLYZ6Wn9kOR4FFqLEhaBGBij9wD47/N1A2f+dzC3zM37kXH8P9DP1h tp3RQi5awet/O3Zjs7IuTqRGlCRbSS4yF38DhR5EUBHXpfq62lA7UymTU7qf931c98Zk v+3AYGiEtdEhZQk/7ttNhVFY5idWaPeFb6Mcldgv5Hg5wGIYqgTZwUanAeCNg4S3E3gH XPWQkiKTzOeuxH0kHeLpjzggO/1epGp52pORXEy6gPM4Voe25RMOJiZyosiqWg0IzJEr aXug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737659277; x=1738264077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZkczgK/MjIL0RoIyDooXI2VvDc+efThUvAqWRsXi4Pk=; b=l6r9f1mslKonlhbozPyyhZVWzgP+75cXgzqlC+KHYY07vWh2y2tFoe5qvoIQIlT4gg b/RsjsStuKFt45dkEQt6iF+3ltI5xraX8ZSe+c9SYG5rcLlRZIRDYnIbsv0bgDYQWGc8 pxza6zC7xhXtJz6VP8h8Kh1M2KM8fTdQ664//L61ZUnnlAbAZVuHBfgQPNUkYRtd3zJ4 nb0CQ6y3h6TI8S2oTKuaArmxrlGynXuO/m30PP6d4+/K9D0I7AdTOeN23RJLiIhPNjgq lR0FwAk6wQwAI9/W/hnnBpWpb4xXFznLuaOEIj+/L4x2FegDaeru152YvlWCzkXtXMI1 7ERw== X-Gm-Message-State: AOJu0YxnTLLJWp0Py5PojzcAsNIuKgEsjCLUq5uMqjHPu9pY78eaeS2H ubMfT+57kG/nQrA7joomC7BNtfK0gSTiN5wDZb/mzT0VS8qEN88877nR X-Gm-Gg: ASbGnctAdY2Hat2+tJNe8sd5EmEZjAT+JcyMTM4osn5kWkjfoR1We0YvLN+UJM0egyi YInXY2ph932pUjRqu/g7hhBtrKwOHs4xPMaNwye7xGHCcGkNj1+SLdppCyHTxzKkktxOzJgvF+I 54RUwFGKEQig5Hmh4UYtY1JquFR479s1TvC79aayB4gtFet66A3nRA76NXL3iALKlabs0ZPahgo F73FVjA3B1gLhkEr4l/2LHLyiySPc+pyO+Q8yGb7I0e4oy+iWMI5VOpJ+HKsw== X-Google-Smtp-Source: AGHT+IGnYNdFd2ZtvPRBAWWcT/qhjpzQeQkYh315R/ne5r/y2f7KFtXtfzS2hbo5ffS3F+2h/xlOTA== X-Received: by 2002:a05:620a:1902:b0:7b1:51df:117f with SMTP id af79cd13be357-7be6325c411mr4721141885a.56.1737659277514; Thu, 23 Jan 2025 11:07:57 -0800 (PST) Received: from citadel.lan ([2600:6c4a:4d3f:6d5c::1019]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46e66b880b6sm1768021cf.69.2025.01.23.11.07.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 11:07:57 -0800 (PST) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Ingo Molnar , "H . Peter Anvin" , Thomas Gleixner , Borislav Petkov , Ard Biesheuvel , Uros Bizjak , Brian Gerst Subject: [PATCH v6 02/15] x86/stackprotector: Remove stack protector test scripts Date: Thu, 23 Jan 2025 14:07:34 -0500 Message-ID: <20250123190747.745588-3-brgerst@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250123190747.745588-1-brgerst@gmail.com> References: <20250123190747.745588-1-brgerst@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit With GCC 8.1 now the minimum supported compiler for x86, these scripts are no longer needed. Signed-off-by: Brian Gerst Reviewed-by: Ard Biesheuvel Reviewed-by: Uros Bizjak --- arch/x86/Kconfig | 11 +---------- scripts/gcc-x86_32-has-stack-protector.sh | 8 -------- scripts/gcc-x86_64-has-stack-protector.sh | 4 ---- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100755 scripts/gcc-x86_32-has-stack-protector.sh delete mode 100755 scripts/gcc-x86_64-has-stack-protector.sh diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 27c21c9b6a70..bdfc6b078a1e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -283,7 +283,7 @@ config X86 select HAVE_FUNCTION_ARG_ACCESS_API select HAVE_SETUP_PER_CPU_AREA select HAVE_SOFTIRQ_ON_OWN_STACK - select HAVE_STACKPROTECTOR if CC_HAS_SANE_STACKPROTECTOR + select HAVE_STACKPROTECTOR select HAVE_STACK_VALIDATION if HAVE_OBJTOOL select HAVE_STATIC_CALL select HAVE_STATIC_CALL_INLINE if HAVE_OBJTOOL @@ -423,15 +423,6 @@ config PGTABLE_LEVELS default 3 if X86_PAE default 2 -config CC_HAS_SANE_STACKPROTECTOR - bool - default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) $(CLANG_FLAGS)) if 64BIT - default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC) $(CLANG_FLAGS)) - help - We have to make sure stack protector is unconditionally disabled if - the compiler produces broken code or if it does not let us control - the segment on 32-bit kernels. - menu "Processor type and features" config SMP diff --git a/scripts/gcc-x86_32-has-stack-protector.sh b/scripts/gcc-x86_32-has-stack-protector.sh deleted file mode 100755 index 9459ca4f0f11..000000000000 --- a/scripts/gcc-x86_32-has-stack-protector.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -# This requires GCC 8.1 or better. Specifically, we require -# -mstack-protector-guard-reg, added by -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81708 - -echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -m32 -O0 -fstack-protector -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard - -o - 2> /dev/null | grep -q "%fs" diff --git a/scripts/gcc-x86_64-has-stack-protector.sh b/scripts/gcc-x86_64-has-stack-protector.sh deleted file mode 100755 index f680bb01aeeb..000000000000 --- a/scripts/gcc-x86_64-has-stack-protector.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -m64 -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs" -- 2.47.1