Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a67cce authored by Jon Tollefson's avatar Jon Tollefson Committed by Linus Torvalds
Browse files

fs: check for statfs overflow 



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: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarJon Tollefson <kniht@linux.vnet.ibm.com>
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 91224346

fs/compat.c

+4 −4
Original line number Diff line number Diff line
@@ -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 @@ asmlinkage long compat_sys_fstatfs(unsigned int fd, struct compat_statfs __user 
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 */

fs/open.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

			/*