Re: [PATCH] net: bpf: type fixes for __be16/__be32

[Martin Lau]

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 

[PATCH] net: bpf: type fixes for __be16/__be32

[Ben Dooks (Codethink)]

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 
---
Cc: Alexei Starovoitov 
Cc: Daniel Borkmann 
Cc: Martin KaFai Lau 
Cc: Song Liu 
Cc: Yonghong Song 
Cc: "David S. Miller" 
Cc: net...@vger.kernel.org
Cc: b...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 net/core/filter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)) {
-- 
2.23.0