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

Commit c5311781 authored by Brian Gerst's avatar Brian Gerst Committed by Linus Torvalds
Browse files

[PATCH] Clean up mtrr compat ioctl code 



Handle 32-bit mtrr ioctls in the mtrr driver instead of the ia32
compatability layer.

Signed-off-by: default avatarBrian Gerst <bgerst@didntduck.org>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent daedb82d

arch/i386/kernel/cpu/mtrr/if.c

+74 −45
Original line number Diff line number Diff line
@@ -149,60 +149,89 @@ mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos) 
	return -EINVAL;

}



static int

mtrr_ioctl(struct inode *inode, struct file *file,

	   unsigned int cmd, unsigned long __arg)

static long

mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg)

{

	int err;

	int err = 0;

	mtrr_type type;

	struct mtrr_sentry sentry;

	struct mtrr_gentry gentry;

	void __user *arg = (void __user *) __arg;



	switch (cmd) {

	case MTRRIOC_ADD_ENTRY:

	case MTRRIOC_SET_ENTRY:

	case MTRRIOC_DEL_ENTRY:

	case MTRRIOC_KILL_ENTRY:

	case MTRRIOC_ADD_PAGE_ENTRY:

	case MTRRIOC_SET_PAGE_ENTRY:

	case MTRRIOC_DEL_PAGE_ENTRY:

	case MTRRIOC_KILL_PAGE_ENTRY:

		if (copy_from_user(&sentry, arg, sizeof sentry))

			return -EFAULT;

		break;

	case MTRRIOC_GET_ENTRY:

	case MTRRIOC_GET_PAGE_ENTRY:

		if (copy_from_user(&gentry, arg, sizeof gentry))

			return -EFAULT;

		break;

#ifdef CONFIG_COMPAT

	case MTRRIOC32_ADD_ENTRY:

	case MTRRIOC32_SET_ENTRY:

	case MTRRIOC32_DEL_ENTRY:

	case MTRRIOC32_KILL_ENTRY:

	case MTRRIOC32_ADD_PAGE_ENTRY:

	case MTRRIOC32_SET_PAGE_ENTRY:

	case MTRRIOC32_DEL_PAGE_ENTRY:

	case MTRRIOC32_KILL_PAGE_ENTRY: {

		struct mtrr_sentry32 __user *s32 = (struct mtrr_sentry32 __user *)__arg;

		err = get_user(sentry.base, &s32->base);

		err |= get_user(sentry.size, &s32->size);

		err |= get_user(sentry.type, &s32->type);

		if (err)

			return err;

		break;

	}

	case MTRRIOC32_GET_ENTRY:

	case MTRRIOC32_GET_PAGE_ENTRY: {

		struct mtrr_gentry32 __user *g32 = (struct mtrr_gentry32 __user *)__arg;

		err = get_user(gentry.regnum, &g32->regnum);

		err |= get_user(gentry.base, &g32->base);

		err |= get_user(gentry.size, &g32->size);

		err |= get_user(gentry.type, &g32->type);

		if (err)

			return err;

		break;

	}

#endif

	}



	switch (cmd) {

	default:

		return -ENOTTY;

	case MTRRIOC_ADD_ENTRY:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (copy_from_user(&sentry, arg, sizeof sentry))

			return -EFAULT;

		err =

		    mtrr_file_add(sentry.base, sentry.size, sentry.type, 1,

				  file, 0);

		if (err < 0)

			return err;

		break;

	case MTRRIOC_SET_ENTRY:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (copy_from_user(&sentry, arg, sizeof sentry))

			return -EFAULT;

		err = mtrr_add(sentry.base, sentry.size, sentry.type, 0);

		if (err < 0)

			return err;

		break;

	case MTRRIOC_DEL_ENTRY:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (copy_from_user(&sentry, arg, sizeof sentry))

			return -EFAULT;

		err = mtrr_file_del(sentry.base, sentry.size, file, 0);

		if (err < 0)

			return err;

		break;

	case MTRRIOC_KILL_ENTRY:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (copy_from_user(&sentry, arg, sizeof sentry))

			return -EFAULT;

		err = mtrr_del(-1, sentry.base, sentry.size);

		if (err < 0)

			return err;

		break;

	case MTRRIOC_GET_ENTRY:

		if (copy_from_user(&gentry, arg, sizeof gentry))

			return -EFAULT;

		if (gentry.regnum >= num_var_ranges)

			return -EINVAL;

		mtrr_if->get(gentry.regnum, &gentry.base, &gentry.size, &type);
@@ -217,60 +246,59 @@ mtrr_ioctl(struct inode *inode, struct file *file, 
			gentry.type = type;

		}



		if (copy_to_user(arg, &gentry, sizeof gentry))

			return -EFAULT;

		break;

	case MTRRIOC_ADD_PAGE_ENTRY:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (copy_from_user(&sentry, arg, sizeof sentry))

			return -EFAULT;

		err =

		    mtrr_file_add(sentry.base, sentry.size, sentry.type, 1,

				  file, 1);

		if (err < 0)

			return err;

		break;

	case MTRRIOC_SET_PAGE_ENTRY:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (copy_from_user(&sentry, arg, sizeof sentry))

			return -EFAULT;

		err = mtrr_add_page(sentry.base, sentry.size, sentry.type, 0);

		if (err < 0)

			return err;

		break;

	case MTRRIOC_DEL_PAGE_ENTRY:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (copy_from_user(&sentry, arg, sizeof sentry))

			return -EFAULT;

		err = mtrr_file_del(sentry.base, sentry.size, file, 1);

		if (err < 0)

			return err;

		break;

	case MTRRIOC_KILL_PAGE_ENTRY:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (copy_from_user(&sentry, arg, sizeof sentry))

			return -EFAULT;

		err = mtrr_del_page(-1, sentry.base, sentry.size);

		if (err < 0)

			return err;

		break;

	case MTRRIOC_GET_PAGE_ENTRY:

		if (copy_from_user(&gentry, arg, sizeof gentry))

			return -EFAULT;

		if (gentry.regnum >= num_var_ranges)

			return -EINVAL;

		mtrr_if->get(gentry.regnum, &gentry.base, &gentry.size, &type);

		gentry.type = type;

		break;

	}



	if (err)

		return err;



	switch(cmd) {

	case MTRRIOC_GET_ENTRY:

	case MTRRIOC_GET_PAGE_ENTRY:

		if (copy_to_user(arg, &gentry, sizeof gentry))

			return -EFAULT;

			err = -EFAULT;

		break;

#ifdef CONFIG_COMPAT

	case MTRRIOC32_GET_ENTRY:

	case MTRRIOC32_GET_PAGE_ENTRY: {

		struct mtrr_gentry32 __user *g32 = (struct mtrr_gentry32 __user *)__arg;

		err = put_user(gentry.base, &g32->base);

		err |= put_user(gentry.size, &g32->size);

		err |= put_user(gentry.regnum, &g32->regnum);

		err |= put_user(gentry.type, &g32->type);

		break;

	}

	return 0;

#endif

	}

	return err;

}



