netlink: Fix dump skb leak/double free
[ Upstream commitwifi-calibration92964c79b3
] When we free cb->skb after a dump, we do it after releasing the lock. This means that a new dump could have started in the time being and we'll end up freeing their skb instead of ours. This patch saves the skb and module before we unlock so we free the right memory. Fixes:16b304f340
("netlink: Eliminate kmalloc in netlink dump operation.") Reported-by: Baozeng Ding <sploving1@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
parent
49956430d3
commit
e39cd93be0
|
@ -2683,6 +2683,7 @@ static int netlink_dump(struct sock *sk)
|
|||
struct netlink_callback *cb;
|
||||
struct sk_buff *skb = NULL;
|
||||
struct nlmsghdr *nlh;
|
||||
struct module *module;
|
||||
int len, err = -ENOBUFS;
|
||||
int alloc_min_size;
|
||||
int alloc_size;
|
||||
|
@ -2762,9 +2763,11 @@ static int netlink_dump(struct sock *sk)
|
|||
cb->done(cb);
|
||||
|
||||
nlk->cb_running = false;
|
||||
module = cb->module;
|
||||
skb = cb->skb;
|
||||
mutex_unlock(nlk->cb_mutex);
|
||||
module_put(cb->module);
|
||||
consume_skb(cb->skb);
|
||||
module_put(module);
|
||||
consume_skb(skb);
|
||||
return 0;
|
||||
|
||||
errout_skb:
|
||||
|
|
Loading…
Reference in New Issue