Commit 602c89d2 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Clean up stuffed file copying 



If the inode size was corrupt for stuffed files, it was possible
for the copying of data to overrun the block and/or page. This patch
checks for that condition so that this is no longer possible.

This is also preparation for the new truncate sequence patch which
requires the ability to have stuffed files with larger sizes than
(disk block size - sizeof(on disk inode)) with the restriction that
only the initial part of the file may be non-zero.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 4cb947b5

fs/gfs2/aops.c

+5 −3
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ static int gfs2_jdata_writepages(struct address_space *mapping, 
static int stuffed_readpage(struct gfs2_inode *ip, struct page *page)

{

	struct buffer_head *dibh;

	u64 dsize = i_size_read(&ip->i_inode);

	void *kaddr;

	int error;
@@ -437,9 +438,10 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) 
		return error;



	kaddr = kmap_atomic(page, KM_USER0);

	memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode),

	       ip->i_disksize);

	memset(kaddr + ip->i_disksize, 0, PAGE_CACHE_SIZE - ip->i_disksize);

	if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode)))

		dsize = (dibh->b_size - sizeof(struct gfs2_dinode));

	memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);

	memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize);

	kunmap_atomic(kaddr, KM_USER0);

	flush_dcache_page(page);

	brelse(dibh);

fs/gfs2/bmap.c

+10 −7
Original line number Diff line number Diff line
@@ -72,11 +72,13 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, 


	if (!PageUptodate(page)) {

		void *kaddr = kmap(page);

		u64 dsize = i_size_read(inode);

 

		memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode),

		       ip->i_disksize);

		memset(kaddr + ip->i_disksize, 0,

		       PAGE_CACHE_SIZE - ip->i_disksize);

		if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode)))

			dsize = dibh->b_size - sizeof(struct gfs2_dinode);



		memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);

		memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize);

		kunmap(page);



		SetPageUptodate(page);
@@ -1039,13 +1041,14 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 
		goto out;



	if (gfs2_is_stuffed(ip)) {

		ip->i_disksize = size;

		u64 dsize = size + sizeof(struct gfs2_inode);

		ip->i_inode.i_mtime = ip->i_inode.i_ctime = CURRENT_TIME;

		gfs2_trans_add_bh(ip->i_gl, dibh, 1);

		gfs2_dinode_out(ip, dibh->b_data);

		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode) + size);

		if (dsize > dibh->b_size)

			dsize = dibh->b_size;

		gfs2_buffer_clear_tail(dibh, dsize);

		error = 1;



	} else {

		if (size & (u64)(sdp->sd_sb.sb_bsize - 1))

			error = gfs2_block_truncate_page(ip->i_inode.i_mapping);

CRA Git | Maintained and supported by SUSTech CRA and CCSE