static int
@@ -310,7 +338,8 @@ static struct file_operations mtrr_fops = { 
	.read    = seq_read,

	.llseek  = seq_lseek,

	.write   = mtrr_write,

	.ioctl   = mtrr_ioctl,

	.unlocked_ioctl = mtrr_ioctl,

	.compat_ioctl = mtrr_ioctl,

	.release = mtrr_close,

};

arch/x86_64/ia32/ia32_ioctl.c

+0 −96
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#define INCLUDES

#include <linux/syscalls.h>

#include "compat_ioctl.c"

#include <asm/mtrr.h>

#include <asm/ia32.h>



#define CODE
@@ -85,90 +84,6 @@ static int rtc32_ioctl(unsigned fd, unsigned cmd, unsigned long arg) 
	return sys_ioctl(fd,cmd,arg); 

} 



/* /proc/mtrr ioctls */





struct mtrr_sentry32

{

    compat_ulong_t base;    /*  Base address     */

    compat_uint_t size;    /*  Size of region   */

    compat_uint_t type;     /*  Type of region   */

};



struct mtrr_gentry32

{

    compat_ulong_t regnum;   /*  Register number  */

    compat_uint_t base;    /*  Base address     */

    compat_uint_t size;    /*  Size of region   */

    compat_uint_t type;     /*  Type of region   */

};



