diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-01-29 12:02:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-29 12:02:55 -0500 |
| commit | bfbe5bab66e1aa68033786599cc495e6728e55e8 (patch) | |
| tree | 68e92d489b96c65ef2fe4a662d615d9400af3635 /drivers/net | |
| parent | ipv6: Fix SO_REUSEPORT UDP socket with implicit sk_ipv6only (diff) | |
| parent | tools/virtio: fix smp_mb on x86 (diff) | |
| download | linux-dev-bfbe5bab66e1aa68033786599cc495e6728e55e8.tar.xz linux-dev-bfbe5bab66e1aa68033786599cc495e6728e55e8.zip | |
Merge branch 'ptr_ring-fixes'
Michael S. Tsirkin says:
====================
ptr_ring fixes
This fixes a bunch of issues around ptr_ring use in net core.
One of these: "tap: fix use-after-free" is also needed on net,
but can't be backported cleanly.
I will post a net patch separately.
Lightly tested - Jason, could you pls confirm this
addresses the security issue you saw with ptr_ring?
Testing reports would be appreciated too.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Tested-by: Jason Wang <jasowang@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 7c38659b2a76..77872699c45d 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -330,9 +330,6 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb) if (!q) return RX_HANDLER_PASS; - if (__ptr_ring_full(&q->ring)) - goto drop; - skb_push(skb, ETH_HLEN); /* Apply the forward feature mask so that we perform segmentation |