diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-23 05:32:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-23 05:32:48 +0200 |
| commit | 218b6a5b23e939caf2064549b1cb61ba22b9d0a1 (patch) | |
| tree | bdabf5439fb58905268953165779614d2aadb677 /kernel/bpf/verifier.c | |
| parent | Merge branch 'dsa-distribute-switch-events' (diff) | |
| parent | Merge tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.tar.xz linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/bpf/verifier.c')
| -rw-r--r-- | kernel/bpf/verifier.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 1eddb713b815..c72cd41f5b8b 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -808,11 +808,15 @@ static int check_pkt_ptr_alignment(const struct bpf_reg_state *reg, reg_off += reg->aux_off; } - /* skb->data is NET_IP_ALIGN-ed, but for strict alignment checking - * we force this to 2 which is universally what architectures use - * when they don't set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS. + /* For platforms that do not have a Kconfig enabling + * CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS the value of + * NET_IP_ALIGN is universally set to '2'. And on platforms + * that do set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS, we get + * to this code only in strict mode where we want to emulate + * the NET_IP_ALIGN==2 checking. Therefore use an + * unconditional IP align value of '2'. */ - ip_align = strict ? 2 : NET_IP_ALIGN; + ip_align = 2; if ((ip_align + reg_off + off) % size != 0) { verbose("misaligned packet access off %d+%d+%d size %d\n", ip_align, reg_off, off, size); |