Skip to contentSkip to conversation

xfrm: cleanup error path in xfrm_add_policy()

PATCH In review Deepanshu Kartikey 2 participants 4 messages Apr 14 – May 4

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 xfrm: cleanup error path in xfrm_add_policy()

Replace the open-coded manual cleanup in the error path of xfrm_add_policy() with xfrm_policy_destroy(), which already handles all the necessary cleanup internally. This is consistent with how xfrm_policy_construct() handles its own error paths.

The walk.dead flag must be set before calling xfrm_policy_destroy() as required by BUG_ON(!policy->walk.dead).

---
v3:
- Changed prefix to ipsec-next as this is a cleanup
- Dropped syzbot references as suggested by Sabrina Dubroca
v2:
- Reworded commit message to reflect cleanup rather than bugfix as suggested by Sabrina Dubroca
- Removed incorrect Fixes: and Closes: tags
- Corrected subject prefix to PATCH ipsec

---
 net/xfrm/xfrm_user.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
net/xfrm/xfrm_user.c +2 -3
index d56450f61669..ae144d1e4a65 100644
@@ -2267,9 +2267,8 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
 
 	if (err) {
 		xfrm_dev_policy_delete(xp);
-		xfrm_dev_policy_free(xp);
-		security_xfrm_policy_free(xp->security);
-		kfree(xp);
+		xp->walk.dead = 1;
+		xfrm_policy_destroy(xp);
 		return err;
 	}
 
Signature · 1 line
2.43.0
#1 lore raw
Quoted 40 lines · Deepanshu Kartikey

Replace the open-coded manual cleanup in the error path of xfrm_add_policy() with xfrm_policy_destroy(), which already handles all the necessary cleanup internally. This is consistent with how xfrm_policy_construct() handles its own error paths.

The walk.dead flag must be set before calling xfrm_policy_destroy() as required by BUG_ON(!policy->walk.dead).

---
v3:
- Changed prefix to ipsec-next as this is a cleanup
- Dropped syzbot references as suggested by Sabrina Dubroca
v2:
- Reworded commit message to reflect cleanup rather than bugfix as suggested by Sabrina Dubroca
- Removed incorrect Fixes: and Closes: tags
- Corrected subject prefix to PATCH ipsec

---
 net/xfrm/xfrm_user.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
net/xfrm/xfrm_user.c +2 -4
index d56450f61669..ae144d1e4a65 100644
@@ -2267,9 +2267,8 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
 
        if (err) {
                xfrm_dev_policy_delete(xp);
-               xfrm_dev_policy_free(xp);
-               security_xfrm_policy_free(xp->security);
-               kfree(xp);
+               xp->walk.dead = 1;
+               xfrm_policy_destroy(xp);
                return err;
        }
 
--
Quoted 2 lines

2.43.0

Gentle ping on this patch . Please let me know the status of this patch. If anything is required from my side

Thanks

maintainer
#2 lore raw
Quoted 41 lines · Deepanshu Kartikey
Quoted 39 lines · Deepanshu Kartikey

Replace the open-coded manual cleanup in the error path of xfrm_add_policy() with xfrm_policy_destroy(), which already handles all the necessary cleanup internally. This is consistent with how xfrm_policy_construct() handles its own error paths.

The walk.dead flag must be set before calling xfrm_policy_destroy() as required by BUG_ON(!policy->walk.dead).

---
v3:
- Changed prefix to ipsec-next as this is a cleanup
- Dropped syzbot references as suggested by Sabrina Dubroca
v2:
- Reworded commit message to reflect cleanup rather than bugfix as suggested by Sabrina Dubroca
- Removed incorrect Fixes: and Closes: tags
- Corrected subject prefix to PATCH ipsec

---
 net/xfrm/xfrm_user.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
net/xfrm/xfrm_user.c +2 -3
index d56450f61669..ae144d1e4a65 100644
@@ -2267,9 +2267,8 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
 
        if (err) {
                xfrm_dev_policy_delete(xp);
-               xfrm_dev_policy_free(xp);
-               security_xfrm_policy_free(xp->security);
-               kfree(xp);
+               xp->walk.dead = 1;
+               xfrm_policy_destroy(xp);
                return err;
        }
 
Quoted 5 lines
Quoted 3 lines

--
2.43.0

Gentle ping on this patch . Please let me know the status of this patch. If anything is required from my side

Your patch was submitted during the merge window. The net-next and ipsec-next trees don't accept patches during this period.

The merge window ended last Sunday with the release of 7.1-rc1. I prepared the ipsec-next tree for the new development cycle yesterday. I'll consider your patch now.

maintainer
#3 lore raw
Quoted 48 lines · Steffen Klassert
Quoted 41 lines · Deepanshu Kartikey
Quoted 39 lines · Deepanshu Kartikey

Replace the open-coded manual cleanup in the error path of xfrm_add_policy() with xfrm_policy_destroy(), which already handles all the necessary cleanup internally. This is consistent with how xfrm_policy_construct() handles its own error paths.

The walk.dead flag must be set before calling xfrm_policy_destroy() as required by BUG_ON(!policy->walk.dead).

---
v3:
- Changed prefix to ipsec-next as this is a cleanup
- Dropped syzbot references as suggested by Sabrina Dubroca
v2:
- Reworded commit message to reflect cleanup rather than bugfix as suggested by Sabrina Dubroca
- Removed incorrect Fixes: and Closes: tags
- Corrected subject prefix to PATCH ipsec

---
 net/xfrm/xfrm_user.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
net/xfrm/xfrm_user.c +2 -3
index d56450f61669..ae144d1e4a65 100644
@@ -2267,9 +2267,8 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
 
        if (err) {
                xfrm_dev_policy_delete(xp);
-               xfrm_dev_policy_free(xp);
-               security_xfrm_policy_free(xp->security);
-               kfree(xp);
+               xp->walk.dead = 1;
+               xfrm_policy_destroy(xp);
                return err;
        }
 
Quoted 5 lines
Quoted 3 lines

--
2.43.0

Gentle ping on this patch . Please let me know the status of this patch. If anything is required from my side

Quoted 6 lines

Your patch was submitted during the merge window. The net-next and ipsec-next trees don't accept patches during this period.

The merge window ended last Sunday with the release of 7.1-rc1. I prepared the ipsec-next tree for the new development cycle yesterday. I'll consider your patch now.

Now applied to ipsec-next, thanks Deepanshu!