Commit f001e47f authored by David Woodhouse's avatar David Woodhouse
Browse files

Sanitise linux/audit.h for userspace consumption, split elf-em.h from elf.h 



Don't include <linux/sched.h> outside __KERNEL__, and split the EM_xxx
definitions out of elf.h into elf-em.h so that audit.h can include just
that and not pollute the namespace any further than it needs to.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 62c4f0a2

include/linux/audit.h

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ 
#ifndef _LINUX_AUDIT_H_

#define _LINUX_AUDIT_H_



#include <linux/sched.h>

#include <linux/elf.h>

#include <linux/elf-em.h>



/* The netlink messages for the audit system is divided into blocks:

 * 1000 - 1099 are for commanding the audit system
@@ -267,6 +266,7 @@ struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ 
};



#ifdef __KERNEL__

#include <linux/sched.h>



struct audit_sig_info {

	uid_t		uid;

include/linux/elf-em.h

0 → 100644
+44 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_ELF_EM_H

#define _LINUX_ELF_EM_H



/* These constants define the various ELF target machines */

#define EM_NONE		0

#define EM_M32		1

#define EM_SPARC	2

#define EM_386		3

#define EM_68K		4

#define EM_88K		5

#define EM_486		6	/* Perhaps disused */

#define EM_860		7

#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */

#define EM_MIPS_RS4_BE	10	/* MIPS R4000 big-endian */

#define EM_PARISC	15	/* HPPA */

#define EM_SPARC32PLUS	18	/* Sun's "v8plus" */

#define EM_PPC		20	/* PowerPC */

#define EM_PPC64	21       /* PowerPC64 */

#define EM_SH		42	/* SuperH */

#define EM_SPARCV9	43	/* SPARC v9 64-bit */

#define EM_IA_64	50	/* HP/Intel IA-64 */

#define EM_X86_64	62	/* AMD x86-64 */

#define EM_S390		22	/* IBM S/390 */

#define EM_CRIS		76	/* Axis Communications 32-bit embedded processor */

#define EM_V850		87	/* NEC v850 */

#define EM_M32R		88	/* Renesas M32R */

#define EM_H8_300	46	/* Renesas H8/300,300H,H8S */

#define EM_FRV		0x5441	/* Fujitsu FR-V */



/*

 * This is an interim value that we will use until the committee comes

 * up with a final number.

 */

#define EM_ALPHA	0x9026



/* Bogus old v850 magic number, used by old tools. */

#define EM_CYGNUS_V850	0x9080

/* Bogus old m32r magic number, used by old tools. */

#define EM_CYGNUS_M32R	0x9041

/* This is the old interim value for S/390 architecture */

#define EM_S390_OLD	0xA390





#endif /* _LINUX_ELF_EM_H */

include/linux/elf.h

+1 −58
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/types.h>

#include <linux/auxvec.h>

#include <linux/elf-em.h>

#include <asm/elf.h>



#ifndef elf_read_implies_exec
@@ -55,64 +56,6 @@ typedef __s64 Elf64_Sxword; 
#define ET_LOPROC 0xff00

#define ET_HIPROC 0xffff



/* These constants define the various ELF target machines */

#define EM_NONE  0

#define EM_M32   1

#define EM_SPARC 2

#define EM_386   3

#define EM_68K   4

#define EM_88K   5

#define EM_486   6   /* Perhaps disused */

#define EM_860   7



#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */



#define EM_MIPS_RS4_BE 10	/* MIPS R4000 big-endian */



#define EM_PARISC      15	/* HPPA */



#define EM_SPARC32PLUS 18	/* Sun's "v8plus" */



#define EM_PPC	       20	/* PowerPC */

#define EM_PPC64       21       /* PowerPC64 */



#define EM_SH	       42	/* SuperH */



#define EM_SPARCV9     43	/* SPARC v9 64-bit */



#define EM_IA_64	50	/* HP/Intel IA-64 */



#define EM_X86_64	62	/* AMD x86-64 */



#define EM_S390		22	/* IBM S/390 */



#define EM_CRIS         76      /* Axis Communications 32-bit embedded processor */



#define EM_V850		87	/* NEC v850 */



#define EM_M32R		88	/* Renesas M32R */



#define EM_H8_300       46      /* Renesas H8/300,300H,H8S */



/*

 * This is an interim value that we will use until the committee comes

 * up with a final number.

 */

#define EM_ALPHA	0x9026



/* Bogus old v850 magic number, used by old tools.  */

#define EM_CYGNUS_V850	0x9080



/* Bogus old m32r magic number, used by old tools.  */

#define EM_CYGNUS_M32R	0x9041



/*

 * This is the old interim value for S/390 architecture

 */

#define EM_S390_OLD     0xA390



#define EM_FRV		0x5441		/* Fujitsu FR-V */



/* This is the info that is needed to parse the dynamic section of the file */

#define DT_NULL		0

#define DT_NEEDED	1