| Message ID | 20191016111635.20089-1-ben.dooks@codethink.co.uk |
|---|---|
| State | Rejected |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | net: bpf: type fixes for __be16/__be32 | expand |
On Wed, Oct 16, 2019 at 12:16:35PM +0100, Ben Dooks (Codethink) wrote: > In bpf_skb_load_helper_8_no_cache and > bpf_skb_load_helper_16_no_cache they > read a u16/u32 where actually these > are __be16 and __be32. > > Fix the following by making the types > match: > > net/core/filter.c:215:32: warning: cast to restricted __be16 > net/core/filter.c:215:32: warning: cast to restricted __be16 > net/core/filter.c:215:32: warning: cast to restricted __be16 > net/core/filter.c:215:32: warning: cast to restricted __be16 > net/core/filter.c:215:32: warning: cast to restricted __be16 > net/core/filter.c:215:32: warning: cast to restricted __be16 > net/core/filter.c:215:32: warning: cast to restricted __be16 > net/core/filter.c:215:32: warning: cast to restricted __be16 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 > net/core/filter.c:242:32: warning: cast to restricted __be32 Acked-by: Martin KaFai Lau <kafai@fb.com>
diff --git a/net/core/filter.c b/net/core/filter.c index f7338fee41f8..eefb1545b4c6 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -205,7 +205,7 @@ BPF_CALL_2(bpf_skb_load_helper_8_no_cache, const struct sk_buff *, skb, BPF_CALL_4(bpf_skb_load_helper_16, const struct sk_buff *, skb, const void *, data, int, headlen, int, offset) { - u16 tmp, *ptr; + __be16 tmp, *ptr; const int len = sizeof(tmp); if (offset >= 0) { @@ -232,7 +232,7 @@ BPF_CALL_2(bpf_skb_load_helper_16_no_cache, const struct sk_buff *, skb, BPF_CALL_4(bpf_skb_load_helper_32, const struct sk_buff *, skb, const void *, data, int, headlen, int, offset) { - u32 tmp, *ptr; + __be32 tmp, *ptr; const int len = sizeof(tmp); if (likely(offset >= 0)) {
In bpf_skb_load_helper_8_no_cache and bpf_skb_load_helper_16_no_cache they read a u16/u32 where actually these are __be16 and __be32. Fix the following by making the types match: net/core/filter.c:215:32: warning: cast to restricted __be16 net/core/filter.c:215:32: warning: cast to restricted __be16 net/core/filter.c:215:32: warning: cast to restricted __be16 net/core/filter.c:215:32: warning: cast to restricted __be16 net/core/filter.c:215:32: warning: cast to restricted __be16 net/core/filter.c:215:32: warning: cast to restricted __be16 net/core/filter.c:215:32: warning: cast to restricted __be16 net/core/filter.c:215:32: warning: cast to restricted __be16 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 net/core/filter.c:242:32: warning: cast to restricted __be32 Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Martin KaFai Lau <kafai@fb.com> Cc: Song Liu <songliubraving@fb.com> Cc: Yonghong Song <yhs@fb.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org Cc: bpf@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- net/core/filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)