amt: fix use-after-free of the skb head across pulls
Status from this message: This series was applied to netdev/net.git (main)
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v5 Latest2 patches 4 repliesApplied 2/2
- v42 patches 1 replySuperseded
Changes in v5 from the cover letter
- amt_update_handler(): also snapshot amtmu->nonce and amtmu->response_mac before iptunnel_pull_header(), which can reallocate the head for a GSO cloned skb; the tunnel-match loop read both fields through the stale amtmu. This is the same class as the query handler's response_mac snapshot and was the one remaining site the v4 fix missed.
- Remove the explanatory comments added in v4; the reason for each snapshot/re-derive is described in the commit message instead.
- Order the local variable declarations longest-to-shortest in the handlers that gained locals (amt_membership_query_handler and amt_update_handler).
Patches in v5 All 2 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | amt: re-read skb header pointers after every pulldrivers/ | +55 | 0 replies | Applied |
| 2/2 | amt: make the head writable before rewriting the L2 headerdrivers/ | +8 | 0 replies | Applied |
Reviews trailers per patch
None of the 2 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Simon Horman | Taehee Yoo |
|---|---|---|
| Series | R-b | R-b |
| 1/2 | ||
| 2/2 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH net v5 0/2] amt: fix use-after-free of the skb head across pulls
Several AMT receive and transmit paths cache a pointer into the skb head and then call a helper that can reallocate that head before the cached pointer is used again, so the later access reads or writes freed memory.
Patch 1 walks every AMT path and, for each pointer used after a reallocating call, either snapshots the value before the first pull or re-derives the pointer after the last one.
Patch 2 is a smaller, separable hardening change: the three handlers that rewrite the ethernet header do so in place without making the head private, which corrupts a cloned skb (for example one held by a packet tap). It adds skb_cow_head() before the rewrite, split out so the use-after-free fix is not held up by discussion of the clone case.
Both patches build cleanly (x86_64, CONFIG_AMT, W=1) and are checkpatch --strict clean.
Changes since v4:
- amt_update_handler(): also snapshot amtmu->nonce and amtmu->response_mac before iptunnel_pull_header(), which can reallocate the head for a GSO cloned skb; the tunnel-match loop read both fields through the stale amtmu. This is the same class as the query handler's response_mac snapshot and was the one remaining site the v4 fix missed.
- Remove the explanatory comments added in v4; the reason for each snapshot/re-derive is described in the commit message instead.
- Order the local variable declarations longest-to-shortest in the handlers that gained locals (amt_membership_query_handler and amt_update_handler).
v4: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
Michael Bommarito (2):
amt: re-read skb header pointers after every pull
amt: make the head writable before rewriting the L2 header
drivers/net/amt.c | 87 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 63 insertions(+), 24 deletions(-)
base-commit: 2c7c88a412aa6d09cd04b414211b4ef8553b5309 --
2.53.0