diff options
| author |   Roland Dreier <roland@purestorage.com> | 2012-07-27 13:27:45 -0700 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-07-27 13:27:45 -0700 |
| commit | 0764c76ecb06987749bce49657e473e6605f09c4 (patch) | |
| tree | a756c573941b8a533e49441fb92da49f13cc5559 /drivers/infiniband/core | |
| parent | RDMA/cma: Use PTR_RET rather than if (IS_ERR(...)) + PTR_ERR (diff) | |
| download | linux-dev-0764c76ecb06987749bce49657e473e6605f09c4.tar.xz linux-dev-0764c76ecb06987749bce49657e473e6605f09c4.zip | |
RDMA/ucma: Convert open-coded equivalent to memdup_user()
Suggested by scripts/coccinelle/api/memdup_user.cocci.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/core')
| -rw-r--r-- | drivers/infiniband/core/ucma.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c index 893cb879462c..6bf850422895 100644 --- a/drivers/infiniband/core/ucma.c +++ b/drivers/infiniband/core/ucma.c @@ -1002,23 +1002,18 @@ static ssize_t ucma_set_option(struct ucma_file *file, const char __user *inbuf, if (IS_ERR(ctx)) return PTR_ERR(ctx); - optval = kmalloc(cmd.optlen, GFP_KERNEL); - if (!optval) { - ret = -ENOMEM; - goto out1; - } - - if (copy_from_user(optval, (void __user *) (unsigned long) cmd.optval, - cmd.optlen)) { - ret = -EFAULT; - goto out2; + optval = memdup_user((void __user *) (unsigned long) cmd.optval, + cmd.optlen); + if (IS_ERR(optval)) { + ret = PTR_ERR(optval); + goto out; } ret = ucma_set_option_level(ctx, cmd.level, cmd.optname, optval, cmd.optlen); -out2: kfree(optval); -out1: + +out: ucma_put_ctx(ctx); return ret; } |