Skip to content

Commit bff1709

Browse files
pandayeahStefan-Schmidt
authored andcommitted
mac802154: Fix potential RCU dereference issue in mac802154_scan_worker
In the `mac802154_scan_worker` function, the `scan_req->type` field was accessed after the RCU read-side critical section was unlocked. According to RCU usage rules, this is illegal and can lead to unpredictable behavior, such as accessing memory that has been updated or causing use-after-free issues. This possible bug was identified using a static analysis tool developed by myself, specifically designed to detect RCU-related issues. To address this, the `scan_req->type` value is now stored in a local variable `scan_req_type` while still within the RCU read-side critical section. The `scan_req_type` is then used after the RCU lock is released, ensuring that the type value is safely accessed without violating RCU rules. Fixes: e2c3e6f ("mac802154: Handle active scanning") Cc: [email protected] Signed-off-by: Jiawei Ye <[email protected]> Acked-by: Miquel Raynal <[email protected]> Reviewed-by: Przemek Kitszel <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Stefan Schmidt <[email protected]>
1 parent addf897 commit bff1709

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

net/mac802154/scan.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ void mac802154_scan_worker(struct work_struct *work)
176176
struct ieee802154_local *local =
177177
container_of(work, struct ieee802154_local, scan_work.work);
178178
struct cfg802154_scan_request *scan_req;
179+
enum nl802154_scan_types scan_req_type;
179180
struct ieee802154_sub_if_data *sdata;
180181
unsigned int scan_duration = 0;
181182
struct wpan_phy *wpan_phy;
@@ -209,6 +210,7 @@ void mac802154_scan_worker(struct work_struct *work)
209210
}
210211

211212
wpan_phy = scan_req->wpan_phy;
213+
scan_req_type = scan_req->type;
212214
scan_req_duration = scan_req->duration;
213215

214216
/* Look for the next valid chan */
@@ -246,7 +248,7 @@ void mac802154_scan_worker(struct work_struct *work)
246248
goto end_scan;
247249
}
248250

249-
if (scan_req->type == NL802154_SCAN_ACTIVE) {
251+
if (scan_req_type == NL802154_SCAN_ACTIVE) {
250252
ret = mac802154_transmit_beacon_req(local, sdata);
251253
if (ret)
252254
dev_err(&sdata->dev->dev,

0 commit comments

Comments
 (0)