diff options
| author | Willem de Bruijn <willemb@google.com> | 2015-05-17 19:44:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-17 22:41:38 -0400 |
| commit | 4633c9e07b3b7d7fc262a5f59ff635c1f702af6f (patch) | |
| tree | a6e18702deaeda1c0158a0f75962665c44b4694e /net/can | |
| parent | c91d46065209bfe6124396fc409765ced0601b59 (diff) | |
| download | op-kernel-dev-4633c9e07b3b7d7fc262a5f59ff635c1f702af6f.zip op-kernel-dev-4633c9e07b3b7d7fc262a5f59ff635c1f702af6f.tar.gz | |
net-packet: fix null pointer exception in rollover mode
Rollover can be enabled as flag or mode. Allocate state in both cases.
This solves a NULL pointer exception in fanout_demux_rollover on
referencing po->rollover if using mode rollover.
Also make sure that in rollover mode each silo is tried (contrary
to rollover flag, where the main socket is excluded after an initial
try_self).
Tested:
Passes tools/testing/net/psock_fanout.c, which tests both modes and
flag. My previous tests were limited to bench_rollover, which only
stresses the flag. The test now completes safely. it still gives an
error for mode rollover, because it does not expect the new headroom
(ROOM_NORMAL) requirement. I will send a separate patch to the test.
Fixes: 0648ab70afe6 ("packet: rollover prepare: per-socket state")
Signed-off-by: Willem de Bruijn <willemb@google.com>
----
I should have run this test and caught this before submission, of
course. Apologies for the oversight.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions
