lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs: check for statfs overflow

Browse Source 
Adds a check for an overflow in the filesystem size so if someone is
checking with statfs() on a 16G blocksize hugetlbfs in a 32bit binary that
it will report back EOVERFLOW instead of a size of 0.

Acked-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jon Tollefson <kniht@linux.vnet.ibm.com>
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jon Tollefson
2008-07-23 21:27:55 -07:00
committed by Linus Torvalds
parent 91224346aa
commit f4a67cceee
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/compat.c
View File

@@ -197,8 +197,8 @@ static int put_compat_statfs(struct compat_statfs __user *ubuf, struct kstatfs *
{ {
if (sizeof ubuf->f_blocks == 4) { if (sizeof ubuf->f_blocks == 4) {
if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail) & if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail |
0xffffffff00000000ULL) kbuf->f_bsize | kbuf->f_frsize) & 0xffffffff00000000ULL)
return -EOVERFLOW; return -EOVERFLOW;
/* f_files and f_ffree may be -1; it's okay /* f_files and f_ffree may be -1; it's okay
* to stuff that into 32 bits */ * to stuff that into 32 bits */
@@ -271,8 +271,8 @@ out:
static int put_compat_statfs64(struct compat_statfs64 __user *ubuf, struct kstatfs *kbuf) static int put_compat_statfs64(struct compat_statfs64 __user *ubuf, struct kstatfs *kbuf)
{ {
if (sizeof ubuf->f_blocks == 4) { if (sizeof ubuf->f_blocks == 4) {
if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail) & if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail |
0xffffffff00000000ULL) kbuf->f_bsize | kbuf->f_frsize) & 0xffffffff00000000ULL)
return -EOVERFLOW; return -EOVERFLOW;
/* f_files and f_ffree may be -1; it's okay /* f_files and f_ffree may be -1; it's okay
* to stuff that into 32 bits */ * to stuff that into 32 bits */

3
fs/open.c
View File

@@ -64,7 +64,8 @@ static int vfs_statfs_native(struct dentry *dentry, struct statfs *buf)
memcpy(buf, &st, sizeof(st)); memcpy(buf, &st, sizeof(st));
else { else {
if (sizeof buf->f_blocks == 4) { if (sizeof buf->f_blocks == 4) {
if ((st.f_blocks | st.f_bfree | st.f_bavail) & if ((st.f_blocks | st.f_bfree | st.f_bavail |
st.f_bsize | st.f_frsize) &
0xffffffff00000000ULL) 0xffffffff00000000ULL)
return -EOVERFLOW; return -EOVERFLOW;
/* /*