Commit 73fd8748 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

swapfile: swapon needs larger size type

sys_swapon()'s swapfilesize (better renamed swapfilepages) is declared as
an int, but should be an unsigned long like the maxpages it's compared
against: on 64-bit (with 4kB pages) a swapfile of 2^44 bytes was rejected
with "Swap area shorter than signature indicates".
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 69beeb1d
...@@ -1461,7 +1461,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags) ...@@ -1461,7 +1461,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
int nr_extents = 0; int nr_extents = 0;
sector_t span; sector_t span;
unsigned long maxpages = 1; unsigned long maxpages = 1;
int swapfilesize; unsigned long swapfilepages;
unsigned short *swap_map = NULL; unsigned short *swap_map = NULL;
struct page *page = NULL; struct page *page = NULL;
struct inode *inode = NULL; struct inode *inode = NULL;
...@@ -1539,7 +1539,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags) ...@@ -1539,7 +1539,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
goto bad_swap; goto bad_swap;
} }
swapfilesize = i_size_read(inode) >> PAGE_SHIFT; swapfilepages = i_size_read(inode) >> PAGE_SHIFT;
/* /*
* Read the swap header. * Read the swap header.
...@@ -1616,7 +1616,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags) ...@@ -1616,7 +1616,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
error = -EINVAL; error = -EINVAL;
if (!maxpages) if (!maxpages)
goto bad_swap; goto bad_swap;
if (swapfilesize && maxpages > swapfilesize) { if (swapfilepages && maxpages > swapfilepages) {
printk(KERN_WARNING printk(KERN_WARNING
"Swap area shorter than signature indicates\n"); "Swap area shorter than signature indicates\n");
goto bad_swap; goto bad_swap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment