Skip to content

Commit

Permalink
seccomp: kill the seccomp_t typedef
Browse files Browse the repository at this point in the history
Replaces the seccomp_t typedef with struct seccomp to match modern
kernel style.

Signed-off-by: Will Drewry <wad@chromium.org>
Reviewed-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Acked-by: Eric Paris <eparis@redhat.com>

v18: rebase
...
v14: rebase/nochanges
v13: rebase on to 88ebdda
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: James Morris <james.l.morris@oracle.com>
  • Loading branch information
Will Drewry authored and James Morris committed Apr 14, 2012
1 parent 0c5fe1b commit 932eceb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion include/linux/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 6 additions & 4 deletions include/linux/seccomp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
}
Expand All @@ -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)

Expand All @@ -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;
}
Expand Down

0 comments on commit 932eceb

Please sign in to comment.