fs: nfsd: remove calls to simple_strtoll
Subsystems (2)
PATCH 2/3 fs: nfsd: remove calls to simple_strtoll
Signed-off-by Daniel Walker <[email protected]>
--- fs/nfsd/fault_inject.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/nfsd/fault_inject.c +8 -4
@@ -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 = {
Signature · 1 line
1.8.3.2
Quoted 14 lines · Daniel Walker
Signed-off-by Daniel Walker <[email protected]>--- fs/nfsd/fault_inject.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)fs/nfsd/fault_inject.c +1
-0@@ -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 ;
fs/nfsd/fault_inject.c static ssize_t fault_inject_write(struct file *file, const char __user *buf, · line 137
Quoted 10 lines
fs/nfsd/fault_inject.c +1
-1u64 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);
If we take this branch, don't we end up returning -EFAULT below?
--b.
Quoted 17 lines
fs/nfsd/fault_inject.c +6
-3else { - 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 = {Signature · 1 line
1.8.3.2
Quoted 22 lines · J. Bruce Fields
Quoted 21 lines · Daniel Walker
Signed-off-by Daniel Walker <[email protected]>--- fs/nfsd/fault_inject.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)fs/nfsd/fault_inject.c +2
-1@@ -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' ;
Quoted 6 lines
fs/nfsd/fault_inject.c static ssize_t fault_inject_write(struct file *file, const char __user *buf, · line 137
Quoted 3 lines
fs/nfsd/fault_inject.c +0
-0size =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);If we take this branch, don't we end up returning
-EFAULTbelow?
Looks like it .. I wasn't try to change that behavior, I'll update the patch and resend.
Daniel