kcov: enable retguard

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

kcov: enable retguard

Anton Lindqvist-2
Hi,
The problems caused by enabling both kcov and retguard was due to the
increased kernel size. Now that NKL2_KIMG_ENTRIES has been bumped on
amd64, it's no longer a problem.

Comments? OK?

Index: arch/amd64/conf/Makefile.amd64
===================================================================
RCS file: /cvs/src/sys/arch/amd64/conf/Makefile.amd64,v
retrieving revision 1.107
diff -u -p -r1.107 Makefile.amd64
--- arch/amd64/conf/Makefile.amd64 30 Dec 2018 23:08:05 -0000 1.107
+++ arch/amd64/conf/Makefile.amd64 7 Jan 2019 19:25:07 -0000
@@ -95,7 +95,6 @@ LINKFLAGS+= -S
 .endif
 
 .if ${SYSTEM_OBJ:Mkcov.o} && ${COMPILER_VERSION:Mclang}
-CMACHFLAGS+= -fno-ret-protector
 PROF= -fsanitize-coverage=trace-pc
 .endif

Reply | Threaded
Open this post in threaded view
|

Re: kcov: enable retguard

Theo de Raadt-2
That's great!

> Hi,
> The problems caused by enabling both kcov and retguard was due to the
> increased kernel size. Now that NKL2_KIMG_ENTRIES has been bumped on
> amd64, it's no longer a problem.
>
> Comments? OK?
>
> Index: arch/amd64/conf/Makefile.amd64
> ===================================================================
> RCS file: /cvs/src/sys/arch/amd64/conf/Makefile.amd64,v
> retrieving revision 1.107
> diff -u -p -r1.107 Makefile.amd64
> --- arch/amd64/conf/Makefile.amd64 30 Dec 2018 23:08:05 -0000 1.107
> +++ arch/amd64/conf/Makefile.amd64 7 Jan 2019 19:25:07 -0000
> @@ -95,7 +95,6 @@ LINKFLAGS+= -S
>  .endif
>  
>  .if ${SYSTEM_OBJ:Mkcov.o} && ${COMPILER_VERSION:Mclang}
> -CMACHFLAGS+= -fno-ret-protector
>  PROF= -fsanitize-coverage=trace-pc
>  .endif
>