vfs: introduce FMODE_NEG_OFFSET for allowing negative f_pos
Subsystems (3)
PATCH 3/5 vfs: introduce FMODE_NEG_OFFSET for allowing negative f_pos
From: KAMEZAWA Hiroyuki <[email protected]>
Now, rw_verify_area() checsk f_pos is negative or not. And if negative, returns -EINVAL.
But, some special files as /dev/(k)mem and /proc/<pid>/mem etc.. has negative offsets. And we can't do any access via read/write to the file(device).
So introduce FMODE_NEG_OFFSET to allow negative file offsets.
---
drivers/char/mem.c | 4 ++++ fs/proc/base.c | 2 ++ fs/read_write.c | 21 +++++++++++++++++++-- include/linux/fs.h | 3 +++ 4 files changed, 28 insertions(+), 2 deletions(-)
drivers/char/mem.c renamed from drivers/char/mem.c~vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos +4 -0
@@ -873,6 +873,10 @@ static int memory_open(struct inode *inoif (dev->dev_info) filp->f_mapping->backing_dev_info = dev->dev_info; +/* Is /dev/mem or /dev/kmem ? */ +if (dev->dev_info == &directly_mappable_cdev_bdi) + filp->f_mode |=FMODE_NEG_OFFSET ; +if (dev->fops->open)return dev->fops->open (inode, filp);
fs/proc/base.c renamed from fs/proc/base.c~vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos +2 -0
@@ -773,6 +773,8 @@ static const struct file_operations procstatic int mem_open (struct inode * inode,struct file * file) { file->private_data = (void *)((long )current->self_exec_id); +/* OK to pass negative loff_t, we can catch out-of-range */ + file->f_mode |=FMODE_NEG_OFFSET ;return 0 ; }
fs/read_write.c renamed from fs/read_write.c~vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos +19 -2
@@ -222,6 +222,20 @@ bad: }#endif +static int +__negative_fpos_check (struct file *file,loff_t pos,size_t count) +{ +/* +* pos or pos+count is negative here, check overflow. +* too big "count" will be caught in rw_verify_area(). +*/ +if ((pos <0 ) && (pos + count < pos)) +return -EOVERFLOW ; +if (file->f_mode &FMODE_NEG_OFFSET ) +return 0 ; +return -EINVAL ; +} +/* * rw_verify_area doesn't like huge counts. We limit * them to something that fits in "int" so that others
@@ -239,8 +253,11 @@ int rw_verify_area(int read_write, strucif (unlikely ((ssize_t ) count <0 ))return retval; pos = *ppos; -if (unlikely ((pos <0 ) || (loff_t) (pos + count) <0 )) -return retval; +if (unlikely ((pos <0 ) || (loff_t) (pos + count) <0 )) { + retval =__negative_fpos_check (file, pos, count); +if (retval) +return retval; + }if (unlikely (inode->i_flock &&mandatory_lock (inode))) { retval = locks_mandatory_area(
include/linux/fs.h renamed from include/linux/fs.h~vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos +3 -0
@@ -90,6 +90,9 @@ struct inodes_stat_t {/* Expect random access pattern */ #define FMODE_RANDOM ((__force fmode_t)0x1000) +/* File is huge (eg. /dev/kmem): treat loff_t as unsigned */ +#define FMODE_NEG_OFFSET ((__force fmode_t)0x2000) +/* File was opened by fanotify and shouldn't generate fanotify events */ /* File was opened by fanotify and shouldn't generate fanotify events */ #define FMODE_NONOTIFY ((__force fmode_t)0x1000000)
_
Quoted 10 lines · Andrew Morton
From: KAMEZAWA Hiroyuki <[email protected]>
Now,
rw_verify_area()checskf_posis negative or not. And if negative, returns-EINVAL.But, some special files as /dev/(k)mem and /proc/<pid>/mem etc.. has negative offsets. And we can't do any access via read/write to the file(device).
So introduce
FMODE_NEG_OFFSETto allow negative file offsets.
Minor nitpick but I don't understand why this is called NEG_OFFSET. It's a large positive offset into the file so FMODE_UNSIGNED_OFFSET seems like it would be better.
Quoted 10 lines · On Wed, 21 Jul 2010 12:54:37 +1000 Nick Piggin <[email protected]> wrote:
Quoted 9 lines · Andrew Morton
From: KAMEZAWA Hiroyuki <[email protected]>
Now,
rw_verify_area()checskf_posis negative or not. And if negative, returns-EINVAL.But, some special files as /dev/(k)mem and /proc/<pid>/mem etc.. has negative offsets. And we can't do any access via read/write to the file(device).
Quoted 6 lines
Quoted 1 line
So introduce
FMODE_NEG_OFFSETto allow negative file offsets.Minor nitpick but I don't understand why this is called
NEG_OFFSET. It's a large positive offset into the file soFMODE_UNSIGNED_OFFSETseems like it would be better.
Ah, agreed.
I'll prepare a macro-renaming patch later (if this patch goes now.) Thank you for review.
-Kame
Quoted 13 lines · KAMEZAWA Hiroyuki
Quoted 10 lines · On Wed, 21 Jul 2010 12:54:37 +1000 Nick Piggin <[email protected]> wrote:
Quoted 9 lines · Andrew Morton
From: KAMEZAWA Hiroyuki <[email protected]>
Now,
rw_verify_area()checskf_posis negative or not. And if negative, returns-EINVAL.But, some special files as /dev/(k)mem and /proc/<pid>/mem etc.. has negative offsets. And we can't do any access via read/write to the file(device).
Quoted 7 lines
Quoted 6 lines
Quoted 1 line
So introduce
FMODE_NEG_OFFSETto allow negative file offsets.Minor nitpick but I don't understand why this is called
NEG_OFFSET. It's a large positive offset into the file soFMODE_UNSIGNED_OFFSETseems like it would be better.Ah, agreed.
Agreed too.
Quoted 2 lines
I'll prepare a macro-renaming patch later (if this patch goes now.) Thank you for review.
Thanks,
Fengguang
Quoted 15 lines · On Wed, 21 Jul 2010 11:53:59 +0900 KAMEZAWA Hiroyuki…
Quoted 12 lines · On Wed, 21 Jul 2010 12:54:37 +1000 Nick Piggin <[email protected]> wrote:
Quoted 10 lines · Andrew Morton
From: KAMEZAWA Hiroyuki <[email protected]>
Now,
rw_verify_area()checskf_posis negative or not. And if negative, returns-EINVAL.But, some special files as /dev/(k)mem and /proc/<pid>/mem etc.. has negative offsets. And we can't do any access via read/write to the file(device).
So introduce
FMODE_NEG_OFFSETto allow negative file offsets.
Quoted 7 lines
Quoted 4 lines
Minor nitpick but I don't understand why this is called
NEG_OFFSET. It's a large positive offset into the file soFMODE_UNSIGNED_OFFSETseems like it would be better.Ah, agreed.
I'll prepare a macro-renaming patch later (if this patch goes now.)
It won't. I hand-edited the diff...