Merge branch 'net-sched-fix-NULL-dereference-in-goto-chain-control-action'

Browse source

Davide Caratti says:

====================
net/sched: fix NULL dereference in 'goto chain' control action

in a couple of TC actions (i.e. csum and tunnel_key), the control action
is stored together with the action-specific configuration data.
This avoids a race condition (see [1]), but it causes a crash when 'goto
chain' is used with the above actions. Since this race condition is
tolerated on the other TC actions (it's present even on actions where the
spinlock is still used), storing the control action in the common area
should be acceptable for tunnel_key and csum as well.

[1] https://www.spinics.net/lists/netdev/msg472047.html
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2018-07-07 22:01:09 +09:00

parent 404cd086f2 38230a3e0e

commit de508f8b5a

4 changed files with 6 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/net/tc_act/tc_csum.h

View file

1

include/net/tc_act/tc_tunnel_key.h

View file

6

net/sched/act_csum.c

View file

6

net/sched/act_tunnel_key.c

View file