1 files changed, 24 insertions, 3 deletions

diff --git a/net/core/filter.c b/net/core/filter.c
index 907efd27ec7..3d92ebb7fbc 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -167,6 +167,14 @@ unsigned int sk_run_filter(const struct sk_buff *skb,
                 case BPF_S_ALU_DIV_K:
                         A = reciprocal_divide(A, K);
                         continue;
+                case BPF_S_ALU_MOD_X:
+                        if (X == 0)
+                                return 0;
+                        A %= X;
+                        continue;
+                case BPF_S_ALU_MOD_K:
+                        A %= K;
+                        continue;
                 case BPF_S_ALU_AND_X:
                         A &= X;
                         continue;
@@ -179,6 +187,13 @@ unsigned int sk_run_filter(const struct sk_buff *skb,
                 case BPF_S_ALU_OR_K:
                         A |= K;
                         continue;
+                case BPF_S_ANC_ALU_XOR_X:
+                case BPF_S_ALU_XOR_X:
+                        A ^= X;
+                        continue;
+                case BPF_S_ALU_XOR_K:
+                        A ^= K;
+                        continue;
                 case BPF_S_ALU_LSH_X:
                         A <<= X;
                         continue;
@@ -326,9 +341,6 @@ load_b:
                 case BPF_S_ANC_CPU:
                         A = raw_smp_processor_id();
                         continue;
-                case BPF_S_ANC_ALU_XOR_X:
-                        A ^= X;
-                        continue;
                 case BPF_S_ANC_NLATTR: {
                         struct nlattr *nla;
 
@@ -469,10 +481,14 @@ int sk_chk_filter(struct sock_filter *filter, unsigned int flen)
                 [BPF_ALU|BPF_MUL|BPF_K]  = BPF_S_ALU_MUL_K,
                 [BPF_ALU|BPF_MUL|BPF_X]  = BPF_S_ALU_MUL_X,
                 [BPF_ALU|BPF_DIV|BPF_X]  = BPF_S_ALU_DIV_X,
+                [BPF_ALU|BPF_MOD|BPF_K]  = BPF_S_ALU_MOD_K,
+                [BPF_ALU|BPF_MOD|BPF_X]  = BPF_S_ALU_MOD_X,
                 [BPF_ALU|BPF_AND|BPF_K]  = BPF_S_ALU_AND_K,
                 [BPF_ALU|BPF_AND|BPF_X]  = BPF_S_ALU_AND_X,
                 [BPF_ALU|BPF_OR|BPF_K]   = BPF_S_ALU_OR_K,
                 [BPF_ALU|BPF_OR|BPF_X]   = BPF_S_ALU_OR_X,
+                [BPF_ALU|BPF_XOR|BPF_K]  = BPF_S_ALU_XOR_K,
+                [BPF_ALU|BPF_XOR|BPF_X]  = BPF_S_ALU_XOR_X,
                 [BPF_ALU|BPF_LSH|BPF_K]  = BPF_S_ALU_LSH_K,
                 [BPF_ALU|BPF_LSH|BPF_X]  = BPF_S_ALU_LSH_X,
                 [BPF_ALU|BPF_RSH|BPF_K]  = BPF_S_ALU_RSH_K,
@@ -531,6 +547,11 @@ int sk_chk_filter(struct sock_filter *filter, unsigned int flen)
                                 return -EINVAL;
                         ftest->k = reciprocal_value(ftest->k);
                         break;
+                case BPF_S_ALU_MOD_K:
+                        /* check for division by zero */
+                        if (ftest->k == 0)
+                                return -EINVAL;
+                        break;
                 case BPF_S_LD_MEM:
                 case BPF_S_LDX_MEM:
                 case BPF_S_ST: