73 lines
3.7 KiB
Diff
73 lines
3.7 KiB
Diff
From 75c02a21f954574675020e1d76391b4896211fc7 Mon Sep 17 00:00:00 2001
|
|
From: Evangelos Foutras <evangelos@foutrelis.com>
|
|
Date: Sun, 24 Apr 2022 06:29:44 +0300
|
|
Subject: [PATCH] Enable -fstack-protector-strong by default
|
|
|
|
---
|
|
clang/lib/Driver/ToolChains/Linux.h | 5 +++++
|
|
clang/test/Driver/fsanitize.c | 6 +++---
|
|
clang/test/Driver/stack-protector.c | 4 ++--
|
|
3 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
|
|
index a5648d79d655..3c4546cb9204 100644
|
|
--- a/clang/lib/Driver/ToolChains/Linux.h
|
|
+++ b/clang/lib/Driver/ToolChains/Linux.h
|
|
@@ -10,6 +10,7 @@
|
|
#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_LINUX_H
|
|
|
|
#include "Gnu.h"
|
|
+#include "clang/Basic/LangOptions.h"
|
|
#include "clang/Driver/ToolChain.h"
|
|
|
|
namespace clang {
|
|
@@ -46,6 +47,10 @@ public:
|
|
IsAArch64OutlineAtomicsDefault(const llvm::opt::ArgList &Args) const override;
|
|
bool isPIEDefault(const llvm::opt::ArgList &Args) const override;
|
|
bool IsMathErrnoDefault() const override;
|
|
+ LangOptions::StackProtectorMode
|
|
+ GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
|
|
+ return LangOptions::SSPStrong;
|
|
+ }
|
|
SanitizerMask getSupportedSanitizers() const override;
|
|
void addProfileRTLibs(const llvm::opt::ArgList &Args,
|
|
llvm::opt::ArgStringList &CmdArgs) const override;
|
|
diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
|
|
index 17fce1981eea..a732d29b7688 100644
|
|
--- a/clang/test/Driver/fsanitize.c
|
|
+++ b/clang/test/Driver/fsanitize.c
|
|
@@ -666,12 +666,12 @@
|
|
// RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
|
|
// NOSP-NOT: "-fsanitize=safe-stack"
|
|
|
|
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
|
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
// RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
|
|
// RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
-// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
|
-// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
|
+// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
+// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
// RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
|
// NO-SP-NOT: stack-protector
|
|
// NO-SP: "-fsanitize=safe-stack"
|
|
diff --git a/clang/test/Driver/stack-protector.c b/clang/test/Driver/stack-protector.c
|
|
index a3e40b50eed8..dfffe0d6cf85 100644
|
|
--- a/clang/test/Driver/stack-protector.c
|
|
+++ b/clang/test/Driver/stack-protector.c
|
|
@@ -3,11 +3,11 @@
|
|
// NOSSP-NOT: "-stack-protector-buffer-size"
|
|
|
|
// RUN: %clang -target i386-unknown-linux -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP
|
|
-// SSP: "-stack-protector" "1"
|
|
+// SSP: "-stack-protector" "2"
|
|
// SSP-NOT: "-stack-protector-buffer-size"
|
|
|
|
// RUN: %clang -target i386-unknown-linux -fstack-protector --param ssp-buffer-size=16 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-BUF
|
|
-// SSP-BUF: "-stack-protector" "1"
|
|
+// SSP-BUF: "-stack-protector" "2"
|
|
// SSP-BUF: "-stack-protector-buffer-size" "16"
|
|
|
|
// RUN: %clang -target i386-pc-openbsd -### %s 2>&1 | FileCheck %s -check-prefix=OPENBSD
|