diff options
| author | Al Viro <[email protected]> | 2015-12-24 05:06:05 +0000 |
|---|---|---|
| committer | Al Viro <[email protected]> | 2016-01-04 15:26:58 +0000 |
| commit | 16e5c1fc36040e592128a164499bc25eb138a80f (patch) | |
| tree | a080bd2eea306d5815c5a9eefb46180e2bedffb2 /fs/cachefiles/daemon.c | |
| parent | Merge branch 'memdup_user_nul' into work.misc (diff) | |
| download | kernel-16e5c1fc36040e592128a164499bc25eb138a80f.tar.gz kernel-16e5c1fc36040e592128a164499bc25eb138a80f.zip | |
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 <[email protected]>
Diffstat (limited to 'fs/cachefiles/daemon.c')
| -rw-r--r-- | fs/cachefiles/daemon.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c index f601def05bdf..452e98dd7560 100644 --- a/fs/cachefiles/daemon.c +++ b/fs/cachefiles/daemon.c @@ -226,15 +226,9 @@ static ssize_t cachefiles_daemon_write(struct file *file, return -EOPNOTSUPP; /* drag the command string into the kernel so we can parse it */ - data = kmalloc(datalen + 1, GFP_KERNEL); - if (!data) - return -ENOMEM; - - ret = -EFAULT; - if (copy_from_user(data, _data, datalen) != 0) - goto error; - - data[datalen] = '\0'; + data = memdup_user_nul(_data, datalen); + if (IS_ERR(data)) + return PTR_ERR(data); ret = -EINVAL; if (memchr(data, '\0', datalen)) |