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

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

Posted by Matthieu Baerts (NGI0) 3 months ago

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(-)

-- 
2.45.2

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

Posted by Greg KH 2 months, 3 weeks ago

On Tue, Sep 17, 2024 at 09:26:08AM +0200, Matthieu Baerts (NGI0) wrote:
> 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(-)
> 
> -- 
> 2.45.2
> 
> 

ALl now queued up, thanks!

greg k-h