net/filter: Permit reading NET in load_bytes_relative when MAC not set
authorYiFei Zhu <zhuyifei1999@gmail.com>
Wed, 10 Jun 2020 18:41:39 +0000 (13:41 -0500)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 11 Jun 2020 14:05:56 +0000 (16:05 +0200)
commit0f5d82f187e1beda3fe7295dfc500af266a5bd80
treed39d92b7b721bcca5813381113df0c054260b4dc
parent47f6bc4ce1ff70d7ba0924c2f1c218c96cd585fb
net/filter: Permit reading NET in load_bytes_relative when MAC not set

Added a check in the switch case on start_header that checks for
the existence of the header, and in the case that MAC is not set
and the caller requests for MAC, -EFAULT. If the caller requests
for NET then MAC's existence is completely ignored.

There is no function to check NET header's existence and as far
as cgroup_skb/egress is concerned it should always be set.

Removed for ptr >= the start of header, considering offset is
bounded unsigned and should always be true. len <= end - mac is
redundant to ptr + len <= end.

Fixes: 3eee1f75f2b9 ("bpf: fix bpf_skb_load_bytes_relative pkt length check")
Signed-off-by: YiFei Zhu <zhuyifei@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Stanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/bpf/76bb820ddb6a95f59a772ecbd8c8a336f646b362.1591812755.git.zhuyifei@google.com
net/core/filter.c