octeon_ep, octeon_ep_vf: fix RX skb frags overflow and page leak
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v6 Latest4 patches 5 repliesIn review
- v53 patches 1 replySuperseded
- v43 patches 2 repliesSuperseded
Earlier versions · 3
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v3 | 2 patches | 4 replies | Superseded | |
| v2 | 2 patches | 2 replies | Superseded | |
| v1 | 2 patches | 3 replies | Superseded |
Changes in v6 from the cover letter
- octeon_ep: add patch 1 to free the dropped RX buffer pages, per Jakub Kicinski. The drop path leaked the head page and every fragment page. The overflow drop in patch 2 reuses that helper. The v5 cover deferred this fix to a follow-up.
- octeon_ep, octeon_ep_vf: bound the drop drain to MAX_SKB_FRAGS. The drain length derives from the device length. A bad length could run it past the ring. This is defense in depth against a misbehaving device.
Patches in v6 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | octeon_ep: free the dropped RX buffer pagesdrivers/ | +8 | 0 replies | |
| 2/4 | octeon_ep: fix skb frags overflow in the RX pathdrivers/ | +10 | 0 replies | |
| 3/4 | octeon_ep_vf: Fix RX page leak on napi_build_skb() failuredrivers/ | +3 | 0 replies | |
| 4/4 | octeon_ep_vf: fix skb frags overflow in the RX pathdrivers/ | +34 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v6 yet.
Cover letter [PATCH net v6 0/4] octeon_ep, octeon_ep_vf: fix RX skb frags overflow and page leak
The octeon_ep and octeon_ep_vf RX paths add one skb fragment per buffer with no bound against MAX_SKB_FRAGS. buff_info->len comes from the device response header. A long packet needs about 18 fragments. That is one past the default MAX_SKB_FRAGS of 17. skb_add_rx_frag() then writes past shinfo->frags[]. Patch 2 bounds octeon_ep. Patch 4 bounds octeon_ep_vf.
Both drivers also leak the pages of a dropped multi-buffer packet. The drop path unmaps each buffer but never frees its page. Patch 1 fixes octeon_ep. Patch 3 is Guangshuo Li's fix for octeon_ep_vf. The overflow drops in patch 2 and patch 4 reuse those helpers. They free their pages too.
The drop drain length derives from the device length. It had no bound against the ring. Patch 1 and patch 4 stop the drain after MAX_SKB_FRAGS fragments. A valid packet never holds more. This keeps a bad device length from running the drain past the ring.
v6:
- octeon_ep: add patch 1 to free the dropped RX buffer pages, per Jakub Kicinski. The drop path leaked the head page and every fragment page. The overflow drop in patch 2 reuses that helper. The v5 cover deferred this fix to a follow-up.
- octeon_ep, octeon_ep_vf: bound the drop drain to MAX_SKB_FRAGS. The drain length derives from the device length. A bad length could run it past the ring. This is defense in depth against a misbehaving device.
v1: https://lore.kernel.org/r/[email protected]
v2: https://lore.kernel.org/r/[email protected]
v3: https://lore.kernel.org/r/[email protected]
v4: https://lore.kernel.org/r/[email protected]
v5: https://lore.kernel.org/r/[email protected]
Guangshuo Li (1):
octeon_ep_vf: Fix RX page leak on napi_build_skb() failure
Maoyi Xie (3):
octeon_ep: free the dropped RX buffer pages
octeon_ep: fix skb frags overflow in the RX path
octeon_ep_vf: fix skb frags overflow in the RX path
.../net/ethernet/marvell/octeon_ep/octep_rx.c | 19 ++++++- .../marvell/octeon_ep_vf/octep_vf_rx.c | 52 +++++++++++++------ 2 files changed, 53 insertions(+), 18 deletions(-)
--
2.34.1