Skip to content

Commit 10e4ea7

Browse files
tomratbertdavem330
authored andcommitted
net: Fix race condition in store_rps_map
There is a race condition in store_rps_map that allows jump label count in rps_needed to go below zero. This can happen when concurrently attempting to set and a clear map. Scenario: 1. rps_needed count is zero 2. New map is assigned by setting thread, but rps_needed count _not_ yet incremented (rps_needed count still zero) 2. Map is cleared by second thread, old_map set to that just assigned 3. Second thread performs static_key_slow_dec, rps_needed count now goes negative Fix is to increment or decrement rps_needed under the spinlock. Signed-off-by: Tom Herbert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e05176a commit 10e4ea7

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

net/core/net-sysfs.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -726,14 +726,17 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
726726
old_map = rcu_dereference_protected(queue->rps_map,
727727
lockdep_is_held(&rps_map_lock));
728728
rcu_assign_pointer(queue->rps_map, map);
729-
spin_unlock(&rps_map_lock);
730729

731730
if (map)
732731
static_key_slow_inc(&rps_needed);
733-
if (old_map) {
734-
kfree_rcu(old_map, rcu);
732+
if (old_map)
735733
static_key_slow_dec(&rps_needed);
736-
}
734+
735+
spin_unlock(&rps_map_lock);
736+
737+
if (old_map)
738+
kfree_rcu(old_map, rcu);
739+
737740
free_cpumask_var(mask);
738741
return len;
739742
}

0 commit comments

Comments
 (0)