Commit 1ff89e06 authored by Daniel J. Ogorchock's avatar Daniel J. Ogorchock Committed by Jiri Kosina
Browse files

HID: nintendo: fix rumble worker null pointer deref 



We can dereference a null pointer trying to queue work to a destroyed
workqueue.

If the device is disconnected, nintendo_hid_remove is called, in which
the rumble_queue is destroyed. Avoid using that queue to defer rumble
work once the controller state is set to JOYCON_CTLR_STATE_REMOVED.

This eliminates the null pointer dereference.

Signed-off-by: default avatarDaniel J. Ogorchock <djogorchock@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 467249a7

drivers/hid/hid-nintendo.c

+4 −2
Original line number Diff line number Diff line
@@ -1221,6 +1221,7 @@ static void joycon_parse_report(struct joycon_ctlr *ctlr, 


	spin_lock_irqsave(&ctlr->lock, flags);

	if (IS_ENABLED(CONFIG_NINTENDO_FF) && rep->vibrator_report &&

	    ctlr->ctlr_state != JOYCON_CTLR_STATE_REMOVED &&

	    (msecs - ctlr->rumble_msecs) >= JC_RUMBLE_PERIOD_MS &&

	    (ctlr->rumble_queue_head != ctlr->rumble_queue_tail ||

	     ctlr->rumble_zero_countdown > 0)) {
@@ -1545,12 +1546,13 @@ static int joycon_set_rumble(struct joycon_ctlr *ctlr, u16 amp_r, u16 amp_l, 
		ctlr->rumble_queue_head = 0;

	memcpy(ctlr->rumble_data[ctlr->rumble_queue_head], data,

	       JC_RUMBLE_DATA_SIZE);

	spin_unlock_irqrestore(&ctlr->lock, flags);



	/* don't wait for the periodic send (reduces latency) */

	if (schedule_now)

	if (schedule_now && ctlr->ctlr_state != JOYCON_CTLR_STATE_REMOVED)

		queue_work(ctlr->rumble_queue, &ctlr->rumble_worker);



	spin_unlock_irqrestore(&ctlr->lock, flags);



	return 0;

}