summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2019-04-02 11:00:22 +0000
committerderaadt <deraadt@openbsd.org>2019-04-02 11:00:22 +0000
commitc51de0953ebc6eb4fd13a84f0dbc7ef350423beb (patch)
treecc59f2f7cd473135aeba5e3c974bf3b5507f5cb1
parentcall pf_pkt_addr_changed on input (diff)
downloadwireguard-openbsd-c51de0953ebc6eb4fd13a84f0dbc7ef350423beb.tar.xz
wireguard-openbsd-c51de0953ebc6eb4fd13a84f0dbc7ef350423beb.zip
retguard has now replaced the stack protector on clang architectures,
the kernel does not need a __stack_smash_handler function. WARNING: You need a fairly new clang, approximately > March 31. with mortimer
-rw-r--r--sys/kern/kern_xxx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 99f2dcdb3e6..3a8826bf3c0 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_xxx.c,v 1.35 2018/03/08 22:04:18 bluhm Exp $ */
+/* $OpenBSD: kern_xxx.c,v 1.36 2019/04/02 11:00:22 deraadt Exp $ */
/* $NetBSD: kern_xxx.c,v 1.32 1996/04/22 01:38:41 christos Exp $ */
/*
@@ -75,7 +75,7 @@ reboot(int howto)
/* NOTREACHED */
}
-#if !defined(NO_PROPOLICE)
+#if !defined(NO_PROPOLICE) && !defined(_RET_PROTECTOR)
void __stack_smash_handler(char [], int __attribute__((unused)));
void