lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/9p: setrlimit fix for 9p write

Browse Source 
Current 9p client file write code does not check for RLIMIT_FSIZE resource.
This bug was found by running LTP test case for setrlimit. This bug is fixed
by calling generic_write_checks before sending the write request to the
server.
Without this patch: the write function is allowed to write above the
RLIMIT_FSIZE set by user.
With this patch: the write function checks for RLIMIT_SIZE and writes upto
the size limit.

Signed-off-by: Harsh Prateek Bora <harsh@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
This commit is contained in:
Harsh Prateek Bora
2010-08-03 11:55:40 +00:00
committed by Eric Van Hensbergen
parent 57ee047b4d
commit 3834b12a18
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fs/9p/vfs_file.c
View File

@@ -219,7 +219,9 @@ static ssize_t
v9fs_file_write(struct file *filp, const char __user * data, v9fs_file_write(struct file *filp, const char __user * data,
size_t count, loff_t * offset) size_t count, loff_t * offset)
{ {
int n, rsize, total = 0; ssize_t retval;
size_t total = 0;
int n, rsize;
struct p9_fid *fid; struct p9_fid *fid;
struct p9_client *clnt; struct p9_client *clnt;
struct inode *inode = filp->f_path.dentry->d_inode; struct inode *inode = filp->f_path.dentry->d_inode;
@@ -234,6 +236,17 @@ v9fs_file_write(struct file *filp, const char __user * data,
rsize = fid->iounit ? fid->iounit : clnt->msize - P9_IOHDRSZ; rsize = fid->iounit ? fid->iounit : clnt->msize - P9_IOHDRSZ;
retval = generic_write_checks(filp, &origin, &count, 0);
if (retval)
goto out;
retval = -EINVAL;
if ((ssize_t) count < 0)
goto out;
retval = 0;
if (!count)
goto out;
do { do {
if (count < rsize) if (count < rsize)
rsize = count; rsize = count;
@@ -258,9 +271,11 @@ v9fs_file_write(struct file *filp, const char __user * data,
} }
if (n < 0) if (n < 0)
return n; retval = n;
else
return total; retval = total;
out:
return retval;
} }
static int v9fs_file_fsync(struct file *filp, int datasync) static int v9fs_file_fsync(struct file *filp, int datasync)