Commit d15cab97 authored Mar 28, 2012 by Hugh Dickins Committed by Linus Torvalds Mar 28, 2012

swapon: check validity of swap_flags



Most system calls taking flags first check that the flags passed in are
valid, and that helps userspace to detect when new flags are supported.

But swapon never did so: start checking now, to help if we ever want to
support more swap_flags in future.

It's difficult to get stray bits set in an int, and swapon is not widely
used, so this is most unlikely to break any userspace; but we can just
revert if it turns out to do so.

Signed-off-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 29fd66d2

include/linux/swap.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,9 @@ struct bio;
		#define SWAP_FLAG_PRIO_SHIFT 0
		#define SWAP_FLAG_DISCARD 0x10000 /* discard swap cluster after use */

		#define SWAP_FLAGS_VALID (SWAP_FLAG_PRIO_MASK \| SWAP_FLAG_PREFER \| \
		SWAP_FLAG_DISCARD)

		static inline int current_is_kswapd(void)
		{
		return current->flags & PF_KSWAPD;

mm/swapfile.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2022,6 +2022,9 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
		struct page *page = NULL;
		struct inode *inode = NULL;

		if (swap_flags & ~SWAP_FLAGS_VALID)
		return -EINVAL;

		if (!capable(CAP_SYS_ADMIN))
		return -EPERM;

Admin message