aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJian Yu <jian.yu@intel.com>2016-11-21 00:46:48 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-21 11:13:14 +0100
commit8d130c3b0fb6d7eddbe985ff941845f70b043957 (patch)
tree68d150ae60d04d968c4fd65a80b51006b38f4651
parentstaging: vt6656: Fix coding style warnings on Block comments (diff)
downloadwireguard-linux-8d130c3b0fb6d7eddbe985ff941845f70b043957.tar.xz
wireguard-linux-8d130c3b0fb6d7eddbe985ff941845f70b043957.zip
staging/lustre: Use proper number of bytes in copy_from_user
This patch removes the usage of MAX_STRING_SIZE from copy_from_user() and just copies enough bytes to cover count passed in. Signed-off-by: Jian Yu <jian.yu@intel.com> Reviewed-on: http://review.whamcloud.com/23462 Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8774 Reviewed-by: John L. Hammond <john.hammond@intel.com> Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/obdclass/lprocfs_status.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
index 8a2f02f33371..db4999246fea 100644
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
@@ -400,10 +400,17 @@ int lprocfs_wr_uint(struct file *file, const char __user *buffer,
char dummy[MAX_STRING_SIZE + 1], *end;
unsigned long tmp;
- dummy[MAX_STRING_SIZE] = '\0';
- if (copy_from_user(dummy, buffer, MAX_STRING_SIZE))
+ if (count >= sizeof(dummy))
+ return -EINVAL;
+
+ if (count == 0)
+ return 0;
+
+ if (copy_from_user(dummy, buffer, count))
return -EFAULT;
+ dummy[count] = '\0';
+
tmp = simple_strtoul(dummy, &end, 0);
if (dummy == end)
return -EINVAL;