From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 12 Jun 2014 21:06:18 +0000 (-0700)
Subject: 3.14-stable patches
X-Git-Tag: v3.4.94~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6572f4c57199d89bf1a627dfdea2c9ec7ef0893;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	mips-asm-thread_info-add-_tif_seccomp-flag.patch
---

diff --git a/queue-3.14/mips-asm-thread_info-add-_tif_seccomp-flag.patch b/queue-3.14/mips-asm-thread_info-add-_tif_seccomp-flag.patch
new file mode 100644
index 00000000000..8be14d1a821
--- /dev/null
+++ b/queue-3.14/mips-asm-thread_info-add-_tif_seccomp-flag.patch
@@ -0,0 +1,37 @@
+From 137f7df8cead00688524c82360930845396b8a21 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Wed, 22 Jan 2014 14:40:00 +0000
+Subject: MIPS: asm: thread_info: Add _TIF_SECCOMP flag
+
+From: Markos Chandras <markos.chandras@imgtec.com>
+
+commit 137f7df8cead00688524c82360930845396b8a21 upstream.
+
+Add _TIF_SECCOMP flag to _TIF_WORK_SYSCALL_ENTRY to indicate
+that the system call needs to be checked against a seccomp filter.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+Reviewed-by: Paul Burton <paul.burton@imgtec.com>
+Reviewed-by: James Hogan <james.hogan@imgtec.com>
+Cc: linux-mips@linux-mips.org
+Patchwork: https://patchwork.linux-mips.org/patch/6405/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Cc: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/include/asm/thread_info.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/include/asm/thread_info.h
++++ b/arch/mips/include/asm/thread_info.h
+@@ -136,7 +136,8 @@ static inline struct thread_info *curren
+ #define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)
+ 
+ #define _TIF_WORK_SYSCALL_ENTRY	(_TIF_NOHZ | _TIF_SYSCALL_TRACE |	\
+-				 _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
++				 _TIF_SYSCALL_AUDIT | \
++				 _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
+ 
+ /* work to do in syscall_trace_leave() */
+ #define _TIF_WORK_SYSCALL_EXIT	(_TIF_NOHZ | _TIF_SYSCALL_TRACE |	\
diff --git a/queue-3.14/series b/queue-3.14/series
index ba2a88fca34..86222ed0c98 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -1,2 +1,3 @@
 fs-userns-change-inode_capable-to-capable_wrt_inode_uidgid.patch
 netfilter-ipv4-defrag-set-local_df-flag-on-defragmented-skb.patch
+mips-asm-thread_info-add-_tif_seccomp-flag.patch