Attachment 28203 Details for Bug 65318

[patch] verify-area-rename.patch

verify-area-rename.patch (text/plain), 6.37 KB, created by Marcus Meissner on 2005-02-04 05:59:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-02-04 05:59:48 UTC

Size: 6.37 KB

patch

obsolete

># This is a BitKeeper generated diff -Nru style patch.
>#
># ChangeSet
>#   2005/01/25 15:00:33-08:00 torvalds@ppc970.osdl.org 
>#   Rename "locks_verify_area()" to "rw_verify_area()" and clean up the
>#   arguments.
>#   
>#   And make it non-inlined.
># 
># arch/mips/kernel/linux32.c
>#   2005/01/25 15:00:25-08:00 torvalds@ppc970.osdl.org +2 -4
>#   Rename "locks_verify_area()" to "rw_verify_area()" and clean up the
>#   arguments.
>#   
>#   And make it non-inlined.
># 
># fs/compat.c
>#   2005/01/25 15:00:25-08:00 torvalds@ppc970.osdl.org +1 -6
>#   Rename "locks_verify_area()" to "rw_verify_area()" and clean up the
>#   arguments.
>#   
>#   And make it non-inlined.
># 
># fs/locks.c
>#   2005/01/25 15:00:25-08:00 torvalds@ppc970.osdl.org +1 -1
>#   Rename "locks_verify_area()" to "rw_verify_area()" and clean up the
>#   arguments.
>#   
>#   And make it non-inlined.
># 
># fs/read_write.c
>#   2005/01/25 15:00:25-08:00 torvalds@ppc970.osdl.org +15 -12
>#   Rename "locks_verify_area()" to "rw_verify_area()" and clean up the
>#   arguments.
>#   
>#   And make it non-inlined.
># 
># include/linux/fs.h
>#   2005/01/25 15:00:26-08:00 torvalds@ppc970.osdl.org +1 -8
>#   Rename "locks_verify_area()" to "rw_verify_area()" and clean up the
>#   arguments.
>#   
>#   And make it non-inlined.
># 
>diff -Nru a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
>--- a/arch/mips/kernel/linux32.c	2005-02-03 13:58:05 -08:00
>+++ b/arch/mips/kernel/linux32.c	2005-02-03 13:58:05 -08:00
>@@ -468,8 +468,7 @@
> 	if (!(file->f_mode & FMODE_READ))
> 		goto out;
> 	pos = merge_64(a4, a5);
>-	ret = locks_verify_area(FLOCK_VERIFY_READ, file->f_dentry->d_inode,
>-				file, pos, count);
>+	ret = rw_verify_area(READ, file, &pos, count);
> 	if (ret)
> 		goto out;
> 	ret = -EINVAL;
>@@ -504,8 +503,7 @@
> 	if (!(file->f_mode & FMODE_WRITE))
> 		goto out;
> 	pos = merge_64(a4, a5);
>-	ret = locks_verify_area(FLOCK_VERIFY_WRITE, file->f_dentry->d_inode,
>-				file, pos, count);
>+	ret = rw_verify_area(WRITE, file, &pos, count);
> 	if (ret)
> 		goto out;
> 	ret = -EINVAL;
>diff -Nru a/fs/compat.c b/fs/compat.c
>--- a/fs/compat.c	2005-02-03 13:58:05 -08:00
>+++ b/fs/compat.c	2005-02-03 13:58:05 -08:00
>@@ -1126,7 +1126,6 @@
> 	int seg;
> 	io_fn_t fn;
> 	iov_fn_t fnv;
>-	struct inode *inode;
> 
> 	/*
> 	 * SuS says "The readv() function *may* fail if the iovcnt argument
>@@ -1191,11 +1190,7 @@
> 		goto out;
> 	}
> 
>-	inode = file->f_dentry->d_inode;
>-	/* VERIFY_WRITE actually means a read, as we write to user space */
>-	ret = locks_verify_area((type == READ
>-				 ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE),
>-				inode, file, *pos, tot_len);
>+	ret = rw_verify_area(type, file, pos, tot_len);
> 	if (ret)
> 		goto out;
> 
>diff -Nru a/fs/locks.c b/fs/locks.c
>--- a/fs/locks.c	2005-02-03 13:58:05 -08:00
>+++ b/fs/locks.c	2005-02-03 13:58:05 -08:00
>@@ -1011,7 +1011,7 @@
>  * @count:      length of area to check
>  *
>  * Searches the inode's list of locks to find any POSIX locks which conflict.
>- * This function is called from locks_verify_area() and
>+ * This function is called from rw_verify_area() and
>  * locks_verify_truncate().
>  */
> int locks_mandatory_area(int read_write, struct inode *inode,
>diff -Nru a/fs/read_write.c b/fs/read_write.c
>--- a/fs/read_write.c	2005-02-03 13:58:05 -08:00
>+++ b/fs/read_write.c	2005-02-03 13:58:05 -08:00
>@@ -182,6 +182,16 @@
> }
> #endif
> 
>+
>+int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count)
>+{
>+	struct inode *inode = file->f_dentry->d_inode;
>+
>+	if (inode->i_flock && MANDATORY_LOCK(inode))
>+		return locks_mandatory_area(read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE, inode, file, *ppos, count);
>+	return 0;
>+}
>+
> ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
> {
> 	struct kiocb kiocb;
>@@ -200,7 +210,6 @@
> 
> ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
> {
>-	struct inode *inode = file->f_dentry->d_inode;
> 	ssize_t ret;
> 
> 	if (!(file->f_mode & FMODE_READ))
>@@ -208,7 +217,7 @@
> 	if (!file->f_op || (!file->f_op->read && !file->f_op->aio_read))
> 		return -EINVAL;
> 
>-	ret = locks_verify_area(FLOCK_VERIFY_READ, inode, file, *pos, count);
>+	ret = rw_verify_area(READ, file, pos, count);
> 	if (!ret) {
> 		ret = security_file_permission (file, MAY_READ);
> 		if (!ret) {
>@@ -247,7 +256,6 @@
> 
> ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_t *pos)
> {
>-	struct inode *inode = file->f_dentry->d_inode;
> 	ssize_t ret;
> 
> 	if (!(file->f_mode & FMODE_WRITE))
>@@ -255,7 +263,7 @@
> 	if (!file->f_op || (!file->f_op->write && !file->f_op->aio_write))
> 		return -EINVAL;
> 
>-	ret = locks_verify_area(FLOCK_VERIFY_WRITE, inode, file, *pos, count);
>+	ret = rw_verify_area(WRITE, file, pos, count);
> 	if (!ret) {
> 		ret = security_file_permission (file, MAY_WRITE);
> 		if (!ret) {
>@@ -399,7 +407,6 @@
> 	int seg;
> 	io_fn_t fn;
> 	iov_fn_t fnv;
>-	struct inode *inode;
> 
> 	/*
> 	 * SuS says "The readv() function *may* fail if the iovcnt argument
>@@ -452,11 +459,7 @@
> 		goto out;
> 	}
> 
>-	inode = file->f_dentry->d_inode;
>-	/* VERIFY_WRITE actually means a read, as we write to user space */
>-	ret = locks_verify_area((type == READ 
>-				 ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE),
>-				inode, file, *pos, tot_len);
>+	ret = rw_verify_area(type, file, pos, tot_len);
> 	if (ret)
> 		goto out;
> 
>@@ -603,7 +606,7 @@
> 	else
> 		if (!(in_file->f_mode & FMODE_PREAD))
> 			goto fput_in;
>-	retval = locks_verify_area(FLOCK_VERIFY_READ, in_inode, in_file, *ppos, count);
>+	retval = rw_verify_area(READ, in_file, ppos, count);
> 	if (retval)
> 		goto fput_in;
> 
>@@ -624,7 +627,7 @@
> 	if (!out_file->f_op || !out_file->f_op->sendpage)
> 		goto fput_out;
> 	out_inode = out_file->f_dentry->d_inode;
>-	retval = locks_verify_area(FLOCK_VERIFY_WRITE, out_inode, out_file, out_file->f_pos, count);
>+	retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
> 	if (retval)
> 		goto fput_out;
> 
>diff -Nru a/include/linux/fs.h b/include/linux/fs.h
>--- a/include/linux/fs.h	2005-02-03 13:58:05 -08:00
>+++ b/include/linux/fs.h	2005-02-03 13:58:05 -08:00
>@@ -1222,14 +1222,7 @@
> 	return 0;
> }
> 
>-static inline int locks_verify_area(int read_write, struct inode *inode,
>-				    struct file *filp, loff_t offset,
>-				    size_t count)
>-{
>-	if (inode->i_flock && MANDATORY_LOCK(inode))
>-		return locks_mandatory_area(read_write, inode, filp, offset, count);
>-	return 0;
>-}
>+extern int rw_verify_area(int, struct file *, loff_t *, size_t);
> 
> static inline int locks_verify_truncate(struct inode *inode,
> 				    struct file *filp,

Actions: View | Diff

Attachments on bug 65318: 28196 | 28197 | 28198 | 28199 | 28200 | 28201 | 28202 | 28203 | 28204 | 28290 | 28647