Commit 5b808a23 authored Oct 16, 2013 by Krzysztof Kozlowski Committed by Linus Torvalds Oct 16, 2013

swap: fix set_blocksize race during swapon/swapoff



Fix race between swapoff and swapon.  Swapoff used old_block_size from
swap_info outside of swapon_mutex so it could be overwritten by
concurrent swapon.

The race has visible effect only if more than one swap block device
exists with different block sizes (e.g.  /dev/sda1 with block size 4096
and /dev/sdb1 with 512).  In such case it leads to setting the blocksize
of swapped off device with wrong blocksize.

The bug can be triggered with multiple concurrent swapoff and swapon:
0. Swap for some device is on.
1. swapoff:
First the swapoff is called on this device and "struct swap_info_struct
*p" is assigned. This is done under swap_lock however this lock is
released for the call try_to_unuse().

2. swapon:
After the assignment above (and before acquiring swapon_mutex &
swap_lock by swapoff) the swapon is called on the same device.
The p->old_block_size is assigned to the value of block_size the device.
This block size should be the same as previous but sometimes it is not.
The swapon ends successfully.

3. swapoff:
Swapoff resumes, grabs the locks and mutex and continues to disable this
swap device. Now it sets the block size to value taken from swap_info
which was overwritten by swapon in 2.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reported-by: Weijie Yang <weijie.yang.kh@gmail.com>
Cc: Bob Liu <bob.liu@oracle.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Shaohua Li <shli@fusionio.com>
Cc: Minchan Kim <minchan@kernel.org>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent fad1a86e

mm/swapfile.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1824,6 +1824,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
	struct filename *pathname;		struct filename *pathname;
	int i, type, prev;		int i, type, prev;
	int err;		int err;
			unsigned int old_block_size;

	if (!capable(CAP_SYS_ADMIN))		if (!capable(CAP_SYS_ADMIN))
	return -EPERM;		return -EPERM;
	@@ -1914,6 +1915,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
	}		}

	swap_file = p->swap_file;		swap_file = p->swap_file;
			old_block_size = p->old_block_size;
	p->swap_file = NULL;		p->swap_file = NULL;
	p->max = 0;		p->max = 0;
	swap_map = p->swap_map;		swap_map = p->swap_map;
	@@ -1938,7 +1940,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
	inode = mapping->host;		inode = mapping->host;
	if (S_ISBLK(inode->i_mode)) {		if (S_ISBLK(inode->i_mode)) {
	struct block_device *bdev = I_BDEV(inode);		struct block_device *bdev = I_BDEV(inode);
	set_blocksize(bdev, p->old_block_size);		set_blocksize(bdev, old_block_size);
	blkdev_put(bdev, FMODE_READ \| FMODE_WRITE \| FMODE_EXCL);		blkdev_put(bdev, FMODE_READ \| FMODE_WRITE \| FMODE_EXCL);
	} else {		} else {
	mutex_lock(&inode->i_mutex);		mutex_lock(&inode->i_mutex);

Admin message