aboutsummaryrefslogtreecommitdiffstats
path: root/fs/coda/psdev.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2019-07-16 19:28:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-16 22:23:23 -0400
commit4dc48193d748f0f0fbe37105a905466ff3a6ad50 (patch)
tree7547b1eff27892eef20e113d72ac5a7b4032ea40 /fs/coda/psdev.c
parent5e7c31dfe74703f428220384b2863525957cc160 (diff)
coda: get rid of CODA_ALLOC()
These days we have kvzalloc() so we can delete CODA_ALLOC(). I made a couple related changes in coda_psdev_write(). First, I added some error handling to avoid a NULL dereference if the allocation failed. Second, I used kvmalloc() instead of kvzalloc() because we copy over the memory on the next line so there is no need to zero it first. Link: http://lkml.kernel.org/r/e56010c822e7a7cbaa8a238cf82ad31c67eaa800.1558117389.git.jaharkes@cs.cmu.edu Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Colin Ian King <colin.king@canonical.com> Cc: David Howells <dhowells@redhat.com> Cc: Fabian Frederick <fabf@skynet.be> Cc: Mikko Rapeli <mikko.rapeli@iki.fi> Cc: Sam Protsenko <semen.protsenko@linaro.org> Cc: Yann Droneaud <ydroneaud@opteya.com> Cc: Zhouyang Jia <jiazhouyang09@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/coda/psdev.c')
-rw-r--r--fs/coda/psdev.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index ac130d469a3e..f74296acc59e 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -123,7 +123,11 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
123 hdr.opcode, hdr.unique); 123 hdr.opcode, hdr.unique);
124 nbytes = size; 124 nbytes = size;
125 } 125 }
126 CODA_ALLOC(dcbuf, union outputArgs *, nbytes); 126 dcbuf = kvmalloc(nbytes, GFP_KERNEL);
127 if (!dcbuf) {
128 retval = -ENOMEM;
129 goto out;
130 }
127 if (copy_from_user(dcbuf, buf, nbytes)) { 131 if (copy_from_user(dcbuf, buf, nbytes)) {
128 CODA_FREE(dcbuf, nbytes); 132 CODA_FREE(dcbuf, nbytes);
129 retval = -EFAULT; 133 retval = -EFAULT;