summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-09-05 09:09:28 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-21 09:23:04 -0800
commitc8e0fd4818f29aaafafb01f0bacf376b86e82830 (patch)
tree73abe778ca1a024c1ef1fa86b06dce02fe3517e3
parent215894c980ccbc13d3ca8333cf329f305e6014d8 (diff)
downloadlinux-stable-c8e0fd4818f29aaafafb01f0bacf376b86e82830.tar.gz
linux-stable-c8e0fd4818f29aaafafb01f0bacf376b86e82830.tar.bz2
linux-stable-c8e0fd4818f29aaafafb01f0bacf376b86e82830.zip
media: ttusb-dec: buffer overflow in ioctl
commit f2e323ec96077642d397bb1c355def536d489d16 upstream. We need to add a limit check here so we don't overflow the buffer. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/media/usb/ttusb-dec/ttusbdecfe.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/usb/ttusb-dec/ttusbdecfe.c b/drivers/media/usb/ttusb-dec/ttusbdecfe.c
index 5c45c9d0712d..9c29552aedec 100644
--- a/drivers/media/usb/ttusb-dec/ttusbdecfe.c
+++ b/drivers/media/usb/ttusb-dec/ttusbdecfe.c
@@ -156,6 +156,9 @@ static int ttusbdecfe_dvbs_diseqc_send_master_cmd(struct dvb_frontend* fe, struc
0x00, 0x00, 0x00, 0x00,
0x00, 0x00 };
+ if (cmd->msg_len > sizeof(b) - 4)
+ return -EINVAL;
+
memcpy(&b[4], cmd->msg, cmd->msg_len);
state->config->send_command(fe, 0x72,