#define s (tmp.kb_table)
#define v (tmp.kb_value)
static inline int
-do_kdsk_ioctl(int cmd, struct kbentry *user_kbe, int perm, struct kbd_struct *kbd)
+do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_struct *kbd)
{
struct kbentry tmp;
ushort *key_map, val, ov;
#undef v
static inline int
-do_kbkeycode_ioctl(int cmd, struct kbkeycode *user_kbkc, int perm)
+do_kbkeycode_ioctl(int cmd, struct kbkeycode __user *user_kbkc, int perm)
{
struct kbkeycode tmp;
int kc = 0;
}
static inline int
-do_kdgkb_ioctl(int cmd, struct kbsentry *user_kdgkb, int perm)
+do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
{
struct kbsentry *kbs;
char *p;
u_char *q;
+ u_char __user *up;
int sz;
int delta;
char *first_free, *fj, *fnw;
case KDGKBSENT:
sz = sizeof(kbs->kb_string) - 1; /* sz should have been
a struct member */
- q = user_kdgkb->kb_string;
+ up = user_kdgkb->kb_string;
p = func_table[i];
if(p)
for ( ; *p && sz; p++, sz--)
- if (put_user(*p, q++)) {
+ if (put_user(*p, up++)) {
ret = -EFAULT;
goto reterr;
}
- if (put_user('\0', q)) {
+ if (put_user('\0', up)) {
ret = -EFAULT;
goto reterr;
}
}
static inline int
-do_fontx_ioctl(int cmd, struct consolefontdesc *user_cfd, int perm, struct console_font_op *op)
+do_fontx_ioctl(int cmd, struct consolefontdesc __user *user_cfd, int perm, struct console_font_op *op)
{
struct consolefontdesc cfdarg;
int i;
}
static inline int
-do_unimap_ioctl(int cmd, struct unimapdesc *user_ud, int perm, unsigned int console)
+do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, unsigned int console)
{
struct unimapdesc tmp;
int i = 0;
struct kbd_struct * kbd;
unsigned int console;
unsigned char ucval;
+ void __user *up = (void __user *)arg;
int i, perm;
console = vt->vc_num;
if (!capable(CAP_SYS_TTY_CONFIG))
return -EPERM;
- if (copy_from_user(&kbrep, (void *)arg,
- sizeof(struct kbd_repeat)))
+ if (copy_from_user(&kbrep, up, sizeof(struct kbd_repeat)))
return -EFAULT;
err = kbd_rate(&kbrep);
if (err)
return err;
- if (copy_to_user((void *)arg, &kbrep,
- sizeof(struct kbd_repeat)))
+ if (copy_to_user(up, &kbrep, sizeof(struct kbd_repeat)))
return -EFAULT;
return 0;
}
case KDGKBMETA:
ucval = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
setint:
- return put_user(ucval, (int *)arg);
+ return put_user(ucval, (int __user *)arg);
case KDGETKEYCODE:
case KDSETKEYCODE:
if(!capable(CAP_SYS_TTY_CONFIG))
perm=0;
- return do_kbkeycode_ioctl(cmd, (struct kbkeycode *)arg, perm);
+ return do_kbkeycode_ioctl(cmd, up, perm);
case KDGKBENT:
case KDSKBENT:
- return do_kdsk_ioctl(cmd, (struct kbentry *)arg, perm, kbd);
+ return do_kdsk_ioctl(cmd, up, perm, kbd);
case KDGKBSENT:
case KDSKBSENT:
- return do_kdgkb_ioctl(cmd, (struct kbsentry *)arg, perm);
+ return do_kdgkb_ioctl(cmd, up, perm);
case KDGKBDIACR:
{
- struct kbdiacrs *a = (struct kbdiacrs *)arg;
+ struct kbdiacrs __user *a = up;
if (put_user(accent_table_size, &a->kb_cnt))
return -EFAULT;
case KDSKBDIACR:
{
- struct kbdiacrs *a = (struct kbdiacrs *)arg;
+ struct kbdiacrs __user *a = up;
unsigned int ct;
if (!perm)
case KDGETLED:
ucval = getledstate();
setchar:
- return put_user(ucval, (char*)arg);
+ return put_user(ucval, (char __user *)arg);
case KDSETLED:
if (!perm)
* generated by pressing an appropriate key combination.
* Thus, one can have a daemon that e.g. spawns a new console
* upon a keypress and then changes to it.
- * Probably init should be changed to do this (and have a
- * field ks (`keyboard signal') in inittab describing the
- * desired action), so that the number of background daemons
- * does not increase.
+ * See also the kbrequest field of inittab(5).
*/
case KDSIGACCEPT:
{
if (!perm)
return -EPERM;
- if (copy_from_user(&tmp, (void*)arg, sizeof(struct vt_mode)))
+ if (copy_from_user(&tmp, up, sizeof(struct vt_mode)))
return -EFAULT;
if (tmp.mode != VT_AUTO && tmp.mode != VT_PROCESS)
return -EINVAL;
memcpy(&tmp, &vt_cons[console]->vt_mode, sizeof(struct vt_mode));
release_console_sem();
- rc = copy_to_user((void*)arg, &tmp, sizeof(struct vt_mode));
+ rc = copy_to_user(up, &tmp, sizeof(struct vt_mode));
return rc ? -EFAULT : 0;
}
*/
case VT_GETSTATE:
{
- struct vt_stat *vtstat = (struct vt_stat *)arg;
+ struct vt_stat __user *vtstat = up;
unsigned short state, mask;
if (put_user(fg_console + 1, &vtstat->v_active))
case VT_RESIZE:
{
- struct vt_sizes *vtsizes = (struct vt_sizes *) arg;
+ struct vt_sizes __user *vtsizes = up;
ushort ll,cc;
if (!perm)
return -EPERM;
case VT_RESIZEX:
{
- struct vt_consize *vtconsize = (struct vt_consize *) arg;
+ struct vt_consize __user *vtconsize = up;
ushort ll,cc,vlin,clin,vcol,ccol;
if (!perm)
return -EPERM;
- if (verify_area(VERIFY_READ, (void *)vtconsize,
+ if (verify_area(VERIFY_READ, vtconsize,
sizeof(struct vt_consize)))
return -EFAULT;
__get_user(ll, &vtconsize->v_rows);
case PIO_CMAP:
if (!perm)
return -EPERM;
- return con_set_cmap((char *)arg);
+ return con_set_cmap(up);
case GIO_CMAP:
- return con_get_cmap((char *)arg);
+ return con_get_cmap(up);
case PIO_FONTX:
case GIO_FONTX:
- return do_fontx_ioctl(cmd, (struct consolefontdesc *)arg, perm, &op);
+ return do_fontx_ioctl(cmd, up, perm, &op);
case PIO_FONTRESET:
{
}
case KDFONTOP: {
- if (copy_from_user(&op, (void *) arg, sizeof(op)))
+ if (copy_from_user(&op, up, sizeof(op)))
return -EFAULT;
if (!perm && op.op != KD_FONT_OP_GET)
return -EPERM;
i = con_font_op(console, &op);
if (i) return i;
- if (copy_to_user((void *) arg, &op, sizeof(op)))
+ if (copy_to_user(up, &op, sizeof(op)))
return -EFAULT;
return 0;
}
case PIO_SCRNMAP:
if (!perm)
return -EPERM;
- return con_set_trans_old((unsigned char *)arg);
+ return con_set_trans_old(up);
case GIO_SCRNMAP:
- return con_get_trans_old((unsigned char *)arg);
+ return con_get_trans_old(up);
case PIO_UNISCRNMAP:
if (!perm)
return -EPERM;
- return con_set_trans_new((unsigned short *)arg);
+ return con_set_trans_new(up);
case GIO_UNISCRNMAP:
- return con_get_trans_new((unsigned short *)arg);
+ return con_get_trans_new(up);
case PIO_UNIMAPCLR:
{ struct unimapinit ui;
if (!perm)
return -EPERM;
- i = copy_from_user(&ui, (void *)arg, sizeof(struct unimapinit));
+ i = copy_from_user(&ui, up, sizeof(struct unimapinit));
if (i) return -EFAULT;
con_clear_unimap(console, &ui);
return 0;
case PIO_UNIMAP:
case GIO_UNIMAP:
- return do_unimap_ioctl(cmd, (struct unimapdesc *)arg, perm, console);
+ return do_unimap_ioctl(cmd, up, perm, console);
case VT_LOCKSWITCH:
if (!capable(CAP_SYS_TTY_CONFIG))
git://git.onelab.eu / linux-2.6.git / blobdiff