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

Commit 78a3c3d7 authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

sound: cdev lock_kernel() pushdown 



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

sound/core/sound.c

+14 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <linux/init.h>

#include <linux/slab.h>

#include <linux/smp_lock.h>

#include <linux/time.h>

#include <linux/device.h>

#include <linux/moduleparam.h>
@@ -121,7 +122,7 @@ void *snd_lookup_minor_data(unsigned int minor, int type) 


EXPORT_SYMBOL(snd_lookup_minor_data);



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

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

{

	unsigned int minor = iminor(inode);

	struct snd_minor *mptr = NULL;
@@ -163,6 +164,18 @@ static int snd_open(struct inode *inode, struct file *file) 
	return err;

}





/* BKL pushdown: nasty #ifdef avoidance wrapper */

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

{

	int ret;



	lock_kernel();

	ret = __snd_open(inode, file);

	unlock_kernel();

	return ret;

}



static const struct file_operations snd_fops =

{

	.owner =	THIS_MODULE,

sound/sound_core.c

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

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/smp_lock.h>

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/fs.h>
@@ -464,6 +465,8 @@ int soundcore_open(struct inode *inode, struct file *file) 
	struct sound_unit *s;

	const struct file_operations *new_fops = NULL;



	lock_kernel ();



	chain=unit&0x0F;

	if(chain==4 || chain==5)	/* dsp/audio/dsp16 */

	{
@@ -511,9 +514,11 @@ int soundcore_open(struct inode *inode, struct file *file) 
			file->f_op = fops_get(old_fops);

		}

		fops_put(old_fops);

		unlock_kernel();

		return err;

	}

	spin_unlock(&sound_loader_lock);

	unlock_kernel();

	return -ENODEV;

}