From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: "Toke Høiland-Jørgensen" <toke@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>, KP Singh <kpsingh@kernel.org>,
syzbot <syzbot+983941aa85af6ded1fd9@syzkaller.appspotmail.com>,
Network Development <netdev@vger.kernel.org>,
bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf v2 1/3] xdp: check prog type before updating BPF link
Date: Tue, 11 Jan 2022 09:49:28 -0800 [thread overview]
Message-ID: <CAADnVQ+eK+cmOE7OcKjV1O9J-x0=Hb_5yM61KeBXeWWn2TWquw@mail.gmail.com> (raw)
In-Reply-To: <CAADnVQLBDwUEcf63Jd2ohe0k5xKAcFaUmPL6tC-h937pSTzcCg@mail.gmail.com>
On Sat, Jan 8, 2022 at 11:37 AM Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
>
> On Fri, Jan 7, 2022 at 2:11 PM Toke Høiland-Jørgensen <toke@redhat.com> wrote:
> >
> > The bpf_xdp_link_update() function didn't check the program type before
> > updating the program, which made it possible to install any program type as
> > an XDP program, which is obviously not good. Syzbot managed to trigger this
> > by swapping in an LWT program on the XDP hook which would crash in a helper
> > call.
> >
> > Fix this by adding a check and bailing out if the types don't match.
> >
> > Fixes: 026a4c28e1db ("bpf, xdp: Implement LINK_UPDATE for BPF XDP link")
> > Reported-by: syzbot+983941aa85af6ded1fd9@syzkaller.appspotmail.com
> > Acked-by: Andrii Nakryiko <andrii@kernel.org>
> > Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
>
> Thanks a lot for the quick fix!
> The merge window is about to begin.
> We will land it as soon as possible when bpf tree will be ready
> to accept fixes.
Applied to bpf tree.
prev parent reply other threads:[~2022-01-11 17:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 22:11 [PATCH bpf v2 1/3] xdp: check prog type before updating BPF link Toke Høiland-Jørgensen
2022-01-07 22:11 ` [PATCH bpf v2 2/3] bpf/selftests: convert xdp_link test to ASSERT_* macros Toke Høiland-Jørgensen
2022-01-07 22:11 ` [PATCH bpf v2 3/3] bpf/selftests: Add check for updating XDP bpf_link with wrong program type Toke Høiland-Jørgensen
2022-01-08 19:37 ` [PATCH bpf v2 1/3] xdp: check prog type before updating BPF link Alexei Starovoitov
2022-01-08 20:21 ` Toke Høiland-Jørgensen
2022-01-11 17:49 ` Alexei Starovoitov [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='CAADnVQ+eK+cmOE7OcKjV1O9J-x0=Hb_5yM61KeBXeWWn2TWquw@mail.gmail.com' \
--to=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=syzbot+983941aa85af6ded1fd9@syzkaller.appspotmail.com \
--cc=toke@redhat.com \
--cc=yhs@fb.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.