Skip to content

Commit f051ae4

Browse files
arndbdtor
authored andcommitted
Input: cyapa_gen6 - fix out-of-bounds stack access
gcc -Warray-bounds warns about a serious bug in cyapa_pip_retrieve_data_structure: drivers/input/mouse/cyapa_gen6.c: In function 'cyapa_pip_retrieve_data_structure.constprop': include/linux/unaligned/access_ok.h:40:17: warning: array subscript -1 is outside array bounds of 'struct retrieve_data_struct_cmd[1]' [-Warray-bounds] 40 | *((__le16 *)p) = cpu_to_le16(val); drivers/input/mouse/cyapa_gen6.c:569:13: note: while referencing 'cmd' 569 | } __packed cmd; | ^~~ Apparently the '-2' was added to the pointer instead of the value, writing garbage into the stack next to this variable. Fixes: c2c06c4 ("Input: cyapa - add gen6 device module support") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/20201026161332.3708389-1-arnd@kernel.org Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 3993a1a commit f051ae4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/input/mouse/cyapa_gen6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ static int cyapa_pip_retrieve_data_structure(struct cyapa *cyapa,
573573

574574
memset(&cmd, 0, sizeof(cmd));
575575
put_unaligned_le16(PIP_OUTPUT_REPORT_ADDR, &cmd.head.addr);
576-
put_unaligned_le16(sizeof(cmd), &cmd.head.length - 2);
576+
put_unaligned_le16(sizeof(cmd) - 2, &cmd.head.length);
577577
cmd.head.report_id = PIP_APP_CMD_REPORT_ID;
578578
cmd.head.cmd_code = PIP_RETRIEVE_DATA_STRUCTURE;
579579
put_unaligned_le16(read_offset, &cmd.read_offset);

0 commit comments

Comments
 (0)