Skip to content

Fix issues in xfrm_migrate

Yan Yan netdev 2 versions – Applied

Status from this message: Applied, thanks a lot Yan!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 1 replyApplied
  2. v11 of 2 patches 3 repliesSuperseded

Changes in v2 from the cover letter

- Move xfrm_init_state() out of xfrm_state_clone() and called it after updating the address family

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/2xfrm: Check if_id in xfrm_migrateinclude/net/xfrm.h net/key/af_key.c net/xfrm/xfrm_policy.c +2 more+23 -110 replies
2/2xfrm: Fix xfrm migrate issues when address family changesnet/xfrm/xfrm_state.c+5 -30 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/2] Fix issues in xfrm_migrate

This patch series include two patches to fix two issues in xfrm_migrate.

PATCH 1/2 enables distinguishing SAs and SPs based on if_id during the xfrm_migrate flow. It fixes the problem that when there are multiple existing SPs with the same direction, the same xfrm_selector and different endpoint addresses, xfrm_migrate might fail.

PATCH 2/2 enables xfrm_migrate to handle address family change by breaking the original xfrm_state_clone method into two steps so as to update the props.family before running xfrm_init_state.

V1 -> V2:
- Move xfrm_init_state() out of xfrm_state_clone() and called it after updating the address family

Yan Yan (2):
xfrm: Check if_id in xfrm_migrate
xfrm: Fix xfrm migrate issues when address family changes

 include/net/xfrm.h     |  5 +++--
 net/key/af_key.c       |  2 +-
 net/xfrm/xfrm_policy.c | 14 ++++++++------
 net/xfrm/xfrm_state.c  | 15 +++++++++++----
 net/xfrm/xfrm_user.c   |  6 +++++-
 5 files changed, 28 insertions(+), 14 deletions(-)

base-commit: fe8152b38d3a994c4c6fdbc0cd6551d569a5715a

Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog