Commit 102f4d90 authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

FS-Cache: Handle a write to the page immediately beyond the EOF marker 



Handle a write being requested to the page immediately beyond the EOF
marker on a cache object.  Currently this gets an assertion failure in
CacheFiles because the EOF marker is used there to encode information about
a partial page at the EOF - which could lead to an unknown blank spot in
the file if we extend the file over it.

The problem is actually in fscache where we check the index of the page
being written against store_limit.  store_limit is set to the number of
pages that we're allowed to store by fscache_set_store_limit() - which
means it's one more than the index of the last page we're allowed to store.
The problem is that we permit writing to a page with an index _equal_ to
the store limit - when we should reject that case.

Whilst we're at it, change the triggered assertion in CacheFiles to just
return -ENOBUFS instead.

The assertion failure looks something like this:

CacheFiles: Assertion failed
1000 < 7b1 is false
------------[ cut here ]------------
kernel BUG at fs/cachefiles/rdwr.c:962!
...
RIP: 0010:[<ffffffffa02c9e83>]  [<ffffffffa02c9e83>] cachefiles_write_page+0x273/0x2d0 [cachefiles]

Cc: stable@vger.kernel.org # v2.6.31+; earlier - that + backport of a17754fb (at least)
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 95201a40

fs/cachefiles/rdwr.c

+37 −30
Original line number Diff line number Diff line
@@ -899,6 +899,15 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page) 
	cache = container_of(object->fscache.cache,

			     struct cachefiles_cache, cache);



	pos = (loff_t)page->index << PAGE_SHIFT;



	/* We mustn't write more data than we have, so we have to beware of a

	 * partial page at EOF.

	 */

	eof = object->fscache.store_limit_l;

	if (pos >= eof)

		goto error;



	/* write the page to the backing filesystem and let it store it in its

	 * own time */

	path.mnt = cache->mnt;
@@ -906,15 +915,11 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page) 
	file = dentry_open(&path, O_RDWR | O_LARGEFILE, cache->cache_cred);

	if (IS_ERR(file)) {

		ret = PTR_ERR(file);

	} else {

		pos = (loff_t) page->index << PAGE_SHIFT;

		goto error_2;

	}



		/* we mustn't write more data than we have, so we have

		 * to beware of a partial page at EOF */

		eof = object->fscache.store_limit_l;

	len = PAGE_SIZE;

	if (eof & ~PAGE_MASK) {

			ASSERTCMP(pos, <, eof);

		if (eof - pos < PAGE_SIZE) {

			_debug("cut short %llx to %llx",

			       pos, eof);
@@ -926,20 +931,22 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page) 
	data = kmap(page);

	ret = __kernel_write(file, data, len, &pos);

	kunmap(page);

		if (ret != len)

			ret = -EIO;

	fput(file);

	}

	if (ret != len)

		goto error_eio;



	if (ret < 0) {

		if (ret == -EIO)

			cachefiles_io_error_obj(

				object, "Write page to backing file failed");

		ret = -ENOBUFS;

	}

	_leave(" = 0");

	return 0;



	_leave(" = %d", ret);

	return ret;

error_eio:

	ret = -EIO;

error_2:

	if (ret == -EIO)

		cachefiles_io_error_obj(object,

					"Write page to backing file failed");

error:

	_leave(" = -ENOBUFS [%d]", ret);

	return -ENOBUFS;

}



/*

fs/fscache/page.c

+1 −1
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ static void fscache_write_op(struct fscache_operation *_op) 
		goto superseded;

	page = results[0];

	_debug("gang %d [%lx]", n, page->index);

	if (page->index > op->store_limit) {

	if (page->index >= op->store_limit) {

		fscache_stat(&fscache_n_store_pages_over_limit);

		goto superseded;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE