mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* + libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch added to -mm tree
@ 2020-11-10 19:19 akpm
  0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2020-11-10 19:19 UTC (permalink / raw)
  To: mm-commits, viro, yangyicong


The patch titled
     Subject: libfs: fix error cast of negative value in simple_attr_write()
has been added to the -mm tree.  Its filename is
     libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch

This patch should soon appear at
    https://ozlabs.org/~akpm/mmots/broken-out/libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch
and later at
    https://ozlabs.org/~akpm/mmotm/broken-out/libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Yicong Yang <yangyicong@hisilicon.com>
Subject: libfs: fix error cast of negative value in simple_attr_write()

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.

Link: https://lkml.kernel.org/r/1605000324-7428-1-git-send-email-yangyicong@hisilicon.com
Fixes: f7b88631a897 ("fs/libfs.c: fix simple_attr_write() on 32bit machines")
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/libfs.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/fs/libfs.c~libfs-fix-error-cast-of-negative-value-in-simple_attr_write
+++ a/fs/libfs.c
@@ -977,7 +977,9 @@ ssize_t simple_attr_write(struct file *f
 		goto out;
 
 	attr->set_buf[size] = '\0';
-	val = simple_strtoll(attr->set_buf, NULL, 0);
+	ret = kstrtoull(attr->set_buf, 0, &val);
+	if (ret)
+		goto out;
 	ret = attr->set(attr->data, val);
 	if (ret == 0)
 		ret = len; /* on success, claim we got the whole input */
_

Patches currently in -mm which might be from yangyicong@hisilicon.com are

libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch


^ permalink raw reply	[flat|nested] 2+ messages in thread

* + libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch added to -mm tree
@ 2020-11-14 18:38 akpm
  0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2020-11-14 18:38 UTC (permalink / raw)
  To: mm-commits, viro, yangyicong


The patch titled
     Subject: libfs: fix error cast of negative value in simple_attr_write()
has been added to the -mm tree.  Its filename is
     libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch

This patch should soon appear at
    https://ozlabs.org/~akpm/mmots/broken-out/libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch
and later at
    https://ozlabs.org/~akpm/mmotm/broken-out/libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Yicong Yang <yangyicong@hisilicon.com>
Subject: libfs: fix error cast of negative value in simple_attr_write()

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.

Link: https://lkml.kernel.org/r/1605341356-11872-1-git-send-email-yangyicong@hisilicon.com
Fixes: f7b88631a897 ("fs/libfs.c: fix simple_attr_write() on 32bit machines")
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/libfs.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/fs/libfs.c~libfs-fix-error-cast-of-negative-value-in-simple_attr_write
+++ a/fs/libfs.c
@@ -959,7 +959,7 @@ ssize_t simple_attr_write(struct file *f
 			  size_t len, loff_t *ppos)
 {
 	struct simple_attr *attr;
-	u64 val;
+	unsigned long long val;
 	size_t size;
 	ssize_t ret;
 
@@ -977,7 +977,9 @@ ssize_t simple_attr_write(struct file *f
 		goto out;
 
 	attr->set_buf[size] = '\0';
-	val = simple_strtoll(attr->set_buf, NULL, 0);
+	ret = kstrtoull(attr->set_buf, 0, &val);
+	if (ret)
+		goto out;
 	ret = attr->set(attr->data, val);
 	if (ret == 0)
 		ret = len; /* on success, claim we got the whole input */
_

Patches currently in -mm which might be from yangyicong@hisilicon.com are

libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-11-14 18:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-10 19:19 + libfs-fix-error-cast-of-negative-value-in-simple_attr_write.patch added to -mm tree akpm
2020-11-14 18:38 akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).