aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/999-seccomp_log.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2015-03-28 18:17:46 +0000
committerFlorian Fainelli <florian@openwrt.org>2015-03-28 18:17:46 +0000
commit5dbf2d51cd341da555cad8a12a30f0c7bc8c180a (patch)
treefbcde669487d033038d2cf71e758fab9be527204 /target/linux/generic/patches-3.18/999-seccomp_log.patch
parent0af24edcefa7019105bca8860e6e0f0a65c93178 (diff)
downloadmaster-187ad058-5dbf2d51cd341da555cad8a12a30f0c7bc8c180a.tar.gz
master-187ad058-5dbf2d51cd341da555cad8a12a30f0c7bc8c180a.tar.bz2
master-187ad058-5dbf2d51cd341da555cad8a12a30f0c7bc8c180a.zip
kernel: refresh 3.18 patches
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45093 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/999-seccomp_log.patch')
-rw-r--r--target/linux/generic/patches-3.18/999-seccomp_log.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/999-seccomp_log.patch b/target/linux/generic/patches-3.18/999-seccomp_log.patch
index 1f90b32e93..1db6b18d4e 100644
--- a/target/linux/generic/patches-3.18/999-seccomp_log.patch
+++ b/target/linux/generic/patches-3.18/999-seccomp_log.patch
@@ -1,6 +1,6 @@
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
-@@ -614,6 +614,7 @@
+@@ -614,6 +614,7 @@ int __secure_computing(void)
#ifdef CONFIG_SECCOMP_FILTER
static u32 __seccomp_phase1_filter(int this_syscall, struct seccomp_data *sd)
{
@@ -8,7 +8,7 @@
u32 filter_ret, action;
int data;
-@@ -644,6 +645,13 @@
+@@ -644,6 +645,13 @@ static u32 __seccomp_phase1_filter(int t
case SECCOMP_RET_TRACE:
return filter_ret; /* Save the rest for phase 2. */