diff options
Diffstat (limited to 'features/seccomp/seccomp-kill-the-seccomp_t-typedef.patch')
-rw-r--r-- | features/seccomp/seccomp-kill-the-seccomp_t-typedef.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/features/seccomp/seccomp-kill-the-seccomp_t-typedef.patch b/features/seccomp/seccomp-kill-the-seccomp_t-typedef.patch new file mode 100644 index 00000000..95ac5398 --- /dev/null +++ b/features/seccomp/seccomp-kill-the-seccomp_t-typedef.patch @@ -0,0 +1,88 @@ +From 1bed374c1210f2390a39e715243b3767f8958e3b Mon Sep 17 00:00:00 2001 +From: Will Drewry <wad@chromium.org> +Date: Thu, 12 Apr 2012 16:47:54 -0500 +Subject: [PATCH] seccomp: kill the seccomp_t typedef + +commit 932ecebb0405b9a41cd18946e6cff8a17d434e23 upstream. + +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 88ebdda6159ffc15699f204c33feb3e431bf9bdc +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> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +--- + include/linux/sched.h | 2 +- + include/linux/seccomp.h | 10 ++++++---- + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/include/linux/sched.h b/include/linux/sched.h +index ba60897..cad1502 100644 +--- a/include/linux/sched.h ++++ b/include/linux/sched.h +@@ -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; +diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h +index cc7a4e9..d61f27f 100644 +--- a/include/linux/seccomp.h ++++ b/include/linux/seccomp.h +@@ -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; + } +-- +1.7.9.1 + |