projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lkdtm: Add kernel version to failure hints
[linux-2.6-microblaze.git]
/
drivers
/
misc
/
lkdtm
/
lkdtm.h
diff --git
a/drivers/misc/lkdtm/lkdtm.h
b/drivers/misc/lkdtm/lkdtm.h
index
6a30b60
..
d7d64d9
100644
(file)
--- a/
drivers/misc/lkdtm/lkdtm.h
+++ b/
drivers/misc/lkdtm/lkdtm.h
@@
-5,13
+5,17
@@
#define pr_fmt(fmt) "lkdtm: " fmt
#include <linux/kernel.h>
#define pr_fmt(fmt) "lkdtm: " fmt
#include <linux/kernel.h>
+#include <generated/compile.h>
+#include <generated/utsrelease.h>
+
+#define LKDTM_KERNEL "kernel (" UTS_RELEASE " " UTS_MACHINE ")"
#define pr_expected_config(kconfig) \
{ \
if (IS_ENABLED(kconfig)) \
#define pr_expected_config(kconfig) \
{ \
if (IS_ENABLED(kconfig)) \
- pr_err("Unexpected! This
kernel
was built with " #kconfig "=y\n"); \
+ pr_err("Unexpected! This
" LKDTM_KERNEL "
was built with " #kconfig "=y\n"); \
else \
else \
- pr_warn("This is probably expected, since this
kernel
was built *without* " #kconfig "=y\n"); \
+ pr_warn("This is probably expected, since this
" LKDTM_KERNEL "
was built *without* " #kconfig "=y\n"); \
}
#ifndef MODULE
}
#ifndef MODULE
@@
-21,24
+25,24
@@
int lkdtm_check_bool_cmdline(const char *param);
if (IS_ENABLED(kconfig)) { \
switch (lkdtm_check_bool_cmdline(param)) { \
case 0: \
if (IS_ENABLED(kconfig)) { \
switch (lkdtm_check_bool_cmdline(param)) { \
case 0: \
- pr_warn("This is probably expected, since this
kernel
was built with " #kconfig "=y but booted with '" param "=N'\n"); \
+ pr_warn("This is probably expected, since this
" LKDTM_KERNEL "
was built with " #kconfig "=y but booted with '" param "=N'\n"); \
break; \
case 1: \
break; \
case 1: \
- pr_err("Unexpected! This
kernel
was built with " #kconfig "=y and booted with '" param "=Y'\n"); \
+ pr_err("Unexpected! This
" LKDTM_KERNEL "
was built with " #kconfig "=y and booted with '" param "=Y'\n"); \
break; \
default: \
break; \
default: \
- pr_err("Unexpected! This
kernel
was built with " #kconfig "=y (and booted without '" param "' specified)\n"); \
+ pr_err("Unexpected! This
" LKDTM_KERNEL "
was built with " #kconfig "=y (and booted without '" param "' specified)\n"); \
} \
} else { \
switch (lkdtm_check_bool_cmdline(param)) { \
case 0: \
} \
} else { \
switch (lkdtm_check_bool_cmdline(param)) { \
case 0: \
- pr_warn("This is probably expected, as
kernel
was built *without* " #kconfig "=y and booted with '" param "=N'\n"); \
+ pr_warn("This is probably expected, as
this " LKDTM_KERNEL "
was built *without* " #kconfig "=y and booted with '" param "=N'\n"); \
break; \
case 1: \
break; \
case 1: \
- pr_err("Unexpected! This
kernel
was built *without* " #kconfig "=y but booted with '" param "=Y'\n"); \
+ pr_err("Unexpected! This
" LKDTM_KERNEL "
was built *without* " #kconfig "=y but booted with '" param "=Y'\n"); \
break; \
default: \
break; \
default: \
- pr_err("This is probably expected, since this
kernel
was built *without* " #kconfig "=y (and booted without '" param "' specified)\n"); \
+ pr_err("This is probably expected, since this
" LKDTM_KERNEL "
was built *without* " #kconfig "=y (and booted without '" param "' specified)\n"); \
break; \
} \
} \
break; \
} \
} \
@@
-74,8
+78,6
@@
void lkdtm_STACK_GUARD_PAGE_TRAILING(void);
void lkdtm_UNSET_SMEP(void);
void lkdtm_DOUBLE_FAULT(void);
void lkdtm_CORRUPT_PAC(void);
void lkdtm_UNSET_SMEP(void);
void lkdtm_DOUBLE_FAULT(void);
void lkdtm_CORRUPT_PAC(void);
-void lkdtm_FORTIFY_OBJECT(void);
-void lkdtm_FORTIFY_SUBOBJECT(void);
/* heap.c */
void __init lkdtm_heap_init(void);
/* heap.c */
void __init lkdtm_heap_init(void);
@@
-150,6
+152,8
@@
void lkdtm_STACKLEAK_ERASING(void);
void lkdtm_CFI_FORWARD_PROTO(void);
/* fortify.c */
void lkdtm_CFI_FORWARD_PROTO(void);
/* fortify.c */
+void lkdtm_FORTIFIED_OBJECT(void);
+void lkdtm_FORTIFIED_SUBOBJECT(void);
void lkdtm_FORTIFIED_STRSCPY(void);
/* powerpc.c */
void lkdtm_FORTIFIED_STRSCPY(void);
/* powerpc.c */