Commit 2dcb7291 authored by Vegard Nossum's avatar Vegard Nossum Committed by Ben Hutchings

xfrm: fix crash in XFRM_MSG_GETSA netlink handler

commit 1ba5bf99 upstream.

If we hit any of the error conditions inside xfrm_dump_sa(), then
xfrm_state_walk_init() never gets called. However, we still call
xfrm_state_walk_done() from xfrm_dump_sa_done(), which will crash
because the state walk was never initialized properly.

We can fix this by setting cb->args[0] only after we've processed the
first element and checking this before calling xfrm_state_walk_done().

Fixes: d3623099 ("ipsec: add support of limited SA dump")
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarVegard Nossum <vegard.nossum@oracle.com>
Acked-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 2d6f94eb
...@@ -869,7 +869,8 @@ static int xfrm_dump_sa_done(struct netlink_callback *cb) ...@@ -869,7 +869,8 @@ static int xfrm_dump_sa_done(struct netlink_callback *cb)
struct sock *sk = cb->skb->sk; struct sock *sk = cb->skb->sk;
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
xfrm_state_walk_done(walk, net); if (cb->args[0])
xfrm_state_walk_done(walk, net);
return 0; return 0;
} }
...@@ -894,8 +895,6 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -894,8 +895,6 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
u8 proto = 0; u8 proto = 0;
int err; int err;
cb->args[0] = 1;
err = nlmsg_parse(cb->nlh, 0, attrs, XFRMA_MAX, err = nlmsg_parse(cb->nlh, 0, attrs, XFRMA_MAX,
xfrma_policy); xfrma_policy);
if (err < 0) if (err < 0)
...@@ -914,6 +913,7 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -914,6 +913,7 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
proto = nla_get_u8(attrs[XFRMA_PROTO]); proto = nla_get_u8(attrs[XFRMA_PROTO]);
xfrm_state_walk_init(walk, proto, filter); xfrm_state_walk_init(walk, proto, filter);
cb->args[0] = 1;
} }
(void) xfrm_state_walk(net, walk, dump_one_state, &info); (void) xfrm_state_walk(net, walk, dump_one_state, &info);
......
Markdown is supported
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