1 files changed, 30 insertions, 22 deletions
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 628b3970a49b..a5b223ef7131 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -933,32 +933,34 @@ EXPORT_SYMBOL_GPL(__bpf_call_base);
 #define BPF_INSN_MAP(INSN_2, INSN_3)            \
        /* 32 bit ALU operations. */            \
        /*   Register based. */                 \
-        INSN_3(ALU, ADD, X),                    \
+        INSN_3(ALU, ADD,  X),                   \
-        INSN_3(ALU, SUB, X),                    \
+        INSN_3(ALU, SUB,  X),                   \
-        INSN_3(ALU, AND, X),                    \
+        INSN_3(ALU, AND,  X),                   \
-        INSN_3(ALU, OR,  X),                    \
+        INSN_3(ALU, OR,   X),                   \
-        INSN_3(ALU, LSH, X),                    \
+        INSN_3(ALU, LSH,  X),                   \
-        INSN_3(ALU, RSH, X),                    \
+        INSN_3(ALU, RSH,  X),                   \
-        INSN_3(ALU, XOR, X),                    \
+        INSN_3(ALU, XOR,  X),                   \
-        INSN_3(ALU, MUL, X),                    \
+        INSN_3(ALU, MUL,  X),                   \
-        INSN_3(ALU, MOV, X),                    \
+        INSN_3(ALU, MOV,  X),                   \
-        INSN_3(ALU, DIV, X),                    \
+        INSN_3(ALU, ARSH, X),                   \
-        INSN_3(ALU, MOD, X),                    \
+        INSN_3(ALU, DIV,  X),                   \
+        INSN_3(ALU, MOD,  X),                   \
        INSN_2(ALU, NEG),                       \
        INSN_3(ALU, END, TO_BE),                \
        INSN_3(ALU, END, TO_LE),                \
        /*   Immediate based. */                \
-        INSN_3(ALU, ADD, K),                    \
+        INSN_3(ALU, ADD,  K),                   \
-        INSN_3(ALU, SUB, K),                    \
+        INSN_3(ALU, SUB,  K),                   \
-        INSN_3(ALU, AND, K),                    \
+        INSN_3(ALU, AND,  K),                   \
-        INSN_3(ALU, OR,  K),                    \
+        INSN_3(ALU, OR,   K),                   \
-        INSN_3(ALU, LSH, K),                    \
+        INSN_3(ALU, LSH,  K),                   \
-        INSN_3(ALU, RSH, K),                    \
+        INSN_3(ALU, RSH,  K),                   \
-        INSN_3(ALU, XOR, K),                    \
+        INSN_3(ALU, XOR,  K),                   \
-        INSN_3(ALU, MUL, K),                    \
+        INSN_3(ALU, MUL,  K),                   \
-        INSN_3(ALU, MOV, K),                    \
+        INSN_3(ALU, MOV,  K),                   \
-        INSN_3(ALU, DIV, K),                    \
+        INSN_3(ALU, ARSH, K),                   \
-        INSN_3(ALU, MOD, K),                    \
+        INSN_3(ALU, DIV,  K),                   \
+        INSN_3(ALU, MOD,  K),                   \
        /* 64 bit ALU operations. */            \
        /*   Register based. */                 \
        INSN_3(ALU64, ADD,  X),                 \
@@ -1137,6 +1139,12 @@ select_insn:
                DST = (u64) (u32) insn[0].imm | ((u64) (u32) insn[1].imm) << 32;
                insn++;
                CONT;
