Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2b9857e authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Add a bunch of cycle_kernel_lock() calls 



All of the open() functions which don't need the BKL on their face may
still depend on its acquisition to serialize opens against driver
initialization.  So make those functions acquire then release the BKL to be
on the safe side.

Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent 0b280676

arch/cris/arch-v10/drivers/eeprom.c

+2 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/smp_lock.h>

#include <linux/wait.h>

#include <asm/uaccess.h>

#include "i2c.h"
@@ -375,10 +376,9 @@ int __init eeprom_init(void) 
}



/* Opens the device. */

/* BKL not needed: no global resources accessed */

static int eeprom_open(struct inode * inode, struct file * file)

{



  cycle_kernel_lock();

  if(iminor(inode) != EEPROM_MINOR_NR)

     return -ENXIO;

  if(imajor(inode) != EEPROM_MAJOR_NR)

arch/cris/arch-v10/drivers/i2c.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/module.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/smp_lock.h>

#include <linux/errno.h>

#include <linux/kernel.h>

#include <linux/fs.h>
@@ -566,6 +567,7 @@ i2c_readreg(unsigned char theSlave, unsigned char theReg) 
static int

i2c_open(struct inode *inode, struct file *filp)

{

	cycle_kernel_lock();

	return 0;

}

arch/cris/arch-v32/drivers/cryptocop.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/string.h>

#include <linux/fs.h>

#include <linux/mm.h>

#include <linux/smp_lock.h>

#include <linux/spinlock.h>

#include <linux/stddef.h>
@@ -2302,11 +2303,11 @@ static int cryptocop_job_setup(struct cryptocop_prio_job **pj, struct cryptocop_ 
	return 0;

}



/* No BKL needed here - no global resources accessed */

static int cryptocop_open(struct inode *inode, struct file *filp)

{

	int p = iminor(inode);



	cycle_kernel_lock();

	if (p != CRYPTOCOP_MINOR) return -EINVAL;



	filp->private_data = NULL;

arch/cris/arch-v32/drivers/i2c.c

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/fs.h>

#include <linux/string.h>

#include <linux/init.h>

#include <linux/smp_lock.h>



#include <asm/etraxi2c.h>
@@ -636,6 +637,7 @@ i2c_readreg(unsigned char theSlave, unsigned char theReg) 
static int

i2c_open(struct inode *inode, struct file *filp)

{

	cycle_kernel_lock();

	return 0;

}

drivers/char/cs5535_gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/cdev.h>

#include <linux/ioport.h>

#include <linux/pci.h>

#include <linux/smp_lock.h>

#include <asm/uaccess.h>

#include <asm/io.h>
@@ -153,12 +154,11 @@ static ssize_t cs5535_gpio_read(struct file *file, char __user *buf, 
	return count;

}



/* No BKL needed here - "mask" is the only global resource used

   here and it's a boot-time parameter */

static int cs5535_gpio_open(struct inode *inode, struct file *file)

{

	u32 m = iminor(inode);



	cycle_kernel_lock();

	/* the mask says which pins are usable by this driver */

	if ((mask & (1 << m)) == 0)

		return -EINVAL;