Skip to content

Backport of "mptcp: pm: Fix uaf in __timer_delete_sync"

Matthieu Baerts (NGI0) mptcp stable 1 version Applied

Status from this message: This is a note to let you know that I've just added the patch titled

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 4 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/3mptcp: export lookup_anno_list_by_saddrnet/mptcp/pm_netlink.c net/mptcp/protocol.h+8 -51 reply
2/3mptcp: validate 'id' when stopping the ADD_ADDR retransmit timernet/mptcp/options.c net/mptcp/pm_netlink.c net/mptcp/protocol.h+6 -61 reply
3/3mptcp: pm: Fix uaf in __timer_delete_syncnet/mptcp/pm_netlink.c+9 -41 reply

Reviews trailers per patch

1 of 3 patches has a Reviewed-by or Acked-by.

Patch[email protected]Paolo Abeni
1/3
2/3
3/3Reported-and-tested-by Reported-and-tested-by A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 5.10.y 0/3] Backport of "mptcp: pm: Fix uaf in __timer_delete_sync"

To ease the inclusion of commit b4cd80b03389 ("mptcp: pm: Fix uaf in __timer_delete_sync"), commit d88c476f4a7d ("mptcp: export lookup_anno_list_by_saddr") and commit d58300c3185b ("mptcp: validate 'id' when stopping the ADD_ADDR retransmit timer") look safe to be backported as well, even if there was one small conflict, but easy to resolve. The first one is a refactoring, while the second one is a fix that is helping to prevent the new issues being fixed here.

Davide Caratti (1):
mptcp: validate 'id' when stopping the ADD_ADDR retransmit timer

Edward Adam Davis (1):
mptcp: pm: Fix uaf in __timer_delete_sync

Geliang Tang (1):
mptcp: export lookup_anno_list_by_saddr

 net/mptcp/options.c    |  2 +-
 net/mptcp/pm_netlink.c | 27 ++++++++++++++++-----------
 net/mptcp/protocol.h   |  5 ++++-
 3 files changed, 21 insertions(+), 13 deletions(-)
Signature · 1 line
2.45.2