Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb5d5829 authored by Sergey Vlasov's avatar Sergey Vlasov Committed by Dmitry Torokhov
Browse files

Input: psmouse - fix attribute access on 64-bit systems 



psmouse_show_int_attr() and psmouse_set_int_attr() were accessing
unsigned int fields as unsigned long, which gave garbage on x86_64.

Signed-off-by: default avatarSergey Vlasov <vsu@altlinux.ru>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 72155615

drivers/input/mouse/psmouse-base.c

+6 −3
Original line number Diff line number Diff line
@@ -1349,14 +1349,14 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev 


static ssize_t psmouse_show_int_attr(struct psmouse *psmouse, void *offset, char *buf)

{

	unsigned long *field = (unsigned long *)((char *)psmouse + (size_t)offset);

	unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);



	return sprintf(buf, "%lu\n", *field);

	return sprintf(buf, "%u\n", *field);

}



static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const char *buf, size_t count)

{

	unsigned long *field = (unsigned long *)((char *)psmouse + (size_t)offset);

	unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);

	unsigned long value;

	char *rest;
@@ -1364,6 +1364,9 @@ static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const 
	if (*rest)

		return -EINVAL;



	if ((unsigned int)value != value)

		return -EINVAL;



	*field = value;



	return count;