aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/core/filter.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 4aec7b93f1a9..ab3c74e49f07 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -578,7 +578,11 @@ EXPORT_SYMBOL_GPL(sk_run_filter_int_skb);
578 * to make sure its still a 3bit field starting at a byte boundary; 578 * to make sure its still a 3bit field starting at a byte boundary;
579 * taken from arch/x86/net/bpf_jit_comp.c. 579 * taken from arch/x86/net/bpf_jit_comp.c.
580 */ 580 */
581#ifdef __BIG_ENDIAN_BITFIELD
582#define PKT_TYPE_MAX (7 << 5)
583#else
581#define PKT_TYPE_MAX 7 584#define PKT_TYPE_MAX 7
585#endif
582static unsigned int pkt_type_offset(void) 586static unsigned int pkt_type_offset(void)
583{ 587{
584 struct sk_buff skb_probe = { .pkt_type = ~0, }; 588 struct sk_buff skb_probe = { .pkt_type = ~0, };
@@ -685,6 +689,13 @@ static bool convert_bpf_extensions(struct sock_filter *fp,
685 insn->code = BPF_ALU | BPF_AND | BPF_K; 689 insn->code = BPF_ALU | BPF_AND | BPF_K;
686 insn->a_reg = A_REG; 690 insn->a_reg = A_REG;
687 insn->imm = PKT_TYPE_MAX; 691 insn->imm = PKT_TYPE_MAX;
692#ifdef __BIG_ENDIAN_BITFIELD
693 insn++;
694
695 insn->code = BPF_ALU | BPF_RSH | BPF_K;
696 insn->a_reg = A_REG;
697 insn->imm = 5;
698#endif
688 break; 699 break;
689 700
690 case SKF_AD_OFF + SKF_AD_IFINDEX: 701 case SKF_AD_OFF + SKF_AD_IFINDEX: