Commit c2546372 authored by Mathias Krause's avatar Mathias Krause Committed by David S. Miller
Browse files

xfrm_user: return error pointer instead of NULL #2

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: default avatarMathias Krause <>
Acked-by: default avatarSteffen Klassert <>
Signed-off-by: default avatarDavid S. Miller <>
parent 864745d2
......@@ -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;
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) {
return NULL;
return ERR_PTR(err);
return skb;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment