Skip to content

Commit

Permalink
xfrm_user: return error pointer instead of NULL #2
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
minipli authored and davem330 committed Sep 18, 2012
1 parent 864745d commit c254637
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions net/xfrm/xfrm_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
Expand Down

0 comments on commit c254637

Please sign in to comment.