Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / scsi / bfa / bfad_debugfs.c

diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugfs.c
index caca9b7..c1f0e80 100644 (file)
--- a/drivers/scsi/bfa/bfad_debugfs.c
+++ b/drivers/scsi/bfa/bfad_debugfs.c
@@ -276,7 +276,8 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,
        struct bfad_s *bfad = port->bfad;
        struct bfa_s *bfa = &bfad->bfa;
        struct bfa_ioc_s *ioc = &bfa->ioc;
        struct bfad_s *bfad = port->bfad;
        struct bfa_s *bfa = &bfad->bfa;
        struct bfa_ioc_s *ioc = &bfa->ioc;

-       int addr, len, rc, i;
+       int addr, rc, i;
+       u32 len;

        u32 *regbuf;
        void __iomem *rb, *reg_addr;
        unsigned long flags;
        u32 *regbuf;
        void __iomem *rb, *reg_addr;
        unsigned long flags;


@@ -296,7 +297,7 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,
        }
 
        rc = sscanf(kern_buf, "%x:%x", &addr, &len);
        }
 
        rc = sscanf(kern_buf, "%x:%x", &addr, &len);

-       if (rc < 2) {
+       if (rc < 2 || len > (UINT_MAX >> 2)) {

                printk(KERN_INFO
                        "bfad[%d]: %s failed to read user buf\n",
                        bfad->inst_no, __func__);
                printk(KERN_INFO
                        "bfad[%d]: %s failed to read user buf\n",
                        bfad->inst_no, __func__);