diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2016-03-04 15:15:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-08 13:55:15 -0500 |
| commit | 8afd54c87ad7089734ef0527937a256586ba828a (patch) | |
| tree | 9566535cb2d9ce1cecb2926581f1c3b76577f11a /net/core | |
| parent | 8050c0f0274a15841756968857cfb07b3ab809ae (diff) | |
| download | op-kernel-dev-8afd54c87ad7089734ef0527937a256586ba828a.zip op-kernel-dev-8afd54c87ad7089734ef0527937a256586ba828a.tar.gz | |
bpf: add flags to bpf_skb_store_bytes for clearing hash
When overwriting parts of the packet with bpf_skb_store_bytes() that
were fed previously into skb->hash calculation, we should clear the
current hash with skb_clear_hash(), so that a next skb_get_hash() call
can determine the correct hash related to this skb.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index 356a251..a1fe246 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1353,7 +1353,7 @@ static u64 bpf_skb_store_bytes(u64 r1, u64 r2, u64 r3, u64 r4, u64 flags) unsigned int len = (unsigned int) r4; void *ptr; - if (unlikely(flags & ~(BPF_F_RECOMPUTE_CSUM))) + if (unlikely(flags & ~(BPF_F_RECOMPUTE_CSUM | BPF_F_INVALIDATE_HASH))) return -EINVAL; /* bpf verifier guarantees that: @@ -1384,6 +1384,8 @@ static u64 bpf_skb_store_bytes(u64 r1, u64 r2, u64 r3, u64 r4, u64 flags) if (flags & BPF_F_RECOMPUTE_CSUM) skb_postpush_rcsum(skb, ptr, len); + if (flags & BPF_F_INVALIDATE_HASH) + skb_clear_hash(skb); return 0; } |
