From b7fcb6c2f6f3f362d52d3082d8bad8053a40fdcd Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Tue, 10 Aug 2010 18:02:04 -0700 Subject: [PATCH] --- yaml --- r: 208451 b: refs/heads/master c: 89596f20bb5f0f32c37abd337d995080e04519c8 h: refs/heads/master i: 208449: 14c03a4f175df36413308a565eb3b522656b0a19 208447: f9b09b53d7bdcc29c1dc9fe42ba3eaf869baabdf v: v3 --- [refs] | 2 +- trunk/drivers/message/i2o/i2o_config.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a89aa372fb62..719ac9ce6f91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d929dc2bfd8a58c34f1df0680018fa8ea5caa907 +refs/heads/master: 89596f20bb5f0f32c37abd337d995080e04519c8 diff --git a/trunk/drivers/message/i2o/i2o_config.c b/trunk/drivers/message/i2o/i2o_config.c index 4dd39a03082a..068ba0785bb4 100644 --- a/trunk/drivers/message/i2o/i2o_config.c +++ b/trunk/drivers/message/i2o/i2o_config.c @@ -111,9 +111,9 @@ static int i2o_cfg_gethrt(unsigned long arg) len = 8 + ((hrt->entry_len * hrt->num_entries) << 2); - /* We did a get user...so assuming mem is ok...is this bad? */ - put_user(len, kcmd.reslen); - if (len > reslen) + if (put_user(len, kcmd.reslen)) + ret = -EFAULT; + else if (len > reslen) ret = -ENOBUFS; else if (copy_to_user(kcmd.resbuf, (void *)hrt, len)) ret = -EFAULT; @@ -147,8 +147,9 @@ static int i2o_cfg_getlct(unsigned long arg) lct = (i2o_lct *) c->lct; len = (unsigned int)lct->table_size << 2; - put_user(len, kcmd.reslen); - if (len > reslen) + if (put_user(len, kcmd.reslen)) + ret = -EFAULT; + else if (len > reslen) ret = -ENOBUFS; else if (copy_to_user(kcmd.resbuf, lct, len)) ret = -EFAULT; @@ -208,8 +209,9 @@ static int i2o_cfg_parms(unsigned long arg, unsigned int type) return -EAGAIN; } - put_user(len, kcmd.reslen); - if (len > reslen) + if (put_user(len, kcmd.reslen)) + ret = -EFAULT; + else if (len > reslen) ret = -ENOBUFS; else if (copy_to_user(kcmd.resbuf, res, len)) ret = -EFAULT;