From: Daniel Borkmann <daniel@iogearbox.net>
To: YiFei Zhu <zhuyifei1999@gmail.com>, bpf@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Stanislav Fomichev <sdf@google.com>,
YiFei Zhu <zhuyifei@google.com>
Subject: Re: [PATCH bpf v2 0/2] Fix bpf_skb_load_bytes_relative for cgroup_skb/egress
Date: Thu, 11 Jun 2020 16:25:19 +0200 [thread overview]
Message-ID: <d12ca6f5-0980-90eb-7330-9b4803b4f955@iogearbox.net> (raw)
In-Reply-To: <cover.1591812755.git.zhuyifei@google.com>
On 6/10/20 8:41 PM, YiFei Zhu wrote:
> When cgroup_skb/egress triggers the MAC header is not set. On the other hand,
> load_bytes_relative unconditionally calls skb_mac_header which, when MC not
> set, returns a pointer after the tail pointer, breaking the logic even if the
> caller requested the NET header.
>
> Fix is to conditionally use skb_mac_header or skb_network_header depending on
> the requested header, -EFAULT when the header is not set. Added a test that
> asserts during cgroup_skb/egress request for MAC header returns -EFAULT and
> request for NET header succeeds.
>
> Updates since v1:
> * Reverted the bound condition check to account for bad offset parameter
> larger than data length.
> * Add test asssertion for failure return code on the condition above.
>
> YiFei Zhu (2):
> net/filter: Permit reading NET in load_bytes_relative when MAC not set
> selftests/bpf: Add cgroup_skb/egress test for load_bytes_relative
>
> net/core/filter.c | 16 +++--
> .../bpf/prog_tests/load_bytes_relative.c | 71 +++++++++++++++++++
> .../selftests/bpf/progs/load_bytes_relative.c | 48 +++++++++++++
> 3 files changed, 128 insertions(+), 7 deletions(-)
> create mode 100644 tools/testing/selftests/bpf/prog_tests/load_bytes_relative.c
> create mode 100644 tools/testing/selftests/bpf/progs/load_bytes_relative.c
>
> --
> 2.27.0
>
Applied, thanks!
prev parent reply other threads:[~2020-06-11 14:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 18:41 [PATCH bpf v2 0/2] Fix bpf_skb_load_bytes_relative for cgroup_skb/egress YiFei Zhu
2020-06-10 18:41 ` [PATCH bpf v2 1/2] net/filter: Permit reading NET in load_bytes_relative when MAC not set YiFei Zhu
2020-06-10 18:41 ` [PATCH bpf v2 2/2] selftests/bpf: Add cgroup_skb/egress test for load_bytes_relative YiFei Zhu
2020-06-11 14:25 ` Daniel Borkmann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d12ca6f5-0980-90eb-7330-9b4803b4f955@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=sdf@google.com \
--cc=zhuyifei1999@gmail.com \
--cc=zhuyifei@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).