Commit 932ecebb authored by Will Drewry's avatar Will Drewry Committed by James Morris
Browse files

seccomp: kill the seccomp_t typedef 



Replaces the seccomp_t typedef with struct seccomp to match modern
kernel style.

Signed-off-by: default avatarWill Drewry <wad@chromium.org>
Reviewed-by: default avatarJames Morris <jmorris@namei.org>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Acked-by: default avatarEric Paris <eparis@redhat.com>

v18: rebase
...
v14: rebase/nochanges
v13: rebase on to 88ebdda6
v12: rebase on to linux-next
v8-v11: no changes
v7: struct seccomp_struct -> struct seccomp
v6: original inclusion in this series.
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 0c5fe1b4

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ struct task_struct { 
	uid_t loginuid;

	unsigned int sessionid;

#endif

	seccomp_t seccomp;

	struct seccomp seccomp;



/* Thread group tracking */

   	u32 parent_exec_id;

include/linux/seccomp.h

+6 −4
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ 
#include <linux/thread_info.h>

#include <asm/seccomp.h>



typedef struct { int mode; } seccomp_t;

struct seccomp {

	int mode;

};



extern void __secure_computing(int);

static inline void secure_computing(int this_syscall)
@@ -19,7 +21,7 @@ static inline void secure_computing(int this_syscall) 
extern long prctl_get_seccomp(void);

extern long prctl_set_seccomp(unsigned long);



static inline int seccomp_mode(seccomp_t *s)

static inline int seccomp_mode(struct seccomp *s)

{

	return s->mode;

}
@@ -28,7 +30,7 @@ static inline int seccomp_mode(seccomp_t *s) 


#include <linux/errno.h>



typedef struct { } seccomp_t;

struct seccomp { };



#define secure_computing(x) do { } while (0)
@@ -42,7 +44,7 @@ static inline long prctl_set_seccomp(unsigned long arg2) 
	return -EINVAL;

}



static inline int seccomp_mode(seccomp_t *s)

static inline int seccomp_mode(struct seccomp *s)

{

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE