Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a74e04de authored by Ben Dooks's avatar Ben Dooks Committed by Greg Kroah-Hartman
Browse files

bpf: Add endian modifiers to fix endian warnings 



[ Upstream commit 96a233e600df351bcb06e3c20efe048855552926 ]

A couple of the syscalls which load values (bpf_skb_load_helper_16() and
bpf_skb_load_helper_32()) are using u16/u32 types which are triggering
warnings as they are then converted from big-endian to CPU-endian. Fix
these by making the types __be instead.

Fixes the following sparse warnings:

  net/core/filter.c:246:32: warning: cast to restricted __be16
  net/core/filter.c:246:32: warning: cast to restricted __be16
  net/core/filter.c:246:32: warning: cast to restricted __be16
  net/core/filter.c:246:32: warning: cast to restricted __be16
  net/core/filter.c:273:32: warning: cast to restricted __be32
  net/core/filter.c:273:32: warning: cast to restricted __be32
  net/core/filter.c:273:32: warning: cast to restricted __be32
  net/core/filter.c:273:32: warning: cast to restricted __be32
  net/core/filter.c:273:32: warning: cast to restricted __be32
  net/core/filter.c:273:32: warning: cast to restricted __be32

Signed-off-by: default avatarBen Dooks <ben.dooks@sifive.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220714105101.297304-1-ben.dooks@sifive.com


Stable-dep-of: d4bac0288a2b ("bpf: support SKF_NET_OFF and SKF_LL_OFF on skb frags")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ecfbbd83

net/core/filter.c

+2 −2
Original line number Diff line number Diff line
@@ -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)) {