Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

[~andy/linux] / drivers / message / i2o / i2o_config.c

diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 5451beff183ffdf69e24d5d1ca016d11215882a2..a60c188c2bd937255f60f42920e4b9fbba68cb88 100644 (file)
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -687,6 +687,11 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                }
                size = size >> 16;
                size *= 4;
+               if (size > sizeof(rmsg)) {
+                       rcode = -EINVAL;
+                       goto sg_list_cleanup;
+               }
+
                /* Copy in the user's I2O command */
                if (copy_from_user(rmsg, user_msg, size)) {
                        rcode = -EFAULT;
@@ -922,6 +927,11 @@ static int i2o_cfg_passthru(unsigned long arg)
                }
                size = size >> 16;
                size *= 4;
+               if (size > sizeof(rmsg)) {
+                       rcode = -EFAULT;
+                       goto sg_list_cleanup;
+               }
+
                /* Copy in the user's I2O command */
                if (copy_from_user(rmsg, user_msg, size)) {
                        rcode = -EFAULT;