From: John Fastabend <john.fastabend@gmail.com>
To: Daniel Borkmann <daniel@iogearbox.net>, davem@davemloft.net
Cc: ast@plumgrid.com, jiri@resnulli.us, jhs@mojatatu.com,
edumazet@google.com, netdev@vger.kernel.org
Subject: Re: [PATCH net 1/3] sched: cls_bpf: fix panic on filter replace
Date: Fri, 17 Jul 2015 14:05:09 -0700 [thread overview]
Message-ID: <55A96E05.2090002@gmail.com> (raw)
In-Reply-To: <094e34b7e8d45a323c5cf18a366665654b3f3e45.1437163466.git.daniel@iogearbox.net>
On 15-07-17 01:38 PM, Daniel Borkmann wrote:
> The following test case causes a NULL pointer dereference in cls_bpf:
>
> FOO="1,6 0 0 4294967295,"
> tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 action ok
> tc filter replace dev foo parent 1: pref 49152 handle 0x1 \
> bpf bytecode "$FOO" flowid 1:1 action drop
>
> The problem is that commit 1f947bf151e9 ("net: sched: rcu'ify cls_bpf")
> accidentally swapped the arguments of list_replace_rcu(), the old
> element needs to be the first argument and the new element the second.
>
> Fixes: 1f947bf151e9 ("net: sched: rcu'ify cls_bpf")
> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
> ---
Thanks Daniel. Apparently I got this right in cls_basic but botched it
here and in cls_flow.
FWIW,
Acked-by: John Fastabend <john.r.fastabend@intel.com>
> net/sched/cls_bpf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
> index c79ecfd..e5168f8 100644
> --- a/net/sched/cls_bpf.c
> +++ b/net/sched/cls_bpf.c
> @@ -378,7 +378,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
> goto errout;
>
> if (oldprog) {
> - list_replace_rcu(&prog->link, &oldprog->link);
> + list_replace_rcu(&oldprog->link, &prog->link);
> tcf_unbind_filter(tp, &oldprog->res);
> call_rcu(&oldprog->rcu, __cls_bpf_delete_prog);
> } else {
>
next prev parent reply other threads:[~2015-07-17 21:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-17 20:38 [PATCH net 0/3] Couple of classifier fixes Daniel Borkmann
2015-07-17 20:38 ` [PATCH net 1/3] sched: cls_bpf: fix panic on filter replace Daniel Borkmann
2015-07-17 21:05 ` John Fastabend [this message]
2015-07-17 21:07 ` Daniel Borkmann
2015-07-17 21:31 ` Alexei Starovoitov
2015-07-17 20:38 ` [PATCH net 2/3] sched: cls_flower: " Daniel Borkmann
2015-07-18 20:37 ` Jiri Pirko
2015-07-17 20:38 ` [PATCH net 3/3] sched: cls_flow: " Daniel Borkmann
2015-07-17 21:07 ` John Fastabend
2015-07-17 20:41 ` [PATCH net 0/3] Couple of classifier fixes Daniel Borkmann
2015-07-17 21:01 ` John Fastabend
2015-07-21 7:25 ` David Miller
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=55A96E05.2090002@gmail.com \
--to=john.fastabend@gmail.com \
--cc=ast@plumgrid.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
/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.