summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorNicolas Schichan <nschichan@freebox.fr>2013-03-15 18:02:00 +0100
committerJames Morris <james.l.morris@oracle.com>2013-03-26 11:07:19 +1100
commitd13274794ad28d90ac81643d3d1d18338d948764 (patch)
tree7f438186a7f464d641d6e7efc85eb8837f275144 /kernel
parent505f14f7b8d446b8e4bc2a6cfc723afbbb365f65 (diff)
downloadop-kernel-dev-d13274794ad28d90ac81643d3d1d18338d948764.zip
op-kernel-dev-d13274794ad28d90ac81643d3d1d18338d948764.tar.gz
seccomp: allow BPF_XOR based ALU instructions.
Allow BPF_XOR based ALU instructions. Signed-off-by: Nicolas Schichan <nschichan@freebox.fr> Acked-by: Kees Cook <keescook@chromium.org> Acked-by: Will Drewry <wad@chromium.org> Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/seccomp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index 5af44b5..b7a1004 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -160,6 +160,8 @@ static int seccomp_check_filter(struct sock_filter *filter, unsigned int flen)
case BPF_S_ALU_AND_X:
case BPF_S_ALU_OR_K:
case BPF_S_ALU_OR_X:
+ case BPF_S_ALU_XOR_K:
+ case BPF_S_ALU_XOR_X:
case BPF_S_ALU_LSH_K:
case BPF_S_ALU_LSH_X:
case BPF_S_ALU_RSH_K:
OpenPOWER on IntegriCloud