This is a note to let you know that I've just added the patch titled
xfrm_user: return error pointer instead of NULL #2
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xfrm_user-return-error-pointer-instead-of-null-2.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From eba2ba4a166058cdf0ff8e19780e8274a9faf2cf Mon Sep 17 00:00:00 2001
From: Mathias Krause <[email protected]>
Date: Fri, 14 Sep 2012 09:58:32 +0000
Subject: xfrm_user: return error pointer instead of NULL #2
From: Mathias Krause <[email protected]>
[ Upstream commit c25463722509fef0ed630b271576a8c9a70236f3 ]
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.
Signed-off-by: Mathias Krause <[email protected]>
Acked-by: Steffen Klassert <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/xfrm/xfrm_user.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1531,6 +1531,7 @@ static struct sk_buff *xfrm_policy_netli
{
struct xfrm_dump_info info;
struct sk_buff *skb;
+ int err;
skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!skb)
@@ -1541,9 +1542,10 @@ static struct sk_buff *xfrm_policy_netli
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;
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/xfrm_user-return-error-pointer-instead-of-null-2.patch
queue-3.0/xfrm_user-ensure-user-supplied-esn-replay-window-is-valid.patch
queue-3.0/xfrm_user-don-t-copy-esn-replay-window-twice-for-new-states.patch
queue-3.0/xfrm_user-fix-info-leak-in-copy_to_user_tmpl.patch
queue-3.0/xfrm_user-fix-info-leak-in-copy_to_user_auth.patch
queue-3.0/xfrm_user-return-error-pointer-instead-of-null.patch
queue-3.0/xfrm_user-fix-info-leak-in-copy_to_user_policy.patch
queue-3.0/xfrm_user-fix-info-leak-in-copy_to_user_state.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
