mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-26 05:34:13 +08:00
lkdtm: silence warnings about function declarations
When building under W=1, the lack of lkdtm.h in lkdtm_usercopy.c and lkdtm_rodata.c was discovered. This fixes the issue and consolidates the common header and the pr_fmt macro for simplicity and regularity across each test source file. Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
parent
2b271cb720
commit
6d2e91a662
@ -1,6 +1,10 @@
|
||||
#ifndef __LKDTM_H
|
||||
#define __LKDTM_H
|
||||
|
||||
#define pr_fmt(fmt) "lkdtm: " fmt
|
||||
|
||||
#include <linux/kernel.h>
|
||||
|
||||
/* lkdtm_bugs.c */
|
||||
void __init lkdtm_bugs_init(int *recur_param);
|
||||
void lkdtm_PANIC(void);
|
||||
@ -53,5 +57,4 @@ void lkdtm_USERCOPY_STACK_FRAME_FROM(void);
|
||||
void lkdtm_USERCOPY_STACK_BEYOND(void);
|
||||
void lkdtm_USERCOPY_KERNEL(void);
|
||||
|
||||
|
||||
#endif
|
||||
|
@ -4,12 +4,8 @@
|
||||
* lockups) along with other things that don't fit well into existing LKDTM
|
||||
* test source files.
|
||||
*/
|
||||
#define pr_fmt(fmt) "lkdtm: " fmt
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/sched.h>
|
||||
|
||||
#include "lkdtm.h"
|
||||
#include <linux/sched.h>
|
||||
|
||||
/*
|
||||
* Make sure our attempts to over run the kernel stack doesn't trigger
|
||||
|
@ -30,9 +30,7 @@
|
||||
*
|
||||
* See Documentation/fault-injection/provoke-crashes.txt for instructions
|
||||
*/
|
||||
#define pr_fmt(fmt) "lkdtm: " fmt
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include "lkdtm.h"
|
||||
#include <linux/fs.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/buffer_head.h>
|
||||
@ -49,8 +47,6 @@
|
||||
#include <linux/ide.h>
|
||||
#endif
|
||||
|
||||
#include "lkdtm.h"
|
||||
|
||||
#define DEFAULT_COUNT 10
|
||||
|
||||
static int lkdtm_debugfs_open(struct inode *inode, struct file *file);
|
||||
|
@ -2,12 +2,8 @@
|
||||
* This is for all the tests relating directly to heap memory, including
|
||||
* page allocation and slab allocations.
|
||||
*/
|
||||
#define pr_fmt(fmt) "lkdtm: " fmt
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include "lkdtm.h"
|
||||
#include <linux/slab.h>
|
||||
|
||||
/*
|
||||
* This tries to stay within the next largest power-of-2 kmalloc cache
|
||||
|
@ -3,17 +3,13 @@
|
||||
* permissions: non-executable regions, non-writable regions, and
|
||||
* even non-readable regions.
|
||||
*/
|
||||
#define pr_fmt(fmt) "lkdtm: " fmt
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include "lkdtm.h"
|
||||
#include <linux/slab.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/mman.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <asm/cacheflush.h>
|
||||
|
||||
#include "lkdtm.h"
|
||||
|
||||
/* Whether or not to fill the target memory area with do_nothing(). */
|
||||
#define CODE_WRITE true
|
||||
#define CODE_AS_IS false
|
||||
|
@ -2,7 +2,7 @@
|
||||
* This includes functions that are meant to live entirely in .rodata
|
||||
* (via objcopy tricks), to validate the non-executability of .rodata.
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include "lkdtm.h"
|
||||
|
||||
void lkdtm_rodata_do_nothing(void)
|
||||
{
|
||||
|
@ -2,9 +2,7 @@
|
||||
* This is for all the tests related to copy_to_user() and copy_from_user()
|
||||
* hardening.
|
||||
*/
|
||||
#define pr_fmt(fmt) "lkdtm: " fmt
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include "lkdtm.h"
|
||||
#include <linux/slab.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/mman.h>
|
||||
|
Loading…
Reference in New Issue
Block a user