+        ALU_ARSH_X:
+                DST = (u64) (u32) ((*(s32 *) &DST) >> SRC);
+                CONT;
+        ALU_ARSH_K:
+                DST = (u64) (u32) ((*(s32 *) &DST) >> IMM);
+                CONT;
        ALU64_ARSH_X:
                (*(s64 *) &DST) >>= SRC;
                CONT;

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 628b3970a49b..a5b223ef7131 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c
@@ -933,32 +933,34 @@ EXPORT_SYMBOL_GPL(__bpf_call_base);
933	#define BPF_INSN_MAP(INSN_2, INSN_3) \	933	#define BPF_INSN_MAP(INSN_2, INSN_3) \
934	/* 32 bit ALU operations. */ \	934	/* 32 bit ALU operations. */ \
935	/* Register based. */ \	935	/* Register based. */ \
936	INSN_3(ALU, ADD, X), \	936	INSN_3(ALU, ADD, X), \
937	INSN_3(ALU, SUB, X), \	937	INSN_3(ALU, SUB, X), \
938	INSN_3(ALU, AND, X), \	938	INSN_3(ALU, AND, X), \
939	INSN_3(ALU, OR, X), \	939	INSN_3(ALU, OR, X), \
940	INSN_3(ALU, LSH, X), \	940	INSN_3(ALU, LSH, X), \
941	INSN_3(ALU, RSH, X), \	941	INSN_3(ALU, RSH, X), \
942	INSN_3(ALU, XOR, X), \	942	INSN_3(ALU, XOR, X), \
943	INSN_3(ALU, MUL, X), \	943	INSN_3(ALU, MUL, X), \
944	INSN_3(ALU, MOV, X), \	944	INSN_3(ALU, MOV, X), \
945	INSN_3(ALU, DIV, X), \	945	INSN_3(ALU, ARSH, X), \
946	INSN_3(ALU, MOD, X), \	946	INSN_3(ALU, DIV, X), \
		947	INSN_3(ALU, MOD, X), \
947	INSN_2(ALU, NEG), \	948	INSN_2(ALU, NEG), \
948	INSN_3(ALU, END, TO_BE), \	949	INSN_3(ALU, END, TO_BE), \
949	INSN_3(ALU, END, TO_LE), \	950	INSN_3(ALU, END, TO_LE), \
950	/* Immediate based. */ \	951	/* Immediate based. */ \
951	INSN_3(ALU, ADD, K), \	952	INSN_3(ALU, ADD, K), \
952	INSN_3(ALU, SUB, K), \	953	INSN_3(ALU, SUB, K), \
953	INSN_3(ALU, AND, K), \	954	INSN_3(ALU, AND, K), \
954	INSN_3(ALU, OR, K), \	955	INSN_3(ALU, OR, K), \
955	INSN_3(ALU, LSH, K), \	956	INSN_3(ALU, LSH, K), \
956	INSN_3(ALU, RSH, K), \	957	INSN_3(ALU, RSH, K), \
957	INSN_3(ALU, XOR, K), \	958	INSN_3(ALU, XOR, K), \
958	INSN_3(ALU, MUL, K), \	959	INSN_3(ALU, MUL, K), \
959	INSN_3(ALU, MOV, K), \	960	INSN_3(ALU, MOV, K), \
960	INSN_3(ALU, DIV, K), \	961	INSN_3(ALU, ARSH, K), \
961	INSN_3(ALU, MOD, K), \	962	INSN_3(ALU, DIV, K), \
		963	INSN_3(ALU, MOD, K), \
962	/* 64 bit ALU operations. */ \	964	/* 64 bit ALU operations. */ \
963	/* Register based. */ \	965	/* Register based. */ \
964	INSN_3(ALU64, ADD, X), \	966	INSN_3(ALU64, ADD, X), \
@@ -1137,6 +1139,12 @@ select_insn:
1137	DST = (u64) (u32) insn[0].imm \| ((u64) (u32) insn[1].imm) << 32;	1139	DST = (u64) (u32) insn[0].imm \| ((u64) (u32) insn[1].imm) << 32;
1138	insn++;	1140	insn++;
1139	CONT;	1141	CONT;
		1142	ALU_ARSH_X:
		1143	DST = (u64) (u32) (((s32 ) &DST) >> SRC);
		1144	CONT;
		1145	ALU_ARSH_K:
		1146	DST = (u64) (u32) (((s32 ) &DST) >> IMM);
		1147	CONT;
1140	ALU64_ARSH_X:	1148	ALU64_ARSH_X:
1141	((s64 ) &DST) >>= SRC;	1149	((s64 ) &DST) >>= SRC;
1142	CONT;	1150	CONT;