summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/cris/drivers/eeprom.c20
-rw-r--r--arch/i386/kernel/cpuid.c15
-rw-r--r--arch/i386/kernel/msr.c12
-rw-r--r--arch/ppc/kernel/ppc_htab.c15
-rw-r--r--drivers/char/mem.c14
-rw-r--r--drivers/char/nvram.c2
-rw-r--r--drivers/char/nwflash.c38
-rw-r--r--drivers/char/vc_screen.c11
-rw-r--r--drivers/ieee1394/pcilynx.c12
-rw-r--r--drivers/macintosh/nvram.c7
-rw-r--r--drivers/mtd/mtdchar.c4
-rw-r--r--drivers/pci/proc.c7
-rw-r--r--drivers/pnp/isapnp_proc.c28
-rw-r--r--drivers/sbus/char/flash.c3
-rw-r--r--drivers/sbus/char/jsflash.c13
-rw-r--r--drivers/usb/devices.c19
-rw-r--r--drivers/usb/devio.c19
-rw-r--r--drivers/usb/drivers.c18
-rw-r--r--drivers/usb/inode.c4
-rw-r--r--drivers/usb/uhci-debug.h16
-rw-r--r--drivers/zorro/proc.c10
-rw-r--r--fs/driverfs/inode.c3
22 files changed, 200 insertions, 90 deletions
diff --git a/arch/cris/drivers/eeprom.c b/arch/cris/drivers/eeprom.c
index cb39cf10319a..4766f649cb4e 100644
--- a/arch/cris/drivers/eeprom.c
+++ b/arch/cris/drivers/eeprom.c
@@ -74,6 +74,7 @@
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include "i2c.h"
@@ -448,36 +449,39 @@ static loff_t eeprom_lseek(struct file * file, loff_t offset, int orig)
* orig 1: relative from current position
* orig 2: position from last eeprom address
*/
-
+ loff_t ret;
+
+ lock_kernel();
switch (orig)
{
case 0:
- file->f_pos = offset;
+ ret = file->f_pos = offset;
break;
case 1:
- file->f_pos += offset;
+ ret = file->f_pos += offset;
break;
case 2:
- file->f_pos = eeprom.size - offset;
+ ret = file->f_pos = eeprom.size - offset;
break;
default:
- return -EINVAL;
+ ret = -EINVAL;
}
/* truncate position */
if (file->f_pos < 0)
{
file->f_pos = 0;
- return(-EOVERFLOW);
+ unlock_kernel();
+ ret = -EOVERFLOW;
}
if (file->f_pos >= eeprom.size)
{
file->f_pos = eeprom.size - 1;
- return(-EOVERFLOW);
+ ret = -EOVERFLOW;
}
- return ( file->f_pos );
+ return ( ret );
}
/* Reads data from eeprom. */
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index 2686bc9bcfd9..0e8e46d76b34 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -35,6 +35,7 @@
#include <linux/poll.h>
#include <linux/smp.h>
#include <linux/major.h>
+#include <linux/smp_lock.h>
#include <asm/processor.h>
#include <asm/msr.h>
@@ -82,16 +83,24 @@ static inline void do_cpuid(int cpu, u32 reg, u32 *data)
static loff_t cpuid_seek(struct file *file, loff_t offset, int orig)
{
+ loff_t ret;
+
+ lock_kernel();
+
switch (orig) {
case 0:
file->f_pos = offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
case 1:
file->f_pos += offset;
- return file->f_pos;
+ ret = file->f_pos;
default:
- return -EINVAL; /* SEEK_END not supported */
+ ret = -EINVAL;
}
+
+ unlock_kernel();
+ return ret;
}
static ssize_t cpuid_read(struct file * file, char * buf,
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index 5445ca5ac47b..18560356a40a 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -33,6 +33,7 @@
#include <linux/init.h>
#include <linux/poll.h>
#include <linux/smp.h>
+#include <linux/smp_lock.h>
#include <linux/major.h>
#include <asm/processor.h>
@@ -162,16 +163,19 @@ static inline int do_rdmsr(int cpu, u32 reg, u32 *eax, u32 *edx)
static loff_t msr_seek(struct file *file, loff_t offset, int orig)
{
+ loff_t ret = -EINVAL;
+ lock_kernel();
switch (orig) {
case 0:
file->f_pos = offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
case 1:
file->f_pos += offset;
- return file->f_pos;
- default:
- return -EINVAL; /* SEEK_END not supported */
+ ret = file->f_pos;
}
+ unlock_kernel();
+ return ret;
}
static ssize_t msr_read(struct file * file, char * buf,
diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c
index 8f054ff4c33c..99661be1e567 100644
--- a/arch/ppc/kernel/ppc_htab.c
+++ b/arch/ppc/kernel/ppc_htab.c
@@ -21,6 +21,7 @@
#include <linux/sysctl.h>
#include <linux/ctype.h>
#include <linux/threads.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/bitops.h>
@@ -430,18 +431,20 @@ static ssize_t ppc_htab_write(struct file * file, const char * buffer,
static long long
ppc_htab_lseek(struct file * file, loff_t offset, int orig)
{
+ long long ret = -EINVAL;
+
+ lock_kernel();
switch (orig) {
case 0:
file->f_pos = offset;
- return(file->f_pos);
+ ret = file->f_pos;
+ break;
case 1:
file->f_pos += offset;
- return(file->f_pos);
- case 2:
- return(-EINVAL);
- default:
- return(-EINVAL);
+ ret = file->f_pos;
}
+ unlock_kernel();
+ return ret;
}
int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 90e1e9956054..9df1b5af4d43 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -21,6 +21,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
#include <linux/capability.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -466,16 +467,23 @@ static loff_t null_lseek(struct file * file, loff_t offset, int orig)
*/
static loff_t memory_lseek(struct file * file, loff_t offset, int orig)
{
+ int ret;
+
+ lock_kernel();
switch (orig) {
case 0:
file->f_pos = offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
case 1:
file->f_pos += offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
default:
- return -EINVAL;
+ ret = -EINVAL;
}
+ unlock_kernel();
+ return ret;
}
static int open_port(struct inode * inode, struct file * filp)
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index fae1d0e9490e..e8377d0358c7 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -216,6 +216,7 @@ void nvram_set_checksum( void )
static long long nvram_llseek(struct file *file,loff_t offset, int origin )
{
+ lock_kernel();
switch( origin ) {
case 0:
/* nothing to do */
@@ -227,6 +228,7 @@ static long long nvram_llseek(struct file *file,loff_t offset, int origin )
offset += NVRAM_BYTES;
break;
}
+ unlock_kernel();
return( (offset >= 0) ? (file->f_pos = offset) : -EINVAL );
}
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c
index 58660979a036..5c343f2da4bb 100644
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
@@ -26,6 +26,7 @@
#include <linux/spinlock.h>
#include <linux/rwsem.h>
#include <linux/init.h>
+#include <linux/smp_lock.h>
#include <asm/hardware/dec21285.h>
#include <asm/io.h>
@@ -301,30 +302,45 @@ static ssize_t flash_write(struct file *file, const char *buf, size_t size, loff
*/
static long long flash_llseek(struct file *file, long long offset, int orig)
{
+ long long ret;
+
+ lock_kernel();
if (flashdebug)
printk(KERN_DEBUG "flash_llseek: offset=0x%X, orig=0x%X.\n",
(unsigned int) offset, orig);
switch (orig) {
case 0:
- if (offset < 0)
- return -EINVAL;
+ if (offset < 0) {
+ ret = -EINVAL;
+ break;
+ }
- if ((unsigned int) offset > gbFlashSize)
- return -EINVAL;
+ if ((unsigned int) offset > gbFlashSize) {
+ ret = -EINVAL;
+ break;
+ }
file->f_pos = (unsigned int) offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
case 1:
- if ((file->f_pos + offset) > gbFlashSize)
- return -EINVAL;
- if ((file->f_pos + offset) < 0)
- return -EINVAL;
+ if ((file->f_pos + offset) > gbFlashSize) {
+ ret = -EINVAL;
+ break;
+ }
+ if ((file->f_pos + offset) < 0) {
+ ret = -EINVAL;
+ break;
+ }
file->f_pos += offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
default:
- return -EINVAL;
+ ret = -EINVAL;
}
+ unlock_kernel();
+ return ret;
}
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index 157ac042486f..ce001b8437cd 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -36,6 +36,7 @@
#include <linux/selection.h>
#include <linux/kbd_kern.h>
#include <linux/console.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/byteorder.h>
#include <asm/unaligned.h>
@@ -67,10 +68,13 @@ vcs_size(struct inode *inode)
static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
{
- int size = vcs_size(file->f_dentry->d_inode);
+ int size;
+ lock_kernel();
+ size = vcs_size(file->f_dentry->d_inode);
switch (orig) {
default:
+ unlock_kernel();
return -EINVAL;
case 2:
offset += size;
@@ -80,9 +84,12 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
case 0:
break;
}
- if (offset < 0 || offset > size)
+ if (offset < 0 || offset > size) {
+ unlock_kernel();
return -EINVAL;
+ }
file->f_pos = offset;
+ unlock_kernel();
return file->f_pos;
}
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 0e6cebd5641b..2cae730599ec 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -29,6 +29,7 @@
#include <linux/pci.h>
#include <linux/fs.h>
#include <linux/poll.h>
+#include <linux/smp_lock.h>
#include <asm/byteorder.h>
#include <asm/atomic.h>
#include <asm/io.h>
@@ -732,8 +733,9 @@ static unsigned int aux_poll(struct file *file, poll_table *pt)
loff_t mem_llseek(struct file *file, loff_t offs, int orig)
{
- loff_t newoffs;
+ loff_t newoffs = -1;
+ lock_kernel();
switch (orig) {
case 0:
newoffs = offs;
@@ -743,12 +745,12 @@ loff_t mem_llseek(struct file *file, loff_t offs, int orig)
break;
case 2:
newoffs = PCILYNX_MAX_MEMORY + 1 + offs;
- break;
- default:
- return -EINVAL;
}
- if (newoffs < 0 || newoffs > PCILYNX_MAX_MEMORY + 1) return -EINVAL;
+ if (newoffs < 0 || newoffs > PCILYNX_MAX_MEMORY + 1) {
+ lock_kernel();
+ return -EINVAL;
+ }
file->f_pos = newoffs;
return newoffs;
diff --git a/drivers/macintosh/nvram.c b/drivers/macintosh/nvram.c
index 4e7db7cd310d..049433afeeaf 100644
--- a/drivers/macintosh/nvram.c
+++ b/drivers/macintosh/nvram.c
@@ -13,6 +13,7 @@
#include <linux/fcntl.h>
#include <linux/nvram.h>
#include <linux/init.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/nvram.h>
@@ -20,6 +21,7 @@
static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
{
+ lock_kernel();
switch (origin) {
case 1:
offset += file->f_pos;
@@ -28,9 +30,12 @@ static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
offset += NVRAM_SIZE;
break;
}
- if (offset < 0)
+ if (offset < 0) {
+ unlock_kernel();
return -EINVAL;
+ }
file->f_pos = offset;
+ unlock_kernel();
return file->f_pos;
}
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index f602eb2b046b..9b30043aea23 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -10,6 +10,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/mtd/mtd.h>
+#include <linux/smp_lock.h>
#include <linux/slab.h>
#ifdef CONFIG_DEVFS_FS
@@ -31,6 +32,7 @@ static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)
{
struct mtd_info *mtd=(struct mtd_info *)file->private_data;
+ lock_kernel();
switch (orig) {
case 0:
/* SEEK_SET */
@@ -45,6 +47,7 @@ static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)
file->f_pos =mtd->size + offset;
break;
default:
+ unlock_kernel();
return -EINVAL;
}
@@ -53,6 +56,7 @@ static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)
else if (file->f_pos >= mtd->size)
file->f_pos = mtd->size - 1;
+ unlock_kernel();
return file->f_pos;
}
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 8ac8673c803d..3bc810d5ae47 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -12,6 +12,7 @@
#include <linux/proc_fs.h>
#include <linux/init.h>
#include <linux/seq_file.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/byteorder.h>
@@ -21,8 +22,9 @@
static loff_t
proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
{
- loff_t new;
+ loff_t new = -1;
+ lock_kernel();
switch (whence) {
case 0:
new = off;
@@ -33,9 +35,8 @@ proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
case 2:
new = PCI_CFG_SPACE_SIZE + off;
break;
- default:
- return -EINVAL;
}
+ unlock_kernel();
if (new < 0 || new > PCI_CFG_SPACE_SIZE)
return -EINVAL;
return (file->f_pos = new);
diff --git a/drivers/pnp/isapnp_proc.c b/drivers/pnp/isapnp_proc.c
index 11e1b2c4b4a1..f359e7539314 100644
--- a/drivers/pnp/isapnp_proc.c
+++ b/drivers/pnp/isapnp_proc.c
@@ -84,18 +84,26 @@ static void isapnp_devid(char *str, unsigned short vendor, unsigned short device
static loff_t isapnp_info_entry_lseek(struct file *file, loff_t offset, int orig)
{
+ loff_t ret;
+
+ lock_kernel();
+
switch (orig) {
case 0: /* SEEK_SET */
file->f_pos = offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
case 1: /* SEEK_CUR */
file->f_pos += offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
case 2: /* SEEK_END */
default:
- return -EINVAL;
+ ret = -EINVAL;
}
- return -ENXIO;
+
+ unlock_kernel();
+ return ret;
}
static ssize_t isapnp_info_entry_read(struct file *file, char *buffer,
@@ -211,8 +219,9 @@ static struct file_operations isapnp_info_entry_operations =
static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence)
{
- loff_t new;
-
+ loff_t new = -1;
+
+ lock_kernel();
switch (whence) {
case 0:
new = off;
@@ -223,11 +232,12 @@ static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence)
case 2:
new = 256 + off;
break;
- default:
- return -EINVAL;
}
- if (new < 0 || new > 256)
+ if (new < 0 || new > 256) {
+ unlock_kernel();
return -EINVAL;
+ }
+ unlock_kernel();
return (file->f_pos = new);
}
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index b86a62475ffa..383fa671a3df 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -83,6 +83,7 @@ flash_mmap(struct file *file, struct vm_area_struct *vma)
static long long
flash_llseek(struct file *file, long long offset, int origin)
{
+ lock_kernel();
switch (origin) {
case 0:
file->f_pos = offset;
@@ -96,8 +97,10 @@ flash_llseek(struct file *file, long long offset, int origin)
file->f_pos = flash.read_size;
break;
default:
+ unlock_kernel();
return -EINVAL;
}
+ unlock_kernel();
return file->f_pos;
}
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index cc42d1577e34..05b38ff0dc9f 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -259,16 +259,23 @@ static void jsfd_do_request(request_queue_t *q)
*/
static loff_t jsf_lseek(struct file * file, loff_t offset, int orig)
{
+ loff_t ret;
+
+ lock_kernel();
switch (orig) {
case 0:
file->f_pos = offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
case 1:
file->f_pos += offset;
- return file->f_pos;
+ ret = file->f_pos;
+ break;
default:
- return -EINVAL;
+ ret = -EINVAL;
}
+ unlock_kernel();
+ return ret;
}
/*
diff --git a/drivers/usb/devices.c b/drivers/usb/devices.c
index c732e45be986..3e8b1d79b270 100644
--- a/drivers/usb/devices.c
+++ b/drivers/usb/devices.c
@@ -554,21 +554,26 @@ static int usb_device_release(struct inode *inode, struct file *file)
static loff_t usb_device_lseek(struct file * file, loff_t offset, int orig)
{
+ loff_t ret;
+
+ lock_kernel();
+
switch (orig) {
case 0:
file->f_pos = offset;
- return file->f_pos;
-
+ ret = file->f_pos;
+ break;
case 1:
file->f_pos += offset;
- return file->f_pos;
-
+ ret = file->f_pos;
+ break;
case 2:
- return -EINVAL;
-
default:
- return -EINVAL;
+ ret = -EINVAL;
}
+
+ unlock_kernel();
+ return ret;
}
struct file_operations usbdevfs_devices_fops = {
diff --git a/drivers/usb/devio.c b/drivers/usb/devio.c
index c7883b376139..342c049e24ca 100644
--- a/drivers/usb/devio.c
+++ b/drivers/usb/devio.c
@@ -58,21 +58,26 @@ struct async {
static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig)
{
+ loff_t ret;
+
+ lock_kernel();
+
switch (orig) {
case 0:
file->f_pos = offset;
- return file->f_pos;
-
+ ret = file->f_pos;
+ break;
case 1:
file->f_pos += offset;
- return file->f_pos;
-
+ ret = file->f_pos;
+ break;
case 2:
- return -EINVAL;
-
default:
- return -EINVAL;
+ ret = -EINVAL;
}
+
+ unlock_kernel();
+ return ret;
}
static ssize_t usbdev_read(struct file *file, char * buf, size_t nbytes, loff_t *ppos)
diff --git a/drivers/usb/drivers.c b/drivers/usb/drivers.c
index 28589b1e6da5..ae96757ef9f6 100644
--- a/drivers/usb/drivers.c
+++ b/drivers/usb/drivers.c
@@ -38,6 +38,7 @@
#include <linux/mm.h>
#include <linux/usb.h>
#include <linux/usbdevice_fs.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
/*****************************************************************/
@@ -96,21 +97,24 @@ static ssize_t usb_driver_read(struct file *file, char *buf, size_t nbytes, loff
static loff_t usb_driver_lseek(struct file * file, loff_t offset, int orig)
{
+ loff_t ret;
+
+ lock_kernel();
switch (orig) {
case 0:
file->f_pos = offset;
- return file->f_pos;
-
+ ret = file->f_pos;
+ break;
case 1:
file->f_pos += offset;
- return file->f_pos;
-
+ ret = file->f_pos;
+ break;
case 2:
- return -EINVAL;
-
default:
- return -EINVAL;
+ ret = -EINVAL;
}
+ unlock_kernel();
+ return ret;
}
struct file_operations usbdevfs_drivers_fops = {
diff --git a/drivers/usb/inode.c b/drivers/usb/inode.c
index 53716ae850e5..9dbc95be73f4 100644
--- a/drivers/usb/inode.c
+++ b/drivers/usb/inode.c
@@ -36,7 +36,7 @@
#include <linux/proc_fs.h>
#include <linux/usb.h>
#include <linux/usbdevice_fs.h>
-
+#include <linux/smp_lock.h>
static struct super_operations usbfs_ops;
static struct address_space_operations usbfs_aops;
@@ -295,6 +295,7 @@ static loff_t default_file_lseek (struct file *file, loff_t offset, int orig)
{
loff_t retval = -EINVAL;
+ lock_kernel();
switch(orig) {
case 0:
if (offset > 0) {
@@ -311,6 +312,7 @@ static loff_t default_file_lseek (struct file *file, loff_t offset, int orig)
default:
break;
}
+ unlock_kernel();
return retval;
}
diff --git a/drivers/usb/uhci-debug.h b/drivers/usb/uhci-debug.h
index ed8b768a0064..3206bcdff954 100644
--- a/drivers/usb/uhci-debug.h
+++ b/drivers/usb/uhci-debug.h
@@ -12,6 +12,7 @@
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/proc_fs.h>
+#include <linux/smp_lock.h>
#include <asm/io.h>
#include "uhci.h"
@@ -507,8 +508,11 @@ out:
static loff_t uhci_proc_lseek(struct file *file, loff_t off, int whence)
{
- struct uhci_proc *up = file->private_data;
- loff_t new;
+ struct uhci_proc *up;
+ loff_t new = -1;
+
+ lock_kernel();
+ up = file->private_data;
switch (whence) {
case 0:
@@ -517,12 +521,12 @@ static loff_t uhci_proc_lseek(struct file *file, loff_t off, int whence)
case 1:
new = file->f_pos + off;
break;
- case 2:
- default:
- return -EINVAL;
}
- if (new < 0 || new > up->size)
+ if (new < 0 || new > up->size) {
+ unlock_kernel();
return -EINVAL;
+ }
+ unlock_kernel();
return (file->f_pos = new);
}
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index c5cc2534c4f1..07a3ae80edd9 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -14,6 +14,7 @@
#include <linux/zorro.h>
#include <linux/proc_fs.h>
#include <linux/init.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/amigahw.h>
#include <asm/setup.h>
@@ -21,7 +22,7 @@
static loff_t
proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)
{
- loff_t new;
+ loff_t new = -1;
switch (whence) {
case 0:
@@ -33,11 +34,12 @@ proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)
case 2:
new = sizeof(struct ConfigDev) + off;
break;
- default:
- return -EINVAL;
}
- if (new < 0 || new > sizeof(struct ConfigDev))
+ if (new < 0 || new > sizeof(struct ConfigDev)) {
+ unlock_kernel();
return -EINVAL;
+ }
+ unlock_kernel();
return (file->f_pos = new);
}
diff --git a/fs/driverfs/inode.c b/fs/driverfs/inode.c
index 802d5f8597f9..e5c6de322190 100644
--- a/fs/driverfs/inode.c
+++ b/fs/driverfs/inode.c
@@ -32,6 +32,7 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/device.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
@@ -341,6 +342,7 @@ driverfs_file_lseek(struct file *file, loff_t offset, int orig)
{
loff_t retval = -EINVAL;
+ lock_kernel();
switch(orig) {
case 0:
if (offset > 0) {
@@ -357,6 +359,7 @@ driverfs_file_lseek(struct file *file, loff_t offset, int orig)
default:
break;
}
+ unlock_kernel();
return retval;
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-11 01:53:21 +0000