提交 7e95fffe 编写于 作者: S Stephen Boyd 提交者: James Bottomley

[SCSI] sg: convert to kstrtoul_from_user()

Instead of open coding this function use kstrtoul_from_user() directly.
Signed-off-by: NStephen Boyd <sboyd@codeaurora.org>
Acked-by: NDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NJames Bottomley <JBottomley@Parallels.com>
上级 466c08c7
...@@ -2368,16 +2368,15 @@ static ssize_t ...@@ -2368,16 +2368,15 @@ static ssize_t
sg_proc_write_adio(struct file *filp, const char __user *buffer, sg_proc_write_adio(struct file *filp, const char __user *buffer,
size_t count, loff_t *off) size_t count, loff_t *off)
{ {
int num; int err;
char buff[11]; unsigned long num;
if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO)) if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
return -EACCES; return -EACCES;
num = (count < 10) ? count : 10; err = kstrtoul_from_user(buffer, count, 0, &num);
if (copy_from_user(buff, buffer, num)) if (err)
return -EFAULT; return err;
buff[num] = '\0'; sg_allow_dio = num ? 1 : 0;
sg_allow_dio = simple_strtoul(buff, NULL, 10) ? 1 : 0;
return count; return count;
} }
...@@ -2390,17 +2389,15 @@ static ssize_t ...@@ -2390,17 +2389,15 @@ static ssize_t
sg_proc_write_dressz(struct file *filp, const char __user *buffer, sg_proc_write_dressz(struct file *filp, const char __user *buffer,
size_t count, loff_t *off) size_t count, loff_t *off)
{ {
int num; int err;
unsigned long k = ULONG_MAX; unsigned long k = ULONG_MAX;
char buff[11];
if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO)) if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
return -EACCES; return -EACCES;
num = (count < 10) ? count : 10;
if (copy_from_user(buff, buffer, num)) err = kstrtoul_from_user(buffer, count, 0, &k);
return -EFAULT; if (err)
buff[num] = '\0'; return err;
k = simple_strtoul(buff, NULL, 10);
if (k <= 1048576) { /* limit "big buff" to 1 MB */ if (k <= 1048576) { /* limit "big buff" to 1 MB */
sg_big_buff = k; sg_big_buff = k;
return count; return count;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册