Commit 94109c9f authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.3/asus' into for-linus 

UAF protection in work struct (Pietro Borrello)
parents 06db2af3 4ab3a086

drivers/hid/hid-asus.c

+32 −5
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ struct asus_kbd_leds { 
	struct hid_device *hdev;

	struct work_struct work;

	unsigned int brightness;

	spinlock_t lock;

	bool removed;

};
@@ -490,21 +491,42 @@ static int rog_nkey_led_init(struct hid_device *hdev) 
	return ret;

}



static void asus_schedule_work(struct asus_kbd_leds *led)

{

	unsigned long flags;



	spin_lock_irqsave(&led->lock, flags);

	if (!led->removed)

		schedule_work(&led->work);

	spin_unlock_irqrestore(&led->lock, flags);

}



static void asus_kbd_backlight_set(struct led_classdev *led_cdev,

				   enum led_brightness brightness)

{

	struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds,

						 cdev);

	unsigned long flags;



	spin_lock_irqsave(&led->lock, flags);

	led->brightness = brightness;

	schedule_work(&led->work);

	spin_unlock_irqrestore(&led->lock, flags);



	asus_schedule_work(led);

}



static enum led_brightness asus_kbd_backlight_get(struct led_classdev *led_cdev)

{

	struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds,

						 cdev);

	enum led_brightness brightness;

	unsigned long flags;



	spin_lock_irqsave(&led->lock, flags);

	brightness = led->brightness;

	spin_unlock_irqrestore(&led->lock, flags);



	return led->brightness;

	return brightness;

}



static void asus_kbd_backlight_work(struct work_struct *work)
@@ -512,11 +534,11 @@ static void asus_kbd_backlight_work(struct work_struct *work) 
	struct asus_kbd_leds *led = container_of(work, struct asus_kbd_leds, work);

	u8 buf[] = { FEATURE_KBD_REPORT_ID, 0xba, 0xc5, 0xc4, 0x00 };

	int ret;

	unsigned long flags;



	if (led->removed)

		return;



	spin_lock_irqsave(&led->lock, flags);

	buf[4] = led->brightness;

	spin_unlock_irqrestore(&led->lock, flags);



	ret = asus_kbd_set_report(led->hdev, buf, sizeof(buf));

	if (ret < 0)
@@ -584,6 +606,7 @@ static int asus_kbd_register_leds(struct hid_device *hdev) 
	drvdata->kbd_backlight->cdev.brightness_set = asus_kbd_backlight_set;

	drvdata->kbd_backlight->cdev.brightness_get = asus_kbd_backlight_get;

	INIT_WORK(&drvdata->kbd_backlight->work, asus_kbd_backlight_work);

	spin_lock_init(&drvdata->kbd_backlight->lock);



	ret = devm_led_classdev_register(&hdev->dev, &drvdata->kbd_backlight->cdev);

	if (ret < 0) {
@@ -1119,9 +1142,13 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) 
static void asus_remove(struct hid_device *hdev)

{

	struct asus_drvdata *drvdata = hid_get_drvdata(hdev);

	unsigned long flags;



	if (drvdata->kbd_backlight) {

		spin_lock_irqsave(&drvdata->kbd_backlight->lock, flags);

		drvdata->kbd_backlight->removed = true;

		spin_unlock_irqrestore(&drvdata->kbd_backlight->lock, flags);



		cancel_work_sync(&drvdata->kbd_backlight->work);

	}