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

Commit b784cfce authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

[media] IR/streamzap: fix usec to nsec conversion 



There is an integer overflow here because 0x03000000 * 1000 is too large
for 31 bits.

rawir.duration should be in terms of nsecs.
IR_MAX_DURATION and 0x03000000 are already in terms of nsecs.
STREAMZAP_TIMEOUT and STREAMZAP_RESOLUTION are 255 and 256 respectively
and are in terms of usecs.

The original code had a deadline of 1.005 seconds and the new code has a
deadline of .065 seconds.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b768d47e

drivers/media/IR/streamzap.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -221,7 +221,7 @@ static void streamzap_callback(struct urb *urb) 
	struct streamzap_ir *sz;

	struct streamzap_ir *sz;

	unsigned int i;

	unsigned int i;

	int len;

	int len;

	static int timeout = (((SZ_TIMEOUT * SZ_RESOLUTION) &

	static int timeout = (((SZ_TIMEOUT * SZ_RESOLUTION * 1000) &

				IR_MAX_DURATION) | 0x03000000);

				IR_MAX_DURATION) | 0x03000000);





	if (!urb)

	if (!urb)
@@ -273,7 +273,7 @@ static void streamzap_callback(struct urb *urb) 
				struct ir_raw_event rawir;

				struct ir_raw_event rawir;





				rawir.pulse = false;

				rawir.pulse = false;

				rawir.duration = timeout * 1000;

				rawir.duration = timeout;

				sz->idle = true;

				sz->idle = true;

				if (sz->timeout_enabled)

				if (sz->timeout_enabled)

					sz_push(sz, rawir);

					sz_push(sz, rawir);