Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / media / firewire / firedtv-avc.c

diff --git a/drivers/media/firewire/firedtv-avc.c b/drivers/media/firewire/firedtv-avc.c
index d1a1a13..251a556 100644 (file)
--- a/drivers/media/firewire/firedtv-avc.c
+++ b/drivers/media/firewire/firedtv-avc.c
@@ -1157,6 +1157,10 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length)
                if (pmt_cmd_id != 1 && pmt_cmd_id != 4)
                        dev_err(fdtv->device,
                                "invalid pmt_cmd_id %d\n", pmt_cmd_id);
+               if (program_info_length > sizeof(c->operand) - 4 - write_pos) {
+                       ret = -EINVAL;
+                       goto out;
+               }
 
                memcpy(&c->operand[write_pos], &msg[read_pos],
                       program_info_length);
@@ -1180,6 +1184,12 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length)
                                dev_err(fdtv->device, "invalid pmt_cmd_id %d "
                                        "at stream level\n", pmt_cmd_id);
 
+                       if (es_info_length > sizeof(c->operand) - 4 -
+                                            write_pos) {
+                               ret = -EINVAL;
+                               goto out;
+                       }
+
                        memcpy(&c->operand[write_pos], &msg[read_pos],
                               es_info_length);
                        read_pos += es_info_length;