Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[profile/ivi/kernel-x86-ivi.git] / net / core / filter.c

diff --git a/net/core/filter.c b/net/core/filter.c
index 47a5f05..a3eddb5 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -38,6 +38,7 @@
 #include <linux/filter.h>
 #include <linux/reciprocal_div.h>
 #include <linux/ratelimit.h>
+#include <linux/seccomp.h>
 
 /* No hurry in this branch
  *
@@ -355,6 +356,11 @@ load_b:
                                A = 0;
                        continue;
                }
+#ifdef CONFIG_SECCOMP_FILTER
+               case BPF_S_ANC_SECCOMP_LD_W:
+                       A = seccomp_bpf_load(fentry->k);
+                       continue;
+#endif
                default:
                        WARN_RATELIMIT(1, "Unknown code:%u jt:%u tf:%u k:%u\n",
                                       fentry->code, fentry->jt,