2 files changed, 6 insertions, 5 deletions

diff --git a/fs/compat.c b/fs/compat.c
index ed43e17a5dc6..b46604281766 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -197,8 +197,8 @@ static int put_compat_statfs(struct compat_statfs __user *ubuf, struct kstatfs *
 {
         
         if (sizeof ubuf->f_blocks == 4) {
-                if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail) &
-                    0xffffffff00000000ULL)
+                if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail |
+                     kbuf->f_bsize | kbuf->f_frsize) & 0xffffffff00000000ULL)
                         return -EOVERFLOW;
                 /* f_files and f_ffree may be -1; it's okay
                  * to stuff that into 32 bits */
@@ -271,8 +271,8 @@ out:
 static int put_compat_statfs64(struct compat_statfs64 __user *ubuf, struct kstatfs *kbuf)
 {
         if (sizeof ubuf->f_blocks == 4) {
-                if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail) &
-                    0xffffffff00000000ULL)
+                if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail |
+                     kbuf->f_bsize | kbuf->f_frsize) & 0xffffffff00000000ULL)
                         return -EOVERFLOW;
                 /* f_files and f_ffree may be -1; it's okay
                  * to stuff that into 32 bits */
diff --git a/fs/open.c b/fs/open.c
index a99ad09c3197..bb98d2fe809f 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -64,7 +64,8 @@ static int vfs_statfs_native(struct dentry *dentry, struct statfs *buf)
                 memcpy(buf, &st, sizeof(st));
         else {
                 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)
                                 return -EOVERFLOW;
                         /*