#define	MTRR_IOCTL_BASE	'M'



#define MTRRIOC32_ADD_ENTRY        _IOW(MTRR_IOCTL_BASE,  0, struct mtrr_sentry32)

#define MTRRIOC32_SET_ENTRY        _IOW(MTRR_IOCTL_BASE,  1, struct mtrr_sentry32)

#define MTRRIOC32_DEL_ENTRY        _IOW(MTRR_IOCTL_BASE,  2, struct mtrr_sentry32)

#define MTRRIOC32_GET_ENTRY        _IOWR(MTRR_IOCTL_BASE, 3, struct mtrr_gentry32)

#define MTRRIOC32_KILL_ENTRY       _IOW(MTRR_IOCTL_BASE,  4, struct mtrr_sentry32)

#define MTRRIOC32_ADD_PAGE_ENTRY   _IOW(MTRR_IOCTL_BASE,  5, struct mtrr_sentry32)

#define MTRRIOC32_SET_PAGE_ENTRY   _IOW(MTRR_IOCTL_BASE,  6, struct mtrr_sentry32)

#define MTRRIOC32_DEL_PAGE_ENTRY   _IOW(MTRR_IOCTL_BASE,  7, struct mtrr_sentry32)

#define MTRRIOC32_GET_PAGE_ENTRY   _IOWR(MTRR_IOCTL_BASE, 8, struct mtrr_gentry32)

#define MTRRIOC32_KILL_PAGE_ENTRY  _IOW(MTRR_IOCTL_BASE,  9, struct mtrr_sentry32)





static int mtrr_ioctl32(unsigned int fd, unsigned int cmd, unsigned long arg)

{ 

	struct mtrr_gentry g;

	struct mtrr_sentry s;

	int get = 0, err = 0; 

	struct mtrr_gentry32 __user *g32 = (struct mtrr_gentry32 __user *)arg; 

	mm_segment_t oldfs = get_fs(); 



	switch (cmd) { 

#define SET(x) case MTRRIOC32_ ## x ## _ENTRY: cmd = MTRRIOC_ ## x ## _ENTRY; break 

#define GET(x) case MTRRIOC32_ ## x ## _ENTRY: cmd = MTRRIOC_ ## x ## _ENTRY; get=1; break

		SET(ADD);

		SET(SET); 

		SET(DEL);

		GET(GET); 

		SET(KILL);

		SET(ADD_PAGE); 

		SET(SET_PAGE); 

		SET(DEL_PAGE); 

		GET(GET_PAGE); 

		SET(KILL_PAGE); 

	} 

	

	if (get) { 

		err = get_user(g.regnum, &g32->regnum);

		err |= get_user(g.base, &g32->base);

		err |= get_user(g.size, &g32->size);

		err |= get_user(g.type, &g32->type); 



		arg = (unsigned long)&g; 

	} else { 

		struct mtrr_sentry32 __user *s32 = (struct mtrr_sentry32 __user *)arg;

		err = get_user(s.base, &s32->base);

		err |= get_user(s.size, &s32->size);

		err |= get_user(s.type, &s32->type);



		arg = (unsigned long)&s; 

	} 

	if (err) return err;

	

	set_fs(KERNEL_DS); 

	err = sys_ioctl(fd, cmd, arg); 

	set_fs(oldfs); 

		

	if (!err && get) { 

		err = put_user(g.base, &g32->base);

		err |= put_user(g.size, &g32->size);

		err |= put_user(g.regnum, &g32->regnum);

		err |= put_user(g.type, &g32->type); 

	} 

	return err;

} 



#define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl_trans_handler_t)(handler) }, 

