diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-22 11:15:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-22 12:51:05 +0000 |
| commit | 28aa2be47924f6b971a6d323b3b4083228c8214f (patch) | |
| tree | 0a8b1ee3d68f262338fb2e9e17badc3557f4f8c4 /drivers/media/usb/ttusb-dec/ttusbdecfe.c | |
| parent | a6b8ad1106ba7e875e1ea94657f19eb0636ce0b2 (diff) | |
| parent | 1f0f80ecae848b0ca2ca632e94568721494f09f0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.11
Conflicts:
include/linux/radix-tree.h
kernel/rcu/tree.c
mm/filemap.c
mm/page_alloc.c
Diffstat (limited to 'drivers/media/usb/ttusb-dec/ttusbdecfe.c')
| -rw-r--r-- | drivers/media/usb/ttusb-dec/ttusbdecfe.c | 3 |
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, |