* [PATCH] xfrm: fix a possible policy leak
@ 2015-05-08 9:39 roy.qing.li
2015-05-11 11:03 ` Steffen Klassert
0 siblings, 1 reply; 4+ messages in thread
From: roy.qing.li @ 2015-05-08 9:39 UTC (permalink / raw)
To: netdev; +Cc: steffen.klassert, eparis
From: Li RongQing <roy.qing.li@gmail.com>
policy should be put if exit xfrm_policy_bysel_ctx() due to the
failure of calling security_xfrm_policy_delete. since policy has
been hold before
Fixes: ef41aaa0b7 [IPSEC]: xfrm_policy delete security check misplaced
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Cc: Eric Paris <eparis@redhat.com>
---
net/xfrm/xfrm_policy.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 3d264e5..66450c3 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -824,6 +824,7 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u32 mark, u8 type,
*err = security_xfrm_policy_delete(
pol->security);
if (*err) {
+ xfrm_pol_put(pol);
write_unlock_bh(&net->xfrm.xfrm_policy_lock);
return pol;
}
@@ -863,6 +864,7 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u32 mark, u8 type,
*err = security_xfrm_policy_delete(
pol->security);
if (*err) {
+ xfrm_pol_put(pol);
write_unlock_bh(&net->xfrm.xfrm_policy_lock);
return pol;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] xfrm: fix a possible policy leak
2015-05-08 9:39 [PATCH] xfrm: fix a possible policy leak roy.qing.li
@ 2015-05-11 11:03 ` Steffen Klassert
0 siblings, 0 replies; 4+ messages in thread
From: Steffen Klassert @ 2015-05-11 11:03 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev, eparis
On Fri, May 08, 2015 at 05:39:39PM +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> policy should be put if exit xfrm_policy_bysel_ctx() due to the
> failure of calling security_xfrm_policy_delete. since policy has
> been hold before
>
> Fixes: ef41aaa0b7 [IPSEC]: xfrm_policy delete security check misplaced
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> Cc: Eric Paris <eparis@redhat.com>
> ---
> net/xfrm/xfrm_policy.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
> index 3d264e5..66450c3 100644
> --- a/net/xfrm/xfrm_policy.c
> +++ b/net/xfrm/xfrm_policy.c
> @@ -824,6 +824,7 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u32 mark, u8 type,
> *err = security_xfrm_policy_delete(
> pol->security);
> if (*err) {
> + xfrm_pol_put(pol);
> write_unlock_bh(&net->xfrm.xfrm_policy_lock);
> return pol;
> }
> @@ -863,6 +864,7 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u32 mark, u8 type,
> *err = security_xfrm_policy_delete(
> pol->security);
> if (*err) {
> + xfrm_pol_put(pol);
> write_unlock_bh(&net->xfrm.xfrm_policy_lock);
> return pol;
> }
We return this policy to the caller, so we better keep
the refcount here. The caller is responsible to drop
the refount.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xfrm: fix a possible policy leak
2015-05-08 7:13 roy.qing.li
@ 2015-05-08 9:33 ` Li RongQing
0 siblings, 0 replies; 4+ messages in thread
From: Li RongQing @ 2015-05-08 9:33 UTC (permalink / raw)
To: netdev; +Cc: Steffen Klassert, Eric Paris
On Fri, May 8, 2015 at 3:13 PM, <roy.qing.li@gmail.com> wrote:
> From: "Signed-off-by: Li RongQing" <roy.qing.li@gmail.com>
sorry, Please drop it, it has error in From
-Roy
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] xfrm: fix a possible policy leak
@ 2015-05-08 7:13 roy.qing.li
2015-05-08 9:33 ` Li RongQing
0 siblings, 1 reply; 4+ messages in thread
From: roy.qing.li @ 2015-05-08 7:13 UTC (permalink / raw)
To: netdev; +Cc: steffen.klassert, eparis
From: "Signed-off-by: Li RongQing" <roy.qing.li@gmail.com>
policy should be put if exit xfrm_policy_bysel_ctx() due to the
failure of calling security_xfrm_policy_delete. since policy has
been hold before
Fixes: ef41aaa0b7 [IPSEC]: xfrm_policy delete security check misplaced
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Cc: Eric Paris <eparis@redhat.com>
---
net/xfrm/xfrm_policy.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 3d264e5..66450c3 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -824,6 +824,7 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u32 mark, u8 type,
*err = security_xfrm_policy_delete(
pol->security);
if (*err) {
+ xfrm_pol_put(pol);
write_unlock_bh(&net->xfrm.xfrm_policy_lock);
return pol;
}
@@ -863,6 +864,7 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u32 mark, u8 type,
*err = security_xfrm_policy_delete(
pol->security);
if (*err) {
+ xfrm_pol_put(pol);
write_unlock_bh(&net->xfrm.xfrm_policy_lock);
return pol;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-05-11 11:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-08 9:39 [PATCH] xfrm: fix a possible policy leak roy.qing.li
2015-05-11 11:03 ` Steffen Klassert
-- strict thread matches above, loose matches on Subject: below --
2015-05-08 7:13 roy.qing.li
2015-05-08 9:33 ` Li RongQing
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).