From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 19 Sep 2019 21:09:14 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.4.194~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d5ddb5cab6c4998ce99da7547c383621ff9fab1;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	media-technisat-usb2-break-out-of-loop-at-end-of-buffer.patch
---

diff --git a/queue-4.14/media-technisat-usb2-break-out-of-loop-at-end-of-buffer.patch b/queue-4.14/media-technisat-usb2-break-out-of-loop-at-end-of-buffer.patch
new file mode 100644
index 00000000000..f31cb033642
--- /dev/null
+++ b/queue-4.14/media-technisat-usb2-break-out-of-loop-at-end-of-buffer.patch
@@ -0,0 +1,72 @@
+From 0c4df39e504bf925ab666132ac3c98d6cbbe380b Mon Sep 17 00:00:00 2001
+From: Sean Young <sean@mess.org>
+Date: Wed, 3 Jul 2019 10:52:39 -0400
+Subject: media: technisat-usb2: break out of loop at end of buffer
+
+From: Sean Young <sean@mess.org>
+
+commit 0c4df39e504bf925ab666132ac3c98d6cbbe380b upstream.
+
+Ensure we do not access the buffer beyond the end if no 0xff byte
+is encountered.
+
+Reported-by: syzbot+eaaaf38a95427be88f4b@syzkaller.appspotmail.com
+Signed-off-by: Sean Young <sean@mess.org>
+Reviewed-by: Kees Cook <keescook@chromium.org>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/usb/dvb-usb/technisat-usb2.c |   22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
++++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
+@@ -607,10 +607,9 @@ static int technisat_usb2_frontend_attac
+ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
+ {
+ 	struct technisat_usb2_state *state = d->priv;
+-	u8 *buf = state->buf;
+-	u8 *b;
+-	int ret;
+ 	struct ir_raw_event ev;
++	u8 *buf = state->buf;
++	int i, ret;
+ 
+ 	buf[0] = GET_IR_DATA_VENDOR_REQUEST;
+ 	buf[1] = 0x08;
+@@ -646,26 +645,25 @@ unlock:
+ 		return 0; /* no key pressed */
+ 
+ 	/* decoding */
+-	b = buf+1;
+ 
+ #if 0
+ 	deb_rc("RC: %d ", ret);
+-	debug_dump(b, ret, deb_rc);
++	debug_dump(buf + 1, ret, deb_rc);
+ #endif
+ 
+ 	ev.pulse = 0;
+-	while (1) {
+-		ev.pulse = !ev.pulse;
+-		ev.duration = (*b * FIRMWARE_CLOCK_DIVISOR * FIRMWARE_CLOCK_TICK) / 1000;
+-		ir_raw_event_store(d->rc_dev, &ev);
+-
+-		b++;
+-		if (*b == 0xff) {
++	for (i = 1; i < ARRAY_SIZE(state->buf); i++) {
++		if (buf[i] == 0xff) {
+ 			ev.pulse = 0;
+ 			ev.duration = 888888*2;
+ 			ir_raw_event_store(d->rc_dev, &ev);
+ 			break;
+ 		}
++
++		ev.pulse = !ev.pulse;
++		ev.duration = (buf[i] * FIRMWARE_CLOCK_DIVISOR *
++			       FIRMWARE_CLOCK_TICK) / 1000;
++		ir_raw_event_store(d->rc_dev, &ev);
+ 	}
+ 
+ 	ir_raw_event_handle(d->rc_dev);
diff --git a/queue-4.14/series b/queue-4.14/series
index dd53ab1a063..ffc2518d3c0 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -56,3 +56,4 @@ floppy-fix-usercopy-direction.patch
 binfmt_elf-move-brk-out-of-mmap-when-doing-direct-loader-exec.patch
 tcp-reset-send_head-when-removing-skb-from-write-queue.patch
 tcp-don-t-dequeue-syn-fin-segments-from-write-queue.patch
+media-technisat-usb2-break-out-of-loop-at-end-of-buffer.patch