| From 447cf6908168511791eee017496236d39b2164ec Mon Sep 17 00:00:00 2001 |
| From: Mathias Krause <minipli@googlemail.com> |
| Date: Fri, 14 Sep 2012 09:58:32 +0000 |
| Subject: [PATCH] xfrm_user: return error pointer instead of NULL #2 |
| |
| commit c25463722509fef0ed630b271576a8c9a70236f3 upstream. |
| |
| 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 <minipli@googlemail.com> |
| Acked-by: Steffen Klassert <steffen.klassert@secunet.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| 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 bbc09e0c1ae7..88c6c8d59d79 100644 |
| --- a/net/xfrm/xfrm_user.c |
| +++ b/net/xfrm/xfrm_user.c |
| @@ -1435,6 +1435,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) |
| @@ -1445,9 +1446,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.8.5.2 |
| |