diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2013-02-22 06:38:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-22 15:10:19 -0500 |
| commit | 2bb60cb9b7b997bdbc7fd6c8001dcca02a4ea2e1 (patch) | |
| tree | d84023f594ef132cb3823080bf9a8f6a406b92b6 /net | |
| parent | 5b0520425e5ea81ba95ec486dd6bbb59a09fff0e (diff) | |
| download | op-kernel-dev-2bb60cb9b7b997bdbc7fd6c8001dcca02a4ea2e1.zip op-kernel-dev-2bb60cb9b7b997bdbc7fd6c8001dcca02a4ea2e1.tar.gz | |
net: Fix locking bug in netif_set_xps_queue
Smatch found a locking bug in netif_set_xps_queue in which we were not
releasing the lock in the case of an allocation failure.
This change corrects that so that we release the xps_map_mutex before
returning -ENOMEM in the case of an allocation failure.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 17bc535..18d8b5a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1882,8 +1882,10 @@ int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, u16 index) if (!new_dev_maps) new_dev_maps = kzalloc(maps_sz, GFP_KERNEL); - if (!new_dev_maps) + if (!new_dev_maps) { + mutex_unlock(&xps_map_mutex); return -ENOMEM; + } map = dev_maps ? xmap_dereference(dev_maps->cpu_map[cpu]) : NULL; |
