Skip to content

Commit f7a3c54

Browse files
Yicong Yangksacilotto
authored andcommitted
libfs: fix error cast of negative value in simple_attr_write()
BugLink: https://bugs.launchpad.net/bugs/1908561 [ Upstream commit 488dac0 ] The attr->set() receive a value of u64, but simple_strtoll() is used for doing the conversion. It will lead to the error cast if user inputs a negative value. Use kstrtoull() instead of simple_strtoll() to convert a string got from the user to an unsigned value. The former will return '-EINVAL' if it gets a negetive value, but the latter can't handle the situation correctly. Make 'val' unsigned long long as what kstrtoull() takes, this will eliminate the compile warning on no 64-bit architectures. Fixes: f7b8863 ("fs/libfs.c: fix simple_attr_write() on 32bit machines") Signed-off-by: Yicong Yang <yangyicong@hisilicon.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Link: https://lkml.kernel.org/r/1605341356-11872-1-git-send-email-yangyicong@hisilicon.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Ian May <ian.may@canonical.com>
1 parent 77cfefe commit f7a3c54

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

fs/libfs.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf,
921921
size_t len, loff_t *ppos)
922922
{
923923
struct simple_attr *attr;
924-
u64 val;
924+
unsigned long long val;
925925
size_t size;
926926
ssize_t ret;
927927

@@ -939,7 +939,9 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf,
939939
goto out;
940940

941941
attr->set_buf[size] = '\0';
942-
val = simple_strtoll(attr->set_buf, NULL, 0);
942+
ret = kstrtoull(attr->set_buf, 0, &val);
943+
if (ret)
944+
goto out;
943945
ret = attr->set(attr->data, val);
944946
if (ret == 0)
945947
ret = len; /* on success, claim we got the whole input */

0 commit comments

Comments
 (0)