Skip to content

Commit 315c537

Browse files
pietroborrellobentiss
authored andcommitted
HID: asus: use spinlock to protect concurrent accesses
asus driver has a worker that may access data concurrently. Proct the accesses using a spinlock. Fixes: af22a61 ("HID: asus: support backlight on USB keyboards") Signed-off-by: Pietro Borrello <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Benjamin Tissoires <[email protected]>
1 parent 0b02818 commit 315c537

File tree

1 file changed

+21
-1
lines changed

1 file changed

+21
-1
lines changed

drivers/hid/hid-asus.c

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ struct asus_kbd_leds {
9898
struct hid_device *hdev;
9999
struct work_struct work;
100100
unsigned int brightness;
101+
spinlock_t lock;
101102
bool removed;
102103
};
103104

@@ -495,28 +496,42 @@ static void asus_kbd_backlight_set(struct led_classdev *led_cdev,
495496
{
496497
struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds,
497498
cdev);
499+
unsigned long flags;
500+
501+
spin_lock_irqsave(&led->lock, flags);
498502
led->brightness = brightness;
503+
spin_unlock_irqrestore(&led->lock, flags);
504+
499505
schedule_work(&led->work);
500506
}
501507

502508
static enum led_brightness asus_kbd_backlight_get(struct led_classdev *led_cdev)
503509
{
504510
struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds,
505511
cdev);
512+
enum led_brightness brightness;
513+
unsigned long flags;
506514

507-
return led->brightness;
515+
spin_lock_irqsave(&led->lock, flags);
516+
brightness = led->brightness;
517+
spin_unlock_irqrestore(&led->lock, flags);
518+
519+
return brightness;
508520
}
509521

510522
static void asus_kbd_backlight_work(struct work_struct *work)
511523
{
512524
struct asus_kbd_leds *led = container_of(work, struct asus_kbd_leds, work);
513525
u8 buf[] = { FEATURE_KBD_REPORT_ID, 0xba, 0xc5, 0xc4, 0x00 };
514526
int ret;
527+
unsigned long flags;
515528

516529
if (led->removed)
517530
return;
518531

532+
spin_lock_irqsave(&led->lock, flags);
519533
buf[4] = led->brightness;
534+
spin_unlock_irqrestore(&led->lock, flags);
520535

521536
ret = asus_kbd_set_report(led->hdev, buf, sizeof(buf));
522537
if (ret < 0)
@@ -584,6 +599,7 @@ static int asus_kbd_register_leds(struct hid_device *hdev)
584599
drvdata->kbd_backlight->cdev.brightness_set = asus_kbd_backlight_set;
585600
drvdata->kbd_backlight->cdev.brightness_get = asus_kbd_backlight_get;
586601
INIT_WORK(&drvdata->kbd_backlight->work, asus_kbd_backlight_work);
602+
spin_lock_init(&drvdata->kbd_backlight->lock);
587603

588604
ret = devm_led_classdev_register(&hdev->dev, &drvdata->kbd_backlight->cdev);
589605
if (ret < 0) {
@@ -1119,9 +1135,13 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id)
11191135
static void asus_remove(struct hid_device *hdev)
11201136
{
11211137
struct asus_drvdata *drvdata = hid_get_drvdata(hdev);
1138+
unsigned long flags;
11221139

11231140
if (drvdata->kbd_backlight) {
1141+
spin_lock_irqsave(&drvdata->kbd_backlight->lock, flags);
11241142
drvdata->kbd_backlight->removed = true;
1143+
spin_unlock_irqrestore(&drvdata->kbd_backlight->lock, flags);
1144+
11251145
cancel_work_sync(&drvdata->kbd_backlight->work);
11261146
}
11271147

0 commit comments

Comments
 (0)