Commit 664088f8 authored May 31, 2018 by Alexander Duyck Committed by David S. Miller May 31, 2018

net-sysfs: Fix memory leak in XPS configuration



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: 184c449f ("net: Add support for XPS with QoS via traffic classes")
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 16e6653c

net/core/net-sysfs.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1214,9 +1214,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) {
		@@ -1226,6 +1223,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) {