#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL(cmd,sys_ioctl)
@@ -193,17 +108,6 @@ HANDLE_IOCTL(RTC_IRQP_SET32, rtc32_ioctl) 
HANDLE_IOCTL(RTC_EPOCH_READ32, rtc32_ioctl)

HANDLE_IOCTL(RTC_EPOCH_SET32, rtc32_ioctl)

/* take care of sizeof(sizeof()) breakage */

/* mtrr */

HANDLE_IOCTL(MTRRIOC32_ADD_ENTRY, mtrr_ioctl32)

HANDLE_IOCTL(MTRRIOC32_SET_ENTRY, mtrr_ioctl32)

HANDLE_IOCTL(MTRRIOC32_DEL_ENTRY, mtrr_ioctl32)

HANDLE_IOCTL(MTRRIOC32_GET_ENTRY, mtrr_ioctl32)

HANDLE_IOCTL(MTRRIOC32_KILL_ENTRY, mtrr_ioctl32)

HANDLE_IOCTL(MTRRIOC32_ADD_PAGE_ENTRY, mtrr_ioctl32)

HANDLE_IOCTL(MTRRIOC32_SET_PAGE_ENTRY, mtrr_ioctl32)

HANDLE_IOCTL(MTRRIOC32_DEL_PAGE_ENTRY, mtrr_ioctl32)

HANDLE_IOCTL(MTRRIOC32_GET_PAGE_ENTRY, mtrr_ioctl32)

HANDLE_IOCTL(MTRRIOC32_KILL_PAGE_ENTRY, mtrr_ioctl32)

}; 



int ioctl_table_size = ARRAY_SIZE(ioctl_start);

include/asm-x86_64/mtrr.h

+33 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#include <linux/config.h>

#include <linux/ioctl.h>

#include <linux/compat.h>



#define	MTRR_IOCTL_BASE	'M'
@@ -105,4 +106,36 @@ static __inline__ int mtrr_del_page (int reg, unsigned long base, 


#endif



#ifdef CONFIG_COMPAT



struct mtrr_sentry32

{

    compat_ulong_t base;    /*  Base address     */

    compat_uint_t size;    /*  Size of region   */

    compat_uint_t type;     /*  Type of region   */

};



struct mtrr_gentry32

{

    compat_ulong_t regnum;   /*  Register number  */

    compat_uint_t base;    /*  Base address     */

    compat_uint_t size;    /*  Size of region   */

    compat_uint_t type;     /*  Type of region   */

};



#define MTRR_IOCTL_BASE 'M'



#define MTRRIOC32_ADD_ENTRY        _IOW(MTRR_IOCTL_BASE,  0, struct mtrr_sentry32)

#define MTRRIOC32_SET_ENTRY        _IOW(MTRR_IOCTL_BASE,  1, struct mtrr_sentry32)

#define MTRRIOC32_DEL_ENTRY        _IOW(MTRR_IOCTL_BASE,  2, struct mtrr_sentry32)

#define MTRRIOC32_GET_ENTRY        _IOWR(MTRR_IOCTL_BASE, 3, struct mtrr_gentry32)

#define MTRRIOC32_KILL_ENTRY       _IOW(MTRR_IOCTL_BASE,  4, struct mtrr_sentry32)

#define MTRRIOC32_ADD_PAGE_ENTRY   _IOW(MTRR_IOCTL_BASE,  5, struct mtrr_sentry32)

#define MTRRIOC32_SET_PAGE_ENTRY   _IOW(MTRR_IOCTL_BASE,  6, struct mtrr_sentry32)

#define MTRRIOC32_DEL_PAGE_ENTRY   _IOW(MTRR_IOCTL_BASE,  7, struct mtrr_sentry32)

#define MTRRIOC32_GET_PAGE_ENTRY   _IOWR(MTRR_IOCTL_BASE, 8, struct mtrr_gentry32)

#define MTRRIOC32_KILL_PAGE_ENTRY  _IOW(MTRR_IOCTL_BASE,  9, struct mtrr_sentry32)



#endif /* CONFIG_COMPAT */



#endif  /*  _LINUX_MTRR_H  */