* [PATCH] xfrm_user: return error pointer instead of NULL #2
@ 2012-09-14 19:58 Mathias Krause
2012-09-17 7:18 ` Steffen Klassert
0 siblings, 1 reply; 3+ messages in thread
From: Mathias Krause @ 2012-09-14 19:58 UTC (permalink / raw)
To: David S. Miller
Cc: Steffen Klassert, netdev, linux-kernel, Mathias Krause, stable
When dump_one_policy() returns an error, e.g. because of a too small
buffer to dump the whole xfrm policy, xfrm_policy_netlink() returns
NULL instead of an error pointer. But its caller expects an error
pointer and therefore continues to operate on a NULL skbuff.
Cc: stable@vger.kernel.org
Signed-off-by: Mathias Krause <minipli@googlemail.com>
---
Note, this is a different, but similar issue as my previous patch
with the almost same subject.
I'm not aware of a way how to exploit this bug as the policy *should*
always fit into the netlink buffer but better safe then sorry, so cc
stable.
net/xfrm/xfrm_user.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index dac08e2..d12b625 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1548,6 +1548,7 @@ static struct sk_buff *xfrm_policy_netlink(struct sk_buff *in_skb,
{
struct xfrm_dump_info info;
struct sk_buff *skb;
+ int err;
skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!skb)
@@ -1558,9 +1559,10 @@ static struct sk_buff *xfrm_policy_netlink(struct sk_buff *in_skb,
info.nlmsg_seq = seq;
info.nlmsg_flags = 0;
- if (dump_one_policy(xp, dir, 0, &info) < 0) {
+ err = dump_one_policy(xp, dir, 0, &info);
+ if (err) {
kfree_skb(skb);
- return NULL;
+ return ERR_PTR(err);
}
return skb;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] xfrm_user: return error pointer instead of NULL #2
2012-09-14 19:58 [PATCH] xfrm_user: return error pointer instead of NULL #2 Mathias Krause
@ 2012-09-17 7:18 ` Steffen Klassert
2012-09-18 20:16 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Steffen Klassert @ 2012-09-17 7:18 UTC (permalink / raw)
To: Mathias Krause; +Cc: David S. Miller, netdev, linux-kernel, stable
On Fri, Sep 14, 2012 at 09:58:32PM +0200, Mathias Krause wrote:
> When dump_one_policy() returns an error, e.g. because of a too small
> buffer to dump the whole xfrm policy, xfrm_policy_netlink() returns
> NULL instead of an error pointer. But its caller expects an error
> pointer and therefore continues to operate on a NULL skbuff.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Mathias Krause <minipli@googlemail.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] xfrm_user: return error pointer instead of NULL #2
2012-09-17 7:18 ` Steffen Klassert
@ 2012-09-18 20:16 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-09-18 20:16 UTC (permalink / raw)
To: steffen.klassert; +Cc: minipli, netdev, linux-kernel, stable
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Mon, 17 Sep 2012 09:18:53 +0200
> On Fri, Sep 14, 2012 at 09:58:32PM +0200, Mathias Krause wrote:
>> When dump_one_policy() returns an error, e.g. because of a too small
>> buffer to dump the whole xfrm policy, xfrm_policy_netlink() returns
>> NULL instead of an error pointer. But its caller expects an error
>> pointer and therefore continues to operate on a NULL skbuff.
>>
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Mathias Krause <minipli@googlemail.com>
>
> Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-18 20:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 19:58 [PATCH] xfrm_user: return error pointer instead of NULL #2 Mathias Krause
2012-09-17 7:18 ` Steffen Klassert
2012-09-18 20:16 ` David Miller
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).