Commit ce8273a5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Frederic Weisbecker
Browse files

smbfs: Push down BKL into ioctl function 



Converting from ->ioctl to ->unlocked_ioctl with explicit
lock_kernel lets us kill the ioctl operation.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
[fixed inode reference in smb_ioctl]
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent 97718390

fs/smbfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ const struct file_operations smb_dir_operations = 
{

	.read		= generic_read_dir,

	.readdir	= smb_readdir,

	.ioctl		= smb_ioctl,

	.unlocked_ioctl	= smb_ioctl,

	.open		= smb_dir_open,

};

fs/smbfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ const struct file_operations smb_file_operations = 
	.aio_read	= smb_file_aio_read,

	.write		= do_sync_write,

	.aio_write	= smb_file_aio_write,

	.ioctl		= smb_ioctl,

	.unlocked_ioctl	= smb_ioctl,

	.mmap		= smb_file_mmap,

	.open		= smb_file_open,

	.release	= smb_file_release,

fs/smbfs/ioctl.c

+6 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/time.h>

#include <linux/mm.h>

#include <linux/highuid.h>

#include <linux/smp_lock.h>

#include <linux/net.h>



#include <linux/smb_fs.h>
@@ -22,14 +23,14 @@ 


#include "proto.h"



int

smb_ioctl(struct inode *inode, struct file *filp,

	  unsigned int cmd, unsigned long arg)

long

smb_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	struct smb_sb_info *server = server_from_inode(inode);

	struct smb_sb_info *server = server_from_inode(filp->f_path.dentry->d_inode);

	struct smb_conn_opt opt;

	int result = -EINVAL;



	lock_kernel();

	switch (cmd) {

		uid16_t uid16;

		uid_t uid32;
@@ -62,6 +63,7 @@ smb_ioctl(struct inode *inode, struct file *filp, 
	default:

		break;

	}

	unlock_kernel();



	return result;

}

fs/smbfs/proto.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern const struct address_space_operations smb_file_aops; 
extern const struct file_operations smb_file_operations;

extern const struct inode_operations smb_file_inode_operations;

/* ioctl.c */

extern int smb_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg);

extern long smb_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);

/* smbiod.c */

extern void smbiod_wake_up(void);

extern int smbiod_register_server(struct smb_sb_info *server);