Skip to content

Commit 35607b0

Browse files
Alexei Starovoitovdavem330
Alexei Starovoitov
authored andcommitted
sparc: bpf_jit: fix loads from negative offsets
- fix BPF_LD|ABS|IND from negative offsets: make sure to sign extend lower 32 bits in 64-bit register before calling C helpers from JITed code, otherwise 'int k' argument of bpf_internal_load_pointer_neg_helper() function will be added as large unsigned integer, causing packet size check to trigger and abort the program. It's worth noting that JITed code for 'A = A op K' will affect upper 32 bits differently depending whether K is simm13 or not. Since small constants are sign extended, whereas large constants are stored in temp register and zero extended. That is ok and we don't have to pay a penalty of sign extension for every sethi, since all classic BPF instructions have 32-bit semantics and we only need to set correct upper bits when transitioning from JITed code into C. - though instructions 'A &= 0' and 'A *= 0' are odd, JIT compiler should not optimize them out Signed-off-by: Alexei Starovoitov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 543a2df commit 35607b0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

arch/sparc/net/bpf_jit_asm.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
#define SAVE_SZ 176
77
#define SCRATCH_OFF STACK_BIAS + 128
88
#define BE_PTR(label) be,pn %xcc, label
9+
#define SIGN_EXTEND(reg) sra reg, 0, reg
910
#else
1011
#define SAVE_SZ 96
1112
#define SCRATCH_OFF 72
1213
#define BE_PTR(label) be label
14+
#define SIGN_EXTEND(reg)
1315
#endif
1416

1517
#define SKF_MAX_NEG_OFF (-0x200000) /* SKF_LL_OFF from filter.h */
@@ -135,6 +137,7 @@ bpf_slow_path_byte_msh:
135137
save %sp, -SAVE_SZ, %sp; \
136138
mov %i0, %o0; \
137139
mov r_OFF, %o1; \
140+
SIGN_EXTEND(%o1); \
138141
call bpf_internal_load_pointer_neg_helper; \
139142
mov (LEN), %o2; \
140143
mov %o0, r_TMP; \

arch/sparc/net/bpf_jit_comp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ do { \
184184
*/
185185
#define emit_alu_K(OPCODE, K) \
186186
do { \
187-
if (K) { \
187+
if (K || OPCODE == AND || OPCODE == MUL) { \
188188
unsigned int _insn = OPCODE; \
189189
_insn |= RS1(r_A) | RD(r_A); \
190190
if (is_simm13(K)) { \

0 commit comments

Comments
 (0)