The patch random_timestamp.diff is incompatible with grsecurity-3.1-4.1.3-201507251419.patch:
- Code: Select all
root ~> patch -p1 <../patch413/random_timestamp.diff
patching file grsecurity/Kconfig
Hunk #1 succeeded at 944 with fuzz 2 (offset 19 lines).
patching file grsecurity/grsec_init.c
Hunk #1 FAILED at 7.
1 out of 1 hunk FAILED -- saving rejects to file grsecurity/grsec_init.c.rej
patching file include/net/sock.h
Hunk #1 succeeded at 2248 (offset -48 lines).
patching file include/net/tcp.h
Hunk #1 succeeded at 673 with fuzz 2 (offset -11 lines).
patching file net/core/dev.c
Hunk #1 succeeded at 7457 (offset 471 lines).
- Code: Select all
root ~> cat grsecurity/grsec_init.c.rej
--- grsecurity/grsec_init.c
+++ grsecurity/grsec_init.c
@@ -7,6 +7,11 @@
#include <linux/percpu.h>
#include <linux/module.h>
+#ifdef CONFIG_GRKERNSEC_RANDOM_TIMESTAMPS
+__u32 random_timestamp_base __latent_entropy;
+EXPORT_SYMBOL_GPL(random_timestamp_base);
+#endif
+
int grsec_enable_ptrace_readexec;
int grsec_enable_setxid;
int grsec_enable_symlinkown;
Cheers