leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mm: set S_SWAPFILE on blockdev swap devices

Browse Source 
Set S_SWAPFILE on block device inodes so that they have the same
protections as a swap flie.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2019-08-20 07:55:16 -07:00
parent 609488bc97
commit 1638045c36
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mm/swapfile.c
View File

@ -2368,9 +2368,8 @@ EXPORT_SYMBOL_GPL(add_swap_extent);
* requirements, they are simply tossed out - we will never use those blocks * requirements, they are simply tossed out - we will never use those blocks
* for swapping. * for swapping.
* *
* For S_ISREG swapfiles we set S_SWAPFILE across the life of the swapon. This * For all swap devices we set S_SWAPFILE across the life of the swapon. This
* prevents root from shooting her foot off by ftruncating an in-use swapfile, * prevents users from writing to the swap device, which will corrupt memory.
* which will scribble on the fs.
* *
* The amount of disk space which a single swap extent represents varies. * The amount of disk space which a single swap extent represents varies.
* Typically it is in the 1-4 megabyte range. So we can have hundreds of * Typically it is in the 1-4 megabyte range. So we can have hundreds of
@ -2661,13 +2660,14 @@ 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, 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 {
inode_lock(inode);
inode->i_flags &= ~S_SWAPFILE;
inode_unlock(inode);
} }
inode_lock(inode);
inode->i_flags &= ~S_SWAPFILE;
inode_unlock(inode);
filp_close(swap_file, NULL); filp_close(swap_file, NULL);
/* /*
@ -2890,11 +2890,11 @@ static int claim_swapfile(struct swap_info_struct *p, struct inode *inode)
p->flags |= SWP_BLKDEV; p->flags |= SWP_BLKDEV;
} else if (S_ISREG(inode->i_mode)) { } else if (S_ISREG(inode->i_mode)) {
p->bdev = inode->i_sb->s_bdev; p->bdev = inode->i_sb->s_bdev;
inode_lock(inode); }
if (IS_SWAPFILE(inode))
return -EBUSY; inode_lock(inode);
} else if (IS_SWAPFILE(inode))
return -EINVAL; return -EBUSY;
return 0; return 0;
} }
@ -3295,8 +3295,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
atomic_inc(&proc_poll_event); atomic_inc(&proc_poll_event);
wake_up_interruptible(&proc_poll_wait); wake_up_interruptible(&proc_poll_wait);
if (S_ISREG(inode->i_mode)) inode->i_flags |= S_SWAPFILE;
inode->i_flags |= S_SWAPFILE;
error = 0; error = 0;
goto out; goto out;
bad_swap: bad_swap:
@ -3318,7 +3317,7 @@ bad_swap:
if (inced_nr_rotate_swap) if (inced_nr_rotate_swap)
atomic_dec(&nr_rotate_swap); atomic_dec(&nr_rotate_swap);
if (swap_file) { if (swap_file) {
if (inode && S_ISREG(inode->i_mode)) { if (inode) {
inode_unlock(inode); inode_unlock(inode);
inode = NULL; inode = NULL;
} }
@ -3331,7 +3330,7 @@ out:
} }
if (name) if (name)
putname(name); putname(name);
if (inode && S_ISREG(inode->i_mode)) if (inode)
inode_unlock(inode); inode_unlock(inode);
if (!error) if (!error)
enable_swap_slots_cache(); enable_swap_slots_cache();