Skip to contentSkip to conversation

: Fix skb leak on pfkey_send_migrate() error

AF_KEY Applied Patrick McHardy 2 participants 2 messages Jan 20, 2008 – Jan 21, 2008

Subsystems (3)
Networking Network drivers Networking IPsec
lore
Share & tools
lore

Patrick McHardy

author
#0 lore raw

commit 4dd3440faa345731c27337ee041c0e9abf2b70dc

Author: Patrick McHardy <[email protected]>
Date:   Sun Jan 20 16:10:04 2008 +0100

[AF_KEY]: Fix skb leak on pfkey_send_migrate() error

Signed-off-by Patrick McHardy <[email protected]>
net/key/af_key.c +9 -7
index 3667f44..16b72b5 100644
@@ -3591,27 +3591,29 @@ static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
 		/* old ipsecrequest */
 		int mode = pfkey_mode_from_xfrm(mp->mode);
 		if (mode < 0)
-			return -EINVAL;
+			goto err;
 		if (set_ipsecrequest(skb, mp->proto, mode,
 				     (mp->reqid ?  IPSEC_LEVEL_UNIQUE : IPSEC_LEVEL_REQUIRE),
 				     mp->reqid, mp->old_family,
-				     &mp->old_saddr, &mp->old_daddr) < 0) {
-			return -EINVAL;
-		}
+				     &mp->old_saddr, &mp->old_daddr) < 0)
+			goto err;
 
 		/* new ipsecrequest */
 		if (set_ipsecrequest(skb, mp->proto, mode,
 				     (mp->reqid ? IPSEC_LEVEL_UNIQUE : IPSEC_LEVEL_REQUIRE),
 				     mp->reqid, mp->new_family,
-				     &mp->new_saddr, &mp->new_daddr) < 0) {
-			return -EINVAL;
-		}
+				     &mp->new_saddr, &mp->new_daddr) < 0)
+			goto err;
 	}
 
 	/* broadcast migrate message to sockets */
 	pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_ALL, NULL);
 
 	return 0;
+
+err:
+	kfree_skb(skb);
+	return -EINVAL;
 }
 #else
 static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,