Skip to content

L
linux
Commit c72113b5 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] ncpfs compat ioctls 

This takes ncpfs ioctl handling into fs/compat_ioctl.c, removing it from
ppc64 and sparc64 code.

Code sanitized, switched to compat_alloc_user_space(), bunch of
{k,v}malloc() killed.
parent 86042707
Show whitespace changes
Inline Side-by-side
Showing with 193 additions and 632 deletions
arch/ppc64/kernel/ioctl32.c
View file @ c72113b5
...@@ -29,307 +29,6 @@ ...@@ -29,307 +29,6 @@
#define CODE #define CODE
#include "compat_ioctl.c" #include "compat_ioctl.c"
struct ncp_ioctl_request_32 {
unsigned int function;
unsigned int size;
compat_caddr_t data;
};
struct ncp_fs_info_v2_32 {
int version;
unsigned int mounted_uid;
unsigned int connection;
unsigned int buffer_size;
unsigned int volume_number;
__u32 directory_id;
__u32 dummy1;
__u32 dummy2;
__u32 dummy3;
};
struct ncp_objectname_ioctl_32
{
int auth_type;
unsigned int object_name_len;
compat_caddr_t object_name; /* an userspace data, in most cases user name */
};
struct ncp_privatedata_ioctl_32
{
unsigned int len;
compat_caddr_t data; /* ~1000 for NDS */
};
#define NCP_IOC_NCPREQUEST_32 _IOR('n', 1, struct ncp_ioctl_request_32)
#define NCP_IOC_GETMOUNTUID2_32 _IOW('n', 2, unsigned int)
#define NCP_IOC_GET_FS_INFO_V2_32 _IOWR('n', 4, struct ncp_fs_info_v2_32)
#define NCP_IOC_GETOBJECTNAME_32 _IOWR('n', 9, struct ncp_objectname_ioctl_32)
#define NCP_IOC_SETOBJECTNAME_32 _IOR('n', 9, struct ncp_objectname_ioctl_32)
#define NCP_IOC_GETPRIVATEDATA_32 _IOWR('n', 10, struct ncp_privatedata_ioctl_32)
#define NCP_IOC_SETPRIVATEDATA_32 _IOR('n', 10, struct ncp_privatedata_ioctl_32)
static int do_ncp_ncprequest(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_ioctl_request_32 n32;
struct ncp_ioctl_request n;
mm_segment_t old_fs;
int err;
if (copy_from_user(&n32, (struct ncp_ioctl_request_32*)arg,
sizeof(n32)))
return -EFAULT;
n.function = n32.function;
n.size = n32.size;
if (n.size > 65536)
return -EINVAL;
n.data = vmalloc(65536); /* 65536 must be same as NCP_PACKET_SIZE_INTERNAL in ncpfs */
if (!n.data)
return -ENOMEM;
err = -EFAULT;
if (copy_from_user(n.data, (void *)A(n32.data), n.size))
goto out;
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_NCPREQUEST, (unsigned long)&n);
set_fs (old_fs);
if(err <= 0)
goto out;
if (err > 65536) {
err = -EINVAL;
goto out;
}
if (copy_to_user((void *)A(n32.data), n.data, err)) {
err = -EFAULT;
goto out;
}
out:
vfree(n.data);
return err;
}
static int do_ncp_getmountuid2(unsigned int fd, unsigned int cmd, unsigned long arg)
{
mm_segment_t old_fs = get_fs();
__kernel_uid_t kuid;
int err;
cmd = NCP_IOC_GETMOUNTUID2;
set_fs(KERNEL_DS);
err = sys_ioctl(fd, cmd, (unsigned long)&kuid);
set_fs(old_fs);
if (!err)
err = put_user(kuid, (unsigned int*)arg);
return err;
}
static int do_ncp_getfsinfo2(unsigned int fd, unsigned int cmd, unsigned long arg)
{
mm_segment_t old_fs = get_fs();
struct ncp_fs_info_v2_32 n32;
struct ncp_fs_info_v2 n;
int err;
if (copy_from_user(&n32, (struct ncp_fs_info_v2_32*)arg, sizeof(n32)))
return -EFAULT;
if (n32.version != NCP_GET_FS_INFO_VERSION_V2)
return -EINVAL;
n.version = NCP_GET_FS_INFO_VERSION_V2;
set_fs(KERNEL_DS);
err = sys_ioctl(fd, NCP_IOC_GET_FS_INFO_V2, (unsigned long)&n);
set_fs(old_fs);
if (!err) {
n32.version = n.version;
n32.mounted_uid = n.mounted_uid;
n32.connection = n.connection;
n32.buffer_size = n.buffer_size;
n32.volume_number = n.volume_number;
n32.directory_id = n.directory_id;
n32.dummy1 = n.dummy1;
n32.dummy2 = n.dummy2;
n32.dummy3 = n.dummy3;
err = copy_to_user((struct ncp_fs_info_v2_32*)arg, &n32, sizeof(n32)) ? -EFAULT : 0;
}
return err;
}
static int do_ncp_getobjectname(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_objectname_ioctl_32 n32;
struct ncp_objectname_ioctl n;
mm_segment_t old_fs;
int err;
size_t tl;
if (copy_from_user(&n32, (struct ncp_objectname_ioctl_32*)arg,
sizeof(n32)))
return -EFAULT;
n.object_name_len = tl = n32.object_name_len;
if (tl) {
n.object_name = kmalloc(tl, GFP_KERNEL);
if (!n.object_name)
return -ENOMEM;
} else {
n.object_name = NULL;
}
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_GETOBJECTNAME, (unsigned long)&n);
set_fs (old_fs);
if(err)
goto out;
if (tl > n.object_name_len)
tl = n.object_name_len;
err = -EFAULT;
if (tl && copy_to_user((void *)A(n32.object_name), n.object_name, tl))
goto out;
n32.auth_type = n.auth_type;
n32.object_name_len = n.object_name_len;
if (copy_to_user((struct ncp_objectname_ioctl_32*)arg, &n32, sizeof(n32)))
goto out;
err = 0;
out:
if (n.object_name)
kfree(n.object_name);
return err;
}
static int do_ncp_setobjectname(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_objectname_ioctl_32 n32;
struct ncp_objectname_ioctl n;
mm_segment_t old_fs;
int err;
size_t tl;
if (copy_from_user(&n32, (struct ncp_objectname_ioctl_32*)arg,
sizeof(n32)))
return -EFAULT;
n.auth_type = n32.auth_type;
n.object_name_len = tl = n32.object_name_len;
if (tl) {
n.object_name = kmalloc(tl, GFP_KERNEL);
if (!n.object_name)
return -ENOMEM;
err = -EFAULT;
if (copy_from_user(n.object_name, (void *)A(n32.object_name), tl))
goto out;
} else {
n.object_name = NULL;
}
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_SETOBJECTNAME, (unsigned long)&n);
set_fs (old_fs);
out:
if (n.object_name)
kfree(n.object_name);
return err;
}
static int do_ncp_getprivatedata(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_privatedata_ioctl_32 n32;
struct ncp_privatedata_ioctl n;
mm_segment_t old_fs;
int err;
size_t tl;
if (copy_from_user(&n32, (struct ncp_privatedata_ioctl_32*)arg,
sizeof(n32)))
return -EFAULT;
n.len = tl = n32.len;
if (tl) {
n.data = kmalloc(tl, GFP_KERNEL);
if (!n.data)
return -ENOMEM;
} else {
n.data = NULL;
}
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_GETPRIVATEDATA, (unsigned long)&n);
set_fs (old_fs);
if(err)
goto out;
if (tl > n.len)
tl = n.len;
err = -EFAULT;
if (tl && copy_to_user((void *)A(n32.data), n.data, tl))
goto out;
n32.len = n.len;
if (copy_to_user((struct ncp_privatedata_ioctl_32*)arg, &n32, sizeof(n32)))
goto out;
err = 0;
out:
if (n.data)
kfree(n.data);
return err;
}
static int do_ncp_setprivatedata(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_privatedata_ioctl_32 n32;
struct ncp_privatedata_ioctl n;
mm_segment_t old_fs;
int err;
size_t tl;
if (copy_from_user(&n32, (struct ncp_privatedata_ioctl_32*)arg,
sizeof(n32)))
return -EFAULT;
n.len = tl = n32.len;
if (tl) {
n.data = kmalloc(tl, GFP_KERNEL);
if (!n.data)
return -ENOMEM;
err = -EFAULT;
if (copy_from_user(n.data, (void *)A(n32.data), tl))
goto out;
} else {
n.data = NULL;
}
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_SETPRIVATEDATA, (unsigned long)&n);
set_fs (old_fs);
out:
if (n.data)
kfree(n.data);
return err;
}
#define HANDLE_IOCTL(cmd,handler) { cmd, (ioctl_trans_handler_t)handler, 0 }, #define HANDLE_IOCTL(cmd,handler) { cmd, (ioctl_trans_handler_t)handler, 0 },
#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL(cmd,sys_ioctl) #define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL(cmd,sys_ioctl)
...@@ -350,17 +49,6 @@ COMPATIBLE_IOCTL(TIOCSLTC) ...@@ -350,17 +49,6 @@ COMPATIBLE_IOCTL(TIOCSLTC)
COMPATIBLE_IOCTL(_IOR('p', 20, int[7])) /* RTCGET */ COMPATIBLE_IOCTL(_IOR('p', 20, int[7])) /* RTCGET */
COMPATIBLE_IOCTL(_IOW('p', 21, int[7])) /* RTCSET */ COMPATIBLE_IOCTL(_IOW('p', 21, int[7])) /* RTCSET */
/* And these ioctls need translation */
/* NCPFS */
HANDLE_IOCTL(NCP_IOC_NCPREQUEST_32, do_ncp_ncprequest)
HANDLE_IOCTL(NCP_IOC_GETMOUNTUID2_32, do_ncp_getmountuid2)
HANDLE_IOCTL(NCP_IOC_GET_FS_INFO_V2_32, do_ncp_getfsinfo2)
HANDLE_IOCTL(NCP_IOC_GETOBJECTNAME_32, do_ncp_getobjectname)
HANDLE_IOCTL(NCP_IOC_SETOBJECTNAME_32, do_ncp_setobjectname)
HANDLE_IOCTL(NCP_IOC_GETPRIVATEDATA_32, do_ncp_getprivatedata)
HANDLE_IOCTL(NCP_IOC_SETPRIVATEDATA_32, do_ncp_setprivatedata)
IOCTL_TABLE_END IOCTL_TABLE_END
int ioctl_table_size = ARRAY_SIZE(ioctl_start); int ioctl_table_size = ARRAY_SIZE(ioctl_start);
arch/sparc64/kernel/ioctl32.c
View file @ c72113b5
...@@ -148,306 +148,6 @@ static int fbiogscursor(unsigned int fd, unsigned int cmd, unsigned long arg) ...@@ -148,306 +148,6 @@ static int fbiogscursor(unsigned int fd, unsigned int cmd, unsigned long arg)
return ret; return ret;
} }
struct ncp_ioctl_request_32 {
unsigned int function;
unsigned int size;
compat_caddr_t data;
};
struct ncp_fs_info_v2_32 {
int version;
unsigned int mounted_uid;
unsigned int connection;
unsigned int buffer_size;
unsigned int volume_number;
__u32 directory_id;
__u32 dummy1;
__u32 dummy2;
__u32 dummy3;
};
struct ncp_objectname_ioctl_32
{
int auth_type;
unsigned int object_name_len;
compat_caddr_t object_name; /* an userspace data, in most cases user name */
};
struct ncp_privatedata_ioctl_32
{
unsigned int len;
compat_caddr_t data; /* ~1000 for NDS */
};
#define NCP_IOC_NCPREQUEST_32 _IOR('n', 1, struct ncp_ioctl_request_32)
#define NCP_IOC_GETMOUNTUID2_32 _IOW('n', 2, unsigned int)
#define NCP_IOC_GET_FS_INFO_V2_32 _IOWR('n', 4, struct ncp_fs_info_v2_32)
#define NCP_IOC_GETOBJECTNAME_32 _IOWR('n', 9, struct ncp_objectname_ioctl_32)
#define NCP_IOC_SETOBJECTNAME_32 _IOR('n', 9, struct ncp_objectname_ioctl_32)
#define NCP_IOC_GETPRIVATEDATA_32 _IOWR('n', 10, struct ncp_privatedata_ioctl_32)
#define NCP_IOC_SETPRIVATEDATA_32 _IOR('n', 10, struct ncp_privatedata_ioctl_32)
static int do_ncp_ncprequest(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_ioctl_request_32 n32;
struct ncp_ioctl_request n;
mm_segment_t old_fs;
int err;
if (copy_from_user(&n32, (struct ncp_ioctl_request_32*)arg,
sizeof(n32)))
return -EFAULT;
n.function = n32.function;
n.size = n32.size;
if (n.size > 65536)
return -EINVAL;
n.data = vmalloc(65536); /* 65536 must be same as NCP_PACKET_SIZE_INTERNAL in ncpfs */
if (!n.data)
return -ENOMEM;
err = -EFAULT;
if (copy_from_user(n.data, A(n32.data), n.size))
goto out;
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_NCPREQUEST, (unsigned long)&n);
set_fs (old_fs);
if(err <= 0)
goto out;
if (err > 65536) {
err = -EINVAL;
goto out;
}
if (copy_to_user(A(n32.data), n.data, err)) {
err = -EFAULT;
goto out;
}
out:
vfree(n.data);
return err;
}
static int do_ncp_getmountuid2(unsigned int fd, unsigned int cmd, unsigned long arg)
{
mm_segment_t old_fs = get_fs();
__kernel_uid_t kuid;
int err;
cmd = NCP_IOC_GETMOUNTUID2;
set_fs(KERNEL_DS);
err = sys_ioctl(fd, cmd, (unsigned long)&kuid);
set_fs(old_fs);
if (!err)
err = put_user(kuid, (unsigned int*)arg);
return err;
}
static int do_ncp_getfsinfo2(unsigned int fd, unsigned int cmd, unsigned long arg)
{
mm_segment_t old_fs = get_fs();
struct ncp_fs_info_v2_32 n32;
struct ncp_fs_info_v2 n;
int err;
if (copy_from_user(&n32, (struct ncp_fs_info_v2_32*)arg, sizeof(n32)))
return -EFAULT;
if (n32.version != NCP_GET_FS_INFO_VERSION_V2)
return -EINVAL;
n.version = NCP_GET_FS_INFO_VERSION_V2;
set_fs(KERNEL_DS);
err = sys_ioctl(fd, NCP_IOC_GET_FS_INFO_V2, (unsigned long)&n);
set_fs(old_fs);
if (!err) {
n32.version = n.version;
n32.mounted_uid = n.mounted_uid;
n32.connection = n.connection;
n32.buffer_size = n.buffer_size;
n32.volume_number = n.volume_number;
n32.directory_id = n.directory_id;
n32.dummy1 = n.dummy1;
n32.dummy2 = n.dummy2;
n32.dummy3 = n.dummy3;
err = copy_to_user((struct ncp_fs_info_v2_32*)arg, &n32, sizeof(n32)) ? -EFAULT : 0;
}
return err;
}
static int do_ncp_getobjectname(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_objectname_ioctl_32 n32;
struct ncp_objectname_ioctl n;
mm_segment_t old_fs;
int err;
size_t tl;
if (copy_from_user(&n32, (struct ncp_objectname_ioctl_32*)arg,
sizeof(n32)))
return -EFAULT;
n.object_name_len = tl = n32.object_name_len;
if (tl) {
n.object_name = kmalloc(tl, GFP_KERNEL);
if (!n.object_name)
return -ENOMEM;
} else {
n.object_name = NULL;
}
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_GETOBJECTNAME, (unsigned long)&n);
set_fs (old_fs);
if(err)
goto out;
if (tl > n.object_name_len)
tl = n.object_name_len;
err = -EFAULT;
if (tl && copy_to_user(A(n32.object_name), n.object_name, tl))
goto out;
n32.auth_type = n.auth_type;
n32.object_name_len = n.object_name_len;
if (copy_to_user((struct ncp_objectname_ioctl_32*)arg, &n32, sizeof(n32)))
goto out;
err = 0;
out:
if (n.object_name)
kfree(n.object_name);
return err;
}
static int do_ncp_setobjectname(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_objectname_ioctl_32 n32;
struct ncp_objectname_ioctl n;
mm_segment_t old_fs;
int err;
size_t tl;
if (copy_from_user(&n32, (struct ncp_objectname_ioctl_32*)arg,
sizeof(n32)))
return -EFAULT;
n.auth_type = n32.auth_type;
n.object_name_len = tl = n32.object_name_len;
if (tl) {
n.object_name = kmalloc(tl, GFP_KERNEL);
if (!n.object_name)
return -ENOMEM;
err = -EFAULT;
if (copy_from_user(n.object_name, A(n32.object_name), tl))
goto out;
} else {
n.object_name = NULL;
}
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_SETOBJECTNAME, (unsigned long)&n);
set_fs (old_fs);
out:
if (n.object_name)
kfree(n.object_name);
return err;
}
static int do_ncp_getprivatedata(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_privatedata_ioctl_32 n32;
struct ncp_privatedata_ioctl n;
mm_segment_t old_fs;
int err;
size_t tl;
if (copy_from_user(&n32, (struct ncp_privatedata_ioctl_32*)arg,
sizeof(n32)))
return -EFAULT;
n.len = tl = n32.len;
if (tl) {
n.data = kmalloc(tl, GFP_KERNEL);
if (!n.data)
return -ENOMEM;
} else {
n.data = NULL;
}
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_GETPRIVATEDATA, (unsigned long)&n);
set_fs (old_fs);
if(err)
goto out;
if (tl > n.len)
tl = n.len;
err = -EFAULT;
if (tl && copy_to_user(A(n32.data), n.data, tl))
goto out;
n32.len = n.len;
if (copy_to_user((struct ncp_privatedata_ioctl_32*)arg, &n32, sizeof(n32)))
goto out;
err = 0;
out:
if (n.data)
kfree(n.data);
return err;
}
static int do_ncp_setprivatedata(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_privatedata_ioctl_32 n32;
struct ncp_privatedata_ioctl n;
mm_segment_t old_fs;
int err;
size_t tl;
if (copy_from_user(&n32, (struct ncp_privatedata_ioctl_32*)arg,
sizeof(n32)))
return -EFAULT;
n.len = tl = n32.len;
if (tl) {
n.data = kmalloc(tl, GFP_KERNEL);
if (!n.data)
return -ENOMEM;
err = -EFAULT;
if (copy_from_user(n.data, A(n32.data), tl))
goto out;
} else {
n.data = NULL;
}
old_fs = get_fs(); set_fs (KERNEL_DS);
err = sys_ioctl (fd, NCP_IOC_SETPRIVATEDATA, (unsigned long)&n);
set_fs (old_fs);
out:
if (n.data)
kfree(n.data);
return err;
}
#if defined(CONFIG_DRM) || defined(CONFIG_DRM_MODULE) #if defined(CONFIG_DRM) || defined(CONFIG_DRM_MODULE)
/* This really belongs in include/linux/drm.h -DaveM */ /* This really belongs in include/linux/drm.h -DaveM */
#include "../../../drivers/char/drm/drm.h" #include "../../../drivers/char/drm/drm.h"
...@@ -1070,18 +770,6 @@ COMPATIBLE_IOCTL(AUDIO_GETDEV) ...@@ -1070,18 +770,6 @@ COMPATIBLE_IOCTL(AUDIO_GETDEV)
COMPATIBLE_IOCTL(AUDIO_GETDEV_SUNOS) COMPATIBLE_IOCTL(AUDIO_GETDEV_SUNOS)
COMPATIBLE_IOCTL(AUDIO_FLUSH) COMPATIBLE_IOCTL(AUDIO_FLUSH)
COMPATIBLE_IOCTL(AUTOFS_IOC_EXPIRE_MULTI) COMPATIBLE_IOCTL(AUTOFS_IOC_EXPIRE_MULTI)
/* NCP ioctls which do not need any translations */
COMPATIBLE_IOCTL(NCP_IOC_CONN_LOGGED_IN)
COMPATIBLE_IOCTL(NCP_IOC_SIGN_INIT)
COMPATIBLE_IOCTL(NCP_IOC_SIGN_WANTED)
COMPATIBLE_IOCTL(NCP_IOC_SET_SIGN_WANTED)
COMPATIBLE_IOCTL(NCP_IOC_LOCKUNLOCK)
COMPATIBLE_IOCTL(NCP_IOC_GETROOT)
COMPATIBLE_IOCTL(NCP_IOC_SETROOT)
COMPATIBLE_IOCTL(NCP_IOC_GETCHARSETS)
COMPATIBLE_IOCTL(NCP_IOC_SETCHARSETS)
COMPATIBLE_IOCTL(NCP_IOC_GETDENTRYTTL)
COMPATIBLE_IOCTL(NCP_IOC_SETDENTRYTTL)
#if defined(CONFIG_DRM) || defined(CONFIG_DRM_MODULE) #if defined(CONFIG_DRM) || defined(CONFIG_DRM_MODULE)
COMPATIBLE_IOCTL(DRM_IOCTL_GET_MAGIC) COMPATIBLE_IOCTL(DRM_IOCTL_GET_MAGIC)
COMPATIBLE_IOCTL(DRM_IOCTL_IRQ_BUSID) COMPATIBLE_IOCTL(DRM_IOCTL_IRQ_BUSID)
...@@ -1107,14 +795,6 @@ COMPATIBLE_IOCTL(WIOCSTART) ...@@ -1107,14 +795,6 @@ COMPATIBLE_IOCTL(WIOCSTART)
COMPATIBLE_IOCTL(WIOCSTOP) COMPATIBLE_IOCTL(WIOCSTOP)
COMPATIBLE_IOCTL(WIOCGSTAT) COMPATIBLE_IOCTL(WIOCGSTAT)
/* And these ioctls need translation */ /* And these ioctls need translation */
/* NCPFS */
HANDLE_IOCTL(NCP_IOC_NCPREQUEST_32, do_ncp_ncprequest)
HANDLE_IOCTL(NCP_IOC_GETMOUNTUID2_32, do_ncp_getmountuid2)
HANDLE_IOCTL(NCP_IOC_GET_FS_INFO_V2_32, do_ncp_getfsinfo2)
HANDLE_IOCTL(NCP_IOC_GETOBJECTNAME_32, do_ncp_getobjectname)
HANDLE_IOCTL(NCP_IOC_SETOBJECTNAME_32, do_ncp_setobjectname)
HANDLE_IOCTL(NCP_IOC_GETPRIVATEDATA_32, do_ncp_getprivatedata)
HANDLE_IOCTL(NCP_IOC_SETPRIVATEDATA_32, do_ncp_setprivatedata)
/* Note SIOCRTMSG is no longer, so this is safe and * the user would have seen just an -EINVAL anyways. */ /* Note SIOCRTMSG is no longer, so this is safe and * the user would have seen just an -EINVAL anyways. */
HANDLE_IOCTL(FBIOPUTCMAP32, fbiogetputcmap) HANDLE_IOCTL(FBIOPUTCMAP32, fbiogetputcmap)
HANDLE_IOCTL(FBIOGETCMAP32, fbiogetputcmap) HANDLE_IOCTL(FBIOGETCMAP32, fbiogetputcmap)
......
fs/compat_ioctl.c
View file @ c72113b5
...@@ -3088,6 +3088,189 @@ static int old_bridge_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg ...@@ -3088,6 +3088,189 @@ static int old_bridge_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg
return -EINVAL; return -EINVAL;
} }
#if defined(CONFIG_NCP_FS) || defined(CONFIG_NCP_FS_MODULE)
struct ncp_ioctl_request_32 {
u32 function;
u32 size;
compat_caddr_t data;
};
struct ncp_fs_info_v2_32 {
s32 version;
u32 mounted_uid;
u32 connection;
u32 buffer_size;
u32 volume_number;
u32 directory_id;
u32 dummy1;
u32 dummy2;
u32 dummy3;
};
struct ncp_objectname_ioctl_32
{
s32 auth_type;
u32 object_name_len;
compat_caddr_t object_name; /* an userspace data, in most cases user name */
};
struct ncp_privatedata_ioctl_32
{
u32 len;
compat_caddr_t data; /* ~1000 for NDS */
};
#define NCP_IOC_NCPREQUEST_32 _IOR('n', 1, struct ncp_ioctl_request_32)
#define NCP_IOC_GETMOUNTUID2_32 _IOW('n', 2, u32)
#define NCP_IOC_GET_FS_INFO_V2_32 _IOWR('n', 4, struct ncp_fs_info_v2_32)
#define NCP_IOC_GETOBJECTNAME_32 _IOWR('n', 9, struct ncp_objectname_ioctl_32)
#define NCP_IOC_SETOBJECTNAME_32 _IOR('n', 9, struct ncp_objectname_ioctl_32)
#define NCP_IOC_GETPRIVATEDATA_32 _IOWR('n', 10, struct ncp_privatedata_ioctl_32)
#define NCP_IOC_SETPRIVATEDATA_32 _IOR('n', 10, struct ncp_privatedata_ioctl_32)
static int do_ncp_ncprequest(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_ioctl_request_32 n32;
struct ncp_ioctl_request *p = compat_alloc_user_space(sizeof(*p));
if (copy_from_user(&n32, compat_ptr(arg), sizeof(n32)) ||
put_user(n32.function, &p->function) ||
put_user(n32.size, &p->size) ||
put_user(compat_ptr(n32.data), &p->data))
return -EFAULT;
return sys_ioctl(fd, NCP_IOC_NCPREQUEST, (unsigned long)p);
}
static int do_ncp_getmountuid2(unsigned int fd, unsigned int cmd, unsigned long arg)
{
mm_segment_t old_fs = get_fs();
__kernel_uid_t kuid;
int err;
cmd = NCP_IOC_GETMOUNTUID2;
set_fs(KERNEL_DS);
err = sys_ioctl(fd, cmd, (unsigned long)&kuid);
set_fs(old_fs);
if (!err)
err = put_user(kuid, (unsigned int *)compat_ptr(arg));
return err;
}
static int do_ncp_getfsinfo2(unsigned int fd, unsigned int cmd, unsigned long arg)
{
mm_segment_t old_fs = get_fs();
struct ncp_fs_info_v2_32 n32;
struct ncp_fs_info_v2 n;
int err;
if (copy_from_user(&n32, compat_ptr(arg), sizeof(n32)))
return -EFAULT;
if (n32.version != NCP_GET_FS_INFO_VERSION_V2)
return -EINVAL;
n.version = NCP_GET_FS_INFO_VERSION_V2;
set_fs(KERNEL_DS);
err = sys_ioctl(fd, NCP_IOC_GET_FS_INFO_V2, (unsigned long)&n);
set_fs(old_fs);
if (!err) {
n32.version = n.version;
n32.mounted_uid = n.mounted_uid;
n32.connection = n.connection;
n32.buffer_size = n.buffer_size;
n32.volume_number = n.volume_number;
n32.directory_id = n.directory_id;
n32.dummy1 = n.dummy1;
n32.dummy2 = n.dummy2;
n32.dummy3 = n.dummy3;
err = copy_to_user(compat_ptr(arg), &n32, sizeof(n32)) ? -EFAULT : 0;
}
return err;
}
static int do_ncp_getobjectname(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_objectname_ioctl_32 n32, *p32 = compat_ptr(arg);
struct ncp_objectname_ioctl *p = compat_alloc_user_space(sizeof(*p));
s32 auth_type;
u32 name_len;
int err;
if (copy_from_user(&n32, p32, sizeof(n32)) ||
put_user(n32.object_name_len, &p->object_name_len) ||
put_user(compat_ptr(n32.object_name), &p->object_name))
return -EFAULT;
err = sys_ioctl(fd, NCP_IOC_GETOBJECTNAME, (unsigned long)p);
if (err)
return err;
if (get_user(auth_type, &p->auth_type) ||
put_user(auth_type, &p32->auth_type) ||
get_user(name_len, &p->object_name_len) ||
put_user(name_len, &p32->object_name_len))
return -EFAULT;
return 0;
}
static int do_ncp_setobjectname(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_objectname_ioctl_32 n32, *p32 = compat_ptr(arg);
struct ncp_objectname_ioctl *p = compat_alloc_user_space(sizeof(*p));
if (copy_from_user(&n32, p32, sizeof(n32)) ||
put_user(n32.auth_type, &p->auth_type) ||
put_user(n32.object_name_len, &p->object_name_len) ||
put_user(compat_ptr(n32.object_name), &p->object_name))
return -EFAULT;
return sys_ioctl(fd, NCP_IOC_SETOBJECTNAME, (unsigned long)p);
}
static int do_ncp_getprivatedata(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_privatedata_ioctl_32 n32, *p32 = compat_ptr(arg);
struct ncp_privatedata_ioctl *p = compat_alloc_user_space(sizeof(*p));
u32 len;
int err;
if (copy_from_user(&n32, p32, sizeof(n32)) ||
put_user(n32.len, &p->len) ||
put_user(compat_ptr(n32.data), &p->data))
return -EFAULT;
err = sys_ioctl(fd, NCP_IOC_GETPRIVATEDATA, (unsigned long)p);
if (err)
return err;
if (get_user(len, &p->len) ||
put_user(len, &p32->len))
return -EFAULT;
return 0;
}
static int do_ncp_setprivatedata(unsigned int fd, unsigned int cmd, unsigned long arg)
{
struct ncp_privatedata_ioctl_32 n32, *p32 = compat_ptr(arg);
struct ncp_privatedata_ioctl *p = compat_alloc_user_space(sizeof(*p));
if (copy_from_user(&n32, p32, sizeof(n32)) ||
put_user(n32.len, &p->len) ||
put_user(compat_ptr(n32.data), &p->data))
return -EFAULT;
return sys_ioctl(fd, NCP_IOC_SETPRIVATEDATA, (unsigned long)p);
}
#endif
#undef CODE #undef CODE
#endif #endif
...@@ -3270,5 +3453,15 @@ HANDLE_IOCTL(SIOCGIWENCODE, do_wireless_ioctl) ...@@ -3270,5 +3453,15 @@ HANDLE_IOCTL(SIOCGIWENCODE, do_wireless_ioctl)
HANDLE_IOCTL(SIOCSIFBR, old_bridge_ioctl) HANDLE_IOCTL(SIOCSIFBR, old_bridge_ioctl)
HANDLE_IOCTL(SIOCGIFBR, old_bridge_ioctl) HANDLE_IOCTL(SIOCGIFBR, old_bridge_ioctl)
#if defined(CONFIG_NCP_FS) || defined(CONFIG_NCP_FS_MODULE)
HANDLE_IOCTL(NCP_IOC_NCPREQUEST_32, do_ncp_ncprequest)
HANDLE_IOCTL(NCP_IOC_GETMOUNTUID2_32, do_ncp_getmountuid2)
HANDLE_IOCTL(NCP_IOC_GET_FS_INFO_V2_32, do_ncp_getfsinfo2)
HANDLE_IOCTL(NCP_IOC_GETOBJECTNAME_32, do_ncp_getobjectname)
HANDLE_IOCTL(NCP_IOC_SETOBJECTNAME_32, do_ncp_setobjectname)
HANDLE_IOCTL(NCP_IOC_GETPRIVATEDATA_32, do_ncp_getprivatedata)
HANDLE_IOCTL(NCP_IOC_SETPRIVATEDATA_32, do_ncp_setprivatedata)
#endif
#undef DECLARES #undef DECLARES
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7