]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: iwlegacy: add missing mutex protection in il3945_store_measurement()
authorZiyi Guo <n7l8m4@u.northwestern.edu>
Sun, 25 Jan 2026 19:30:05 +0000 (19:30 +0000)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 27 Jan 2026 12:51:54 +0000 (13:51 +0100)
il3945_store_measurement() calls il3945_get_measurement() which internally
calls il_send_cmd_sync() without holding il->mutex. However,
il_send_cmd_sync() has lockdep_assert_held(&il->mutex) indicating that
callers must hold this lock.

Other sysfs store functions in the same file properly acquire the mutex:
- il3945_store_flags() acquires mutex at 3945-mac.c:3110
- il3945_store_filter_flags() acquires mutex at 3945-mac.c:3144

Add mutex_lock()/mutex_unlock() around the il3945_get_measurement() call
in the sysfs store function to fix the missing lock protection.

Signed-off-by: Ziyi Guo <n7l8m4@u.northwestern.edu>
Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
Link: https://patch.msgid.link/20260125193005.1090429-1-n7l8m4@u.northwestern.edu
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlegacy/3945-mac.c

index 104748fcdc33e967bee00171cf3debaf8a7d4487..54991f31c52c5684fd141723b1b7998d56199959 100644 (file)
@@ -3224,7 +3224,9 @@ il3945_store_measurement(struct device *d, struct device_attribute *attr,
 
        D_INFO("Invoking measurement of type %d on " "channel %d (for '%s')\n",
               type, params.channel, buf);
+       mutex_lock(&il->mutex);
        il3945_get_measurement(il, &params, type);
+       mutex_unlock(&il->mutex);
 
        return count;
 }