From: Sergey Klyaus <sergey.m.klyaus@gmail.com>
To: sergey.m.klyaus@gmail.com
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] vfs: fix statfs64() returning impossible EOVERFLOW for 64-bit f_files
Date: Thu, 5 Oct 2017 21:36:36 +0300 [thread overview]
Message-ID: <20171005183636.20732-1-sergey.m.klyaus@gmail.com> (raw)
compat_statfs64 structure has some 32-bit and some 64-bit fields, so
64d2ab32e "vfs: fix put_compat_statfs64() does not handle errors" fixed
32-bit overflow checks not being performed, but accidentally enabled
checks for f_files and f_ffree that are 64-bit and cannot have overflow.
Now checks for both groups of fields are enabled by different
conditions.
This broke my Steam runtime and can be reproduced with this test case:
# mount -t tmpfs -o nr_inodes=4294967297 tmpfs /mnt
$ cat statfs.c
int main() {
struct statvfs sv;
statvfs("/mnt", &sv);
printf("%d %llu %llu\n", errno,
(unsigned long long) sv.f_files,
(unsigned long long) sv.f_ffree);
return 0;
}
$ gcc -g -m32 -D_FILE_OFFSET_BITS=64 statfs.c
$ ./a.out
75 134513445 0
| \- some junk on stack
EOVERFLOW
Signed-off-by: Sergey Klyaus <sergey.m.klyaus@gmail.com>
---
fs/statfs.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/statfs.c b/fs/statfs.c
index fab9b6a3c116..073bb2d1871e 100644
--- a/fs/statfs.c
+++ b/fs/statfs.c
@@ -307,6 +307,8 @@ static int put_compat_statfs64(struct compat_statfs64 __user *ubuf, struct kstat
if ((kbuf->f_type | kbuf->f_bsize | kbuf->f_namelen |
kbuf->f_frsize | kbuf->f_flags) & 0xffffffff00000000ULL)
return -EOVERFLOW;
+ }
+ if (sizeof(ubuf->f_blocks) == 4) {
/* f_files and f_ffree may be -1; it's okay
* to stuff that into 32 bits */
if (kbuf->f_files != 0xffffffffffffffffULL
--
2.14.1
next reply other threads:[~2017-10-05 18:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 18:36 Sergey Klyaus [this message]
2017-10-05 20:57 ` Al Viro
2017-10-05 22:31 ` Linus Torvalds
2017-10-05 23:06 ` Al Viro
2017-10-06 1:31 ` Linus Torvalds
2017-10-18 16:04 ` [PATCH v2] vfs: Improve overflow checking for stat*() compat fields Sergey Klyaus
2018-08-06 17:06 ` [PATCH] vfs: fix statfs64() returning impossible EOVERFLOW for 64-bit f_files Al Viro
2018-08-06 18:45 ` Linus Torvalds
2018-08-06 21:03 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171005183636.20732-1-sergey.m.klyaus@gmail.com \
--to=sergey.m.klyaus@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®