From: Herbert Xu Date: Mon, 16 May 2016 09:28:16 +0000 (+0800) Subject: netlink: Fix dump skb leak/double free X-Git-Tag: v3.16.37~216 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed8ab6b2bb3f3714dad70216b94e1bb8bc8df223;p=thirdparty%2Fkernel%2Fstable.git netlink: Fix dump skb leak/double free commit 92964c79b357efd980812c4de5c1fd2ec8bb5520 upstream. 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: 16b304f3404f ("netlink: Eliminate kmalloc in netlink dump operation.") Reported-by: Baozeng Ding Signed-off-by: Herbert Xu Acked-by: Cong Wang Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 46cac8e31a16c..24876492f26ab 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2693,6 +2693,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; @@ -2773,9 +2774,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: