From: Alexander Duyck Date: Thu, 31 May 2018 19:59:46 +0000 (-0400) Subject: net-sysfs: Fix memory leak in XPS configuration X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0dbd822f64401cbdef40e9e476e89f67c690be64;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git net-sysfs: Fix memory leak in XPS configuration [ Upstream commit 664088f8d68178809b848ca450f2797efb34e8e7 ] This patch reorders the error cases in showing the XPS configuration so that we hold off on memory allocation until after we have verified that we can support XPS on a given ring. Fixes: 184c449f91fe ("net: Add support for XPS with QoS via traffic classes") Signed-off-by: Alexander Duyck Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 927a6dcbad96..8f17724a173c 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1207,9 +1207,6 @@ static ssize_t xps_cpus_show(struct netdev_queue *queue, cpumask_var_t mask; unsigned long index; - if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) - return -ENOMEM; - index = get_netdev_queue_index(queue); if (dev->num_tc) { @@ -1219,6 +1216,9 @@ static ssize_t xps_cpus_show(struct netdev_queue *queue, return -EINVAL; } + if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) + return -ENOMEM; + rcu_read_lock(); dev_maps = rcu_dereference(dev->xps_maps); if (dev_maps) {