[PATCH][KEY] fix bug in spdadd

[PATCH][KEY] fix bug in spdadd

[Kazunori MIYAZAWA]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

This patch fix a BUG when adding spds which have
same selector.

Signed-off-by: Kazunori MIYAZAWA <kazunori@miyazawa.org>

--
Kazunori Miyazawa



[-- Attachment #2: af_key.diff --]
[-- Type: text/x-patch, Size: 308 bytes --]

diff --git a/net/key/af_key.c b/net/key/af_key.c
index b3ac85e..1c85392 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2291,6 +2291,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
 	return 0;
 
 out:
+	xp->dead = 1;
 	xfrm_policy_destroy(xp);
 	return err;
 }

Re: [PATCH][KEY] fix bug in spdadd

[YOSHIFUJI Hideaki / 吉藤英明]

In article <47B42C3C.5090104@miyazawa.org> (at Thu, 14 Feb 2008 20:55:40 +0900), Kazunori MIYAZAWA <kazunori@miyazawa.org> says:

> This patch fix a BUG when adding spds which have
> same selector.
> 
> Signed-off-by: Kazunori MIYAZAWA <kazunori@miyazawa.org>

I think we need to fix xfrm_user side as well.

---
[PATCH] [XFRM]: Avoid bogus BUG() when throwing new policy away.

When we destory a new policy entry, we need to tell
xfrm_policy_destroy() explicitly that the entry is not
alive yet.

--- 
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 7833807..f971ca5 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1105,6 +1105,7 @@ static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p,
 	return xp;
  error:
 	*errp = err;
+	xp->dead = 1;
 	xfrm_policy_destroy(xp);
 	return NULL;
 }

-- 
YOSHIFUJI Hideaki @ USAGI Project  <yoshfuji@linux-ipv6.org>
GPG-FP  : 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA

Re: [PATCH][KEY] fix bug in spdadd

[David Miller]

From: Kazunori MIYAZAWA <kazunori@miyazawa.org>
Date: Thu, 14 Feb 2008 20:55:40 +0900

> This patch fix a BUG when adding spds which have
> same selector.
> 
> Signed-off-by: Kazunori MIYAZAWA <kazunori@miyazawa.org>

Applied, thanks!

Re: [PATCH][KEY] fix bug in spdadd

[David Miller]

From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Date: Fri, 15 Feb 2008 01:54:05 +1100 (EST)

> [PATCH] [XFRM]: Avoid bogus BUG() when throwing new policy away.
> 
> When we destory a new policy entry, we need to tell
> xfrm_policy_destroy() explicitly that the entry is not
> alive yet.

Applied.

Please provide a proper Signed-off-by: next time.

Thank you!