diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-24 08:06:05 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-04 18:26:58 +0300 |
| commit | 16e5c1fc36040e592128a164499bc25eb138a80f (patch) | |
| tree | a080bd2eea306d5815c5a9eefb46180e2bedffb2 /drivers/sbus/char/openprom.c | |
| parent | 7e935c7ca1e6c398f11edac5beabfc4348e3b3a4 (diff) | |
| download | linux-16e5c1fc36040e592128a164499bc25eb138a80f.tar.xz | |
convert a bunch of open-coded instances of memdup_user_nul()
A _lot_ of ->write() instances were open-coding it; some are
converted to memdup_user_nul(), a lot more remain...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/sbus/char/openprom.c')
| -rw-r--r-- | drivers/sbus/char/openprom.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 5843288f64bc..e077ebd89319 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c @@ -390,16 +390,9 @@ static int copyin_string(char __user *user, size_t len, char **ptr) if ((ssize_t)len < 0 || (ssize_t)(len + 1) < 0) return -EINVAL; - tmp = kmalloc(len + 1, GFP_KERNEL); - if (!tmp) - return -ENOMEM; - - if (copy_from_user(tmp, user, len)) { - kfree(tmp); - return -EFAULT; - } - - tmp[len] = '\0'; + tmp = memdup_user_nul(user, len); + if (IS_ERR(tmp)) + return PTR_ERR(tmp); *ptr = tmp; |