From: Weijie Yang <weijie.yang@samsung.com>
To: hughd@google.com
Cc: "'Andrew Morton'" <akpm@linux-foundation.org>,
        "'Minchan Kim'" <minchan@kernel.org>, shli@kernel.org,
        "'Bob Liu'" <bob.liu@oracle.com>, weijie.yang.kh@gmail.com,
        "'Heesub Shin'" <heesub.shin@samsung.com>, mquzik@redhat.com,
        "'Linux-MM'" <linux-mm@kvack.org>,
        "'linux-kernel'" <linux-kernel@vger.kernel.org>,
        stable@vger.kernel.org
Subject: [PATCH 7/8] mm/swap: check swapfile blocksize greater than PAGE_SIZE
Date: Mon, 27 Jan 2014 18:03:04 +0800
Message-id: <000801cf1b47$3fcab170$bf601450$%yang@samsung.com>
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-transfer-encoding: 7bit
Thread-index: Ac8bRu3aHC4G58qRQ9meKjqMWLoq9Q==
Content-language: zh-cn
Sender: linux-kernel-owner@vger.kernel.org

If S_ISREG swapfile's blocksize > PAGE_SIZE, it is not suitable to be
a swapfile, because swap slot is fixed to PAGE_SIZE.

This patch check this situation and return -EINVAL if it happens.

Signed-off-by: Weijie Yang <weijie.yang@samsung.com>
---
 mm/page_io.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/mm/page_io.c b/mm/page_io.c
index 7247be6..3d9bd12 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -150,6 +150,8 @@ int generic_swapfile_activate(struct swap_info_struct *sis,
 	int ret;
 
 	blkbits = inode->i_blkbits;
+	if(blkbits > PAGE_SHIFT)
+		return -EINVAL;
 	blocks_per_page = PAGE_SIZE >> blkbits;
 
 	/*
-- 
1.7.10.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/