lkml.org 
[lkml]   [2013]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/3] fs: nfsd: remove calls to simple_strtoll
Date
Signed-off-by: Daniel Walker <dwalker@fifo99.com>
---
fs/nfsd/fault_inject.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/fault_inject.c b/fs/nfsd/fault_inject.c
index d620e7f..41165f0 100644
--- a/fs/nfsd/fault_inject.c
+++ b/fs/nfsd/fault_inject.c
@@ -125,20 +125,24 @@ static ssize_t fault_inject_write(struct file *file, const char __user *buf,
size_t size = min(sizeof(write_buf) - 1, len);
struct net *net = current->nsproxy->net_ns;
struct sockaddr_storage sa;
+ int ret = -EFAULT;
u64 val;

if (copy_from_user(write_buf, buf, size))
- return -EFAULT;
+ return ret;
write_buf[size] = '\0';

size = rpc_pton(net, write_buf, size, (struct sockaddr *)&sa, sizeof(sa));
if (size > 0)
nfsd_inject_set_client(file_inode(file)->i_private, &sa, size);
else {
- val = simple_strtoll(write_buf, NULL, 0);
- nfsd_inject_set(file_inode(file)->i_private, val);
+ ret = kstrtoll(write_buf, 0, &val);
+ if (ret == 0) {
+ nfsd_inject_set(file_inode(file)->i_private, val);
+ ret = len;
+ }
}
- return len; /* on success, claim we got the whole input */
+ return ret; /* on success, claim we got the whole input */
}

static const struct file_operations fops_nfsd = {
--
1.8.3.2


\
 
 \ /
  Last update: 2013-10-26 04:41    [W:0.892 / U:0.204 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site