staging: make new character devices nonseekable
PATCH 1/1 staging: make new character devices nonseekable
As a preparation for changing the default behaviour of llseek to no_llseek, every file_operations structure should have a .llseek operation.
There are three new instances in staging now, which can all be changed into no_llseek explicitly since the devices do not need to seek.
Add nonseekable_open where appropriate, to prevent pread/pwrite as well.
--- bcm/Bcmchar.c | 3 +++ bcm/InterfaceInit.c | 1 + ft1000/ft1000-usb/ft1000_chdev.c | 2 ++ 3 files changed, 6 insertions(+)
These are the only instances I can't patch automatically because the code is not yet upstream. Please apply.
drivers/staging/bcm/Bcmchar.c +3 -0
@@ -35,6 +35,8 @@ static int bcm_char_open(struct inode *inode, struct file * filp)/*Start Queuing the control response Packets*/ atomic_inc (&Adapter->ApplicationRunning); + +nonseekable_open (inode, file);return 0 ; }static int bcm_char_release (struct inode *inode,struct file *filp)
@@ -2360,6 +2362,7 @@ static struct file_operations bcm_fops = { .release = bcm_char_release, .read = bcm_char_read, .unlocked_ioctl = bcm_char_ioctl, + .llseek = no_llseek, };
drivers/staging/bcm/InterfaceInit.c +1 -0
@@ -163,6 +163,7 @@ static struct file_operations usbbcm_fops = { .read = usbbcm_read, .write = usbbcm_write, .owner = THIS_MODULE, + .llseek = no_llseek, };static struct usb_class_driver usbbcm_class = {
drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c +2 -0
@@ -85,6 +85,7 @@ static struct file_operations ft1000fops = poll: ft1000_ChPoll, open: ft1000_ChOpen, release: ft1000_ChRelease + .llseek = no_llseek, };
@@ -470,6 +471,7 @@ static int ft1000_ChOpen (struct inode *Inode, struct file *File) File->private_data = pdevobj[num]->net; +nonseekable_open (Inode, File);return 0 ; }
Quoted 6 lines · Arnd Bergmann
As a preparation for changing the default behaviour of llseek to
no_llseek, everyfile_operationsstructure should have a .llseek operation.There are three new instances in staging now, which can all be changed into
no_llseekexplicitly since the devices do not need to seek.
Quoted 8 lines
Add
nonseekable_openwhere appropriate, to prevent pread/pwrite as well.Signed-off-by Arnd Bergmann <[email protected]>--- bcm/Bcmchar.c | 3 +++ bcm/InterfaceInit.c | 1 + ft1000/ft1000-usb/ft1000_chdev.c | 2 ++ 3 files changed, 6 insertions(+)
Odd, this patch breaks the build, what's up?
Hm, do I need to apply it to a recent Linus version? My staging-next tree is 2.6.36-rc2 based, do I need to update it?
thanks,
greg k-h