diff options
| author |   Niels Dossche <niels.dossche@ugent.be> | 2022-02-13 00:14:30 +0100 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2022-03-04 16:30:58 +0100 |
| commit | 4bd80d7a4039ac605a1e9ae767d2b01dbfc9b61e (patch) | |
| tree | d648fcbfee8696d8a0a4b6f0bf8f16cf600dcf25 /net/bluetooth/mgmt.c | |
| parent | Bluetooth: hci_event: Add missing locking on hdev in hci_le_ext_adv_term_evt (diff) | |
| download | linux-dev-4bd80d7a4039ac605a1e9ae767d2b01dbfc9b61e.tar.xz linux-dev-4bd80d7a4039ac605a1e9ae767d2b01dbfc9b61e.zip | |
Bluetooth: move adv_instance_cnt read within the device lock
The field adv_instance_cnt is always accessed within a device lock,
except in the function add_advertising. A concurrent remove of an
advertisement with adding another one could result in the if check
"if a new instance was actually added" to not trigger, resulting
in not triggering the "advertising added event".
Signed-off-by: Niels Dossche <niels.dossche@ugent.be>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 89b1c0488527..68ce7dcff0e3 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -8079,7 +8079,7 @@ static int add_advertising(struct sock *sk, struct hci_dev *hdev, u32 flags; u8 status; u16 timeout, duration; - unsigned int prev_instance_cnt = hdev->adv_instance_cnt; + unsigned int prev_instance_cnt; u8 schedule_instance = 0; struct adv_info *next_instance; int err; @@ -8130,6 +8130,8 @@ static int add_advertising(struct sock *sk, struct hci_dev *hdev, goto unlock; } + prev_instance_cnt = hdev->adv_instance_cnt; + err = hci_add_adv_instance(hdev, cp->instance, flags, cp->adv_data_len, cp->data, cp->scan_rsp_len, |