diff options
| author | Willem de Bruijn | 2019-05-31 18:37:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-11 12:20:49 +0200 |
| commit | da096fe1a6a4fe37488423d07836bc701f7c1fe5 (patch) | |
| tree | 6a2c7db6909e359a39fb67273b9385deb9f8d094 /net/packet | |
| parent | net/tls: replace the sleeping lock around RX resync with a bit lock (diff) | |
| download | kernel-qcow2-linux-da096fe1a6a4fe37488423d07836bc701f7c1fe5.tar.gz kernel-qcow2-linux-da096fe1a6a4fe37488423d07836bc701f7c1fe5.tar.xz kernel-qcow2-linux-da096fe1a6a4fe37488423d07836bc701f7c1fe5.zip | |
packet: unconditionally free po->rollover
[ Upstream commit afa0925c6fcc6a8f610e996ca09bc3215048033c ]
Rollover used to use a complex RCU mechanism for assignment, which had
a race condition. The below patch fixed the bug and greatly simplified
the logic.
The feature depends on fanout, but the state is private to the socket.
Fanout_release returns f only when the last member leaves and the
fanout struct is to be freed.
Destroy rollover unconditionally, regardless of fanout state.
Fixes: 57f015f5eccf2 ("packet: fix crash in fanout_demux_rollover()")
Reported-by: syzbot <syzkaller@googlegroups.com>
Diagnosed-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 18df3bce73da..d98fcf926166 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3017,8 +3017,8 @@ static int packet_release(struct socket *sock) synchronize_net(); + kfree(po->rollover); if (f) { - kfree(po->rollover); fanout_release_data(f); kfree(f); } |