OSDN Git Service

HID: wacom: Correct NULL dereference on AES pen proximity
authorJason Gerecke <killertofu@gmail.com>
Thu, 21 Jan 2021 18:46:49 +0000 (10:46 -0800)
committerJiri Kosina <jkosina@suse.cz>
Tue, 26 Jan 2021 10:53:53 +0000 (11:53 +0100)
commit179e8e47c02a1950f1c556f2b854bdb2259078fb
tree1e9f0cad76bf4e91db233051432417846ae6dcf4
parent794c613383433ffc4fceec8eaa081b9f1962e287
HID: wacom: Correct NULL dereference on AES pen proximity

The recent commit to fix a memory leak introduced an inadvertant NULL
pointer dereference. The `wacom_wac->pen_fifo` variable was never
intialized, resuling in a crash whenever functions tried to use it.
Since the FIFO is only used by AES pens (to buffer events from pen
proximity until the hardware reports the pen serial number) this would
have been easily overlooked without testing an AES device.

This patch converts `wacom_wac->pen_fifo` over to a pointer (since the
call to `devres_alloc` allocates memory for us) and ensures that we assign
it to point to the allocated and initalized `pen_fifo` before the function
returns.

Link: https://github.com/linuxwacom/input-wacom/issues/230
Fixes: 37309f47e2f5 ("HID: wacom: Fix memory leakage caused by kfifo_alloc")
CC: stable@vger.kernel.org # v4.19+
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Tested-by: Ping Cheng <ping.cheng@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_sys.c
drivers/hid/wacom_wac.h