Skip to content

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

[PATCH] mxser annotations and compile fixes 

 a) __user annotations
 b) NULL noise removals
 c) added missing ifdef CONFIG_PCI around the loop over mxser_pcibrds
    during init.
 d) declaration of CMSPAR in case if it had been undefined moved up
    prior to the first use
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9048b51e
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 43 deletions
drivers/char/mxser.c
View file @ 1904593d
...@@ -401,7 +401,7 @@ static int mxser_chars_in_buffer(struct tty_struct *); ...@@ -401,7 +401,7 @@ static int mxser_chars_in_buffer(struct tty_struct *);
static void mxser_flush_chars(struct tty_struct *); static void mxser_flush_chars(struct tty_struct *);
static void mxser_put_char(struct tty_struct *, unsigned char); static void mxser_put_char(struct tty_struct *, unsigned char);
static int mxser_ioctl(struct tty_struct *, struct file *, uint, ulong); static int mxser_ioctl(struct tty_struct *, struct file *, uint, ulong);
static int mxser_ioctl_special(unsigned int, unsigned long); static int mxser_ioctl_special(unsigned int, void __user *);
static void mxser_throttle(struct tty_struct *); static void mxser_throttle(struct tty_struct *);
static void mxser_unthrottle(struct tty_struct *); static void mxser_unthrottle(struct tty_struct *);
static void mxser_set_termios(struct tty_struct *, struct termios *); static void mxser_set_termios(struct tty_struct *, struct termios *);
...@@ -417,9 +417,9 @@ static int mxser_block_til_ready(struct tty_struct *, struct file *, struct mxse ...@@ -417,9 +417,9 @@ static int mxser_block_til_ready(struct tty_struct *, struct file *, struct mxse
static int mxser_startup(struct mxser_struct *); static int mxser_startup(struct mxser_struct *);
static void mxser_shutdown(struct mxser_struct *); static void mxser_shutdown(struct mxser_struct *);
static int mxser_change_speed(struct mxser_struct *, struct termios *old_termios); static int mxser_change_speed(struct mxser_struct *, struct termios *old_termios);
static int mxser_get_serial_info(struct mxser_struct *, struct serial_struct *); static int mxser_get_serial_info(struct mxser_struct *, struct serial_struct __user *);
static int mxser_set_serial_info(struct mxser_struct *, struct serial_struct *); static int mxser_set_serial_info(struct mxser_struct *, struct serial_struct __user *);
static int mxser_get_lsr_info(struct mxser_struct *, unsigned int *); static int mxser_get_lsr_info(struct mxser_struct *, unsigned int __user *);
static void mxser_send_break(struct mxser_struct *, int); static void mxser_send_break(struct mxser_struct *, int);
static int mxser_tiocmget(struct tty_struct *, struct file *); static int mxser_tiocmget(struct tty_struct *, struct file *);
static int mxser_tiocmset(struct tty_struct *, struct file *, unsigned int, unsigned int); static int mxser_tiocmset(struct tty_struct *, struct file *, unsigned int, unsigned int);
...@@ -834,6 +834,7 @@ static int mxser_init(void) ...@@ -834,6 +834,7 @@ static int mxser_init(void)
} }
/* start finding PCI board here */ /* start finding PCI board here */
#ifdef CONFIG_PCI
n = (sizeof(mxser_pcibrds) / sizeof(mxser_pcibrds[0])) - 1; n = (sizeof(mxser_pcibrds) / sizeof(mxser_pcibrds[0])) - 1;
index = 0; index = 0;
b = 0; b = 0;
...@@ -875,6 +876,7 @@ static int mxser_init(void) ...@@ -875,6 +876,7 @@ static int mxser_init(void)
m++; m++;
} }
} }
#endif
ret1 = 0; ret1 = 0;
if (!(ret1 = tty_register_driver(mxvar_sdriver))) { if (!(ret1 = tty_register_driver(mxvar_sdriver))) {
...@@ -968,7 +970,7 @@ static int mxser_open(struct tty_struct *tty, struct file *filp) ...@@ -968,7 +970,7 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
*tty->termios = info->normal_termios; *tty->termios = info->normal_termios;
else else
*tty->termios = info->callout_termios; *tty->termios = info->callout_termios;
mxser_change_speed(info, 0); mxser_change_speed(info, NULL);
} }
info->session = current->signal->session; info->session = current->signal->session;
...@@ -1084,7 +1086,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp) ...@@ -1084,7 +1086,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
tty->closing = 0; tty->closing = 0;
info->event = 0; info->event = 0;
info->tty = 0; info->tty = NULL;
if (info->blocked_open) { if (info->blocked_open) {
if (info->close_delay) { if (info->close_delay) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
...@@ -1223,12 +1225,13 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1223,12 +1225,13 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
int retval; int retval;
struct async_icount cprev, cnow; /* kernel counter temps */ struct async_icount cprev, cnow; /* kernel counter temps */
struct serial_icounter_struct *p_cuser; /* user space */ struct serial_icounter_struct __user *p_cuser;
unsigned long templ; unsigned long templ;
unsigned long flags; unsigned long flags;
void __user *argp = (void __user *)arg;
if (tty->index == MXSER_PORTS) if (tty->index == MXSER_PORTS)
return (mxser_ioctl_special(cmd, arg)); return (mxser_ioctl_special(cmd, argp));
// following add by Victor Yu. 01-05-2004 // following add by Victor Yu. 01-05-2004
if (cmd == MOXA_SET_OP_MODE || cmd == MOXA_GET_OP_MODE) { if (cmd == MOXA_SET_OP_MODE || cmd == MOXA_GET_OP_MODE) {
...@@ -1239,7 +1242,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1239,7 +1242,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
p = info->port % 4; p = info->port % 4;
if (cmd == MOXA_SET_OP_MODE) { if (cmd == MOXA_SET_OP_MODE) {
if (get_user(opmode, (int *) arg)) if (get_user(opmode, (int __user *) argp))
return -EFAULT; return -EFAULT;
if (opmode != RS232_MODE && opmode != RS485_2WIRE_MODE && opmode != RS422_MODE && opmode != RS485_4WIRE_MODE) if (opmode != RS232_MODE && opmode != RS485_2WIRE_MODE && opmode != RS422_MODE && opmode != RS485_4WIRE_MODE)
return -EFAULT; return -EFAULT;
...@@ -1253,7 +1256,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1253,7 +1256,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
shiftbit = p * 2; shiftbit = p * 2;
opmode = inb(info->opmode_ioaddr) >> shiftbit; opmode = inb(info->opmode_ioaddr) >> shiftbit;
opmode &= OP_MODE_MASK; opmode &= OP_MODE_MASK;
if (copy_to_user((int *) arg, &opmode, sizeof(int))) if (copy_to_user(argp, &opmode, sizeof(int)))
return -EFAULT; return -EFAULT;
} }
return 0; return 0;
...@@ -1281,19 +1284,19 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1281,19 +1284,19 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
mxser_send_break(info, arg ? arg * (HZ / 10) : HZ / 4); mxser_send_break(info, arg ? arg * (HZ / 10) : HZ / 4);
return (0); return (0);
case TIOCGSOFTCAR: case TIOCGSOFTCAR:
return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long *) arg); return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) argp);
case TIOCSSOFTCAR: case TIOCSSOFTCAR:
if (get_user(templ, (unsigned long *) arg)) if (get_user(templ, (unsigned long __user *) argp))
return -EFAULT; return -EFAULT;
arg = templ; arg = templ;
tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) | (arg ? CLOCAL : 0)); tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) | (arg ? CLOCAL : 0));
return (0); return (0);
case TIOCGSERIAL: case TIOCGSERIAL:
return (mxser_get_serial_info(info, (struct serial_struct *) arg)); return mxser_get_serial_info(info, argp);
case TIOCSSERIAL: case TIOCSSERIAL:
return (mxser_set_serial_info(info, (struct serial_struct *) arg)); return mxser_set_serial_info(info, argp);
case TIOCSERGETLSR: /* Get line status register */ case TIOCSERGETLSR: /* Get line status register */
return (mxser_get_lsr_info(info, (unsigned int *) arg)); return mxser_get_lsr_info(info, argp);
/* /*
* Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
* - mask passed in arg for lines of interest * - mask passed in arg for lines of interest
...@@ -1340,7 +1343,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1340,7 +1343,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
spin_lock_irqsave(&info->slock, flags); spin_lock_irqsave(&info->slock, flags);
cnow = info->icount; cnow = info->icount;
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->slock, flags);
p_cuser = (struct serial_icounter_struct *) arg; p_cuser = argp;
/* modified by casper 1/11/2000 */ /* modified by casper 1/11/2000 */
if (put_user(cnow.frame, &p_cuser->frame)) if (put_user(cnow.frame, &p_cuser->frame))
return -EFAULT; return -EFAULT;
...@@ -1364,7 +1367,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1364,7 +1367,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
/* */ /* */
return 0; return 0;
case MOXA_HighSpeedOn: case MOXA_HighSpeedOn:
return put_user(info->baud_base != 115200 ? 1 : 0, (int *) arg); return put_user(info->baud_base != 115200 ? 1 : 0, (int __user *) argp);
case MOXA_SDS_RSTICOUNTER:{ case MOXA_SDS_RSTICOUNTER:{
info->mon_data.rxcnt = 0; info->mon_data.rxcnt = 0;
...@@ -1374,13 +1377,13 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1374,13 +1377,13 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
// (above) added by James. // (above) added by James.
case MOXA_ASPP_SETBAUD:{ case MOXA_ASPP_SETBAUD:{
long baud; long baud;
if (get_user(baud, (long *) arg)) if (get_user(baud, (long __user *) argp))
return -EFAULT; return -EFAULT;
mxser_set_baud(info, baud); mxser_set_baud(info, baud);
return 0; return 0;
} }
case MOXA_ASPP_GETBAUD: case MOXA_ASPP_GETBAUD:
if (copy_to_user((long *) arg, &info->realbaud, sizeof(long))) if (copy_to_user(argp, &info->realbaud, sizeof(long)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1394,7 +1397,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1394,7 +1397,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
len += (lsr ? 0 : 1); len += (lsr ? 0 : 1);
if (copy_to_user((int *) arg, &len, sizeof(int))) if (copy_to_user(argp, &len, sizeof(int)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1423,7 +1426,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1423,7 +1426,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
info->mon_data.hold_reason &= ~NPPI_NOTIFY_CTSHOLD; info->mon_data.hold_reason &= ~NPPI_NOTIFY_CTSHOLD;
if (copy_to_user((struct mxser_mon *) arg, &(info->mon_data), sizeof(struct mxser_mon))) if (copy_to_user(argp, &info->mon_data, sizeof(struct mxser_mon)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1431,7 +1434,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1431,7 +1434,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
} }
case MOXA_ASPP_LSTATUS:{ case MOXA_ASPP_LSTATUS:{
if (copy_to_user((struct mxser_mon *) arg, &(info->err_shadow), sizeof(unsigned char))) if (copy_to_user(argp, &info->err_shadow, sizeof(unsigned char)))
return -EFAULT; return -EFAULT;
info->err_shadow = 0; info->err_shadow = 0;
...@@ -1440,10 +1443,10 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1440,10 +1443,10 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
} }
case MOXA_SET_BAUD_METHOD:{ case MOXA_SET_BAUD_METHOD:{
int method; int method;
if (get_user(method, (int *) arg)) if (get_user(method, (int __user *) argp))
return -EFAULT; return -EFAULT;
mxser_set_baud_method[info->port] = method; mxser_set_baud_method[info->port] = method;
if (copy_to_user((int *) arg, &method, sizeof(int))) if (copy_to_user(argp, &method, sizeof(int)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1454,22 +1457,26 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -1454,22 +1457,26 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
return 0; return 0;
} }
static int mxser_ioctl_special(unsigned int cmd, unsigned long arg) #ifndef CMSPAR
#define CMSPAR 010000000000
#endif
static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
{ {
int i, result, status; int i, result, status;
switch (cmd) { switch (cmd) {
case MOXA_GET_CONF: case MOXA_GET_CONF:
if (copy_to_user((struct mxser_hwconf *) arg, mxsercfg, sizeof(struct mxser_hwconf) * 4)) if (copy_to_user(argp, mxsercfg, sizeof(struct mxser_hwconf) * 4))
return -EFAULT; return -EFAULT;
return 0; return 0;
case MOXA_GET_MAJOR: case MOXA_GET_MAJOR:
if (copy_to_user((int *) arg, &ttymajor, sizeof(int))) if (copy_to_user(argp, &ttymajor, sizeof(int)))
return -EFAULT; return -EFAULT;
return 0; return 0;
case MOXA_GET_CUMAJOR: case MOXA_GET_CUMAJOR:
if (copy_to_user((int *) arg, &calloutmajor, sizeof(int))) if (copy_to_user(argp, &calloutmajor, sizeof(int)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1479,9 +1486,9 @@ static int mxser_ioctl_special(unsigned int cmd, unsigned long arg) ...@@ -1479,9 +1486,9 @@ static int mxser_ioctl_special(unsigned int cmd, unsigned long arg)
if (mxvar_table[i].base) if (mxvar_table[i].base)
result |= (1 << i); result |= (1 << i);
} }
return put_user(result, (unsigned long *) arg); return put_user(result, (unsigned long __user *) argp);
case MOXA_GETDATACOUNT: case MOXA_GETDATACOUNT:
if (copy_to_user((struct mxser_log *) arg, &mxvar_log, sizeof(mxvar_log))) if (copy_to_user(argp, &mxvar_log, sizeof(mxvar_log)))
return -EFAULT; return -EFAULT;
return (0); return (0);
case MOXA_GETMSTATUS: case MOXA_GETMSTATUS:
...@@ -1516,7 +1523,7 @@ static int mxser_ioctl_special(unsigned int cmd, unsigned long arg) ...@@ -1516,7 +1523,7 @@ static int mxser_ioctl_special(unsigned int cmd, unsigned long arg)
else else
GMStatus[i].cts = 0; GMStatus[i].cts = 0;
} }
if (copy_to_user((struct mxser_mstatus *) arg, GMStatus, sizeof(struct mxser_mstatus) * MXSER_PORTS)) if (copy_to_user(argp, GMStatus, sizeof(struct mxser_mstatus) * MXSER_PORTS))
return -EFAULT; return -EFAULT;
return 0; return 0;
case MOXA_ASPP_MON_EXT:{ case MOXA_ASPP_MON_EXT:{
...@@ -1584,7 +1591,7 @@ static int mxser_ioctl_special(unsigned int cmd, unsigned long arg) ...@@ -1584,7 +1591,7 @@ static int mxser_ioctl_special(unsigned int cmd, unsigned long arg)
mon_data_ext.iftype[i] = opmode; mon_data_ext.iftype[i] = opmode;
} }
if (copy_to_user((struct mxser_mon_ext *) arg, &mon_data_ext, sizeof(struct mxser_mon_ext))) if (copy_to_user(argp, &mon_data_ext, sizeof(struct mxser_mon_ext)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1829,7 +1836,7 @@ void mxser_hangup(struct tty_struct *tty) ...@@ -1829,7 +1836,7 @@ void mxser_hangup(struct tty_struct *tty)
info->event = 0; info->event = 0;
info->count = 0; info->count = 0;
info->flags &= ~ASYNC_NORMAL_ACTIVE; info->flags &= ~ASYNC_NORMAL_ACTIVE;
info->tty = 0; info->tty = NULL;
wake_up_interruptible(&info->open_wait); wake_up_interruptible(&info->open_wait);
} }
...@@ -1866,7 +1873,7 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1866,7 +1873,7 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)
int pass_counter = 0; int pass_counter = 0;
int handled = IRQ_NONE; int handled = IRQ_NONE;
port = 0; port = NULL;
//spin_lock(&gm_lock); //spin_lock(&gm_lock);
for (i = 0; i < MXSER_BOARDS; i++) { for (i = 0; i < MXSER_BOARDS; i++) {
...@@ -2412,7 +2419,7 @@ static int mxser_startup(struct mxser_struct *info) ...@@ -2412,7 +2419,7 @@ static int mxser_startup(struct mxser_struct *info)
* and set the speed of the serial port * and set the speed of the serial port
*/ */
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->slock, flags);
mxser_change_speed(info, 0); mxser_change_speed(info, NULL);
info->flags |= ASYNC_INITIALIZED; info->flags |= ASYNC_INITIALIZED;
return (0); return (0);
...@@ -2442,7 +2449,7 @@ static void mxser_shutdown(struct mxser_struct *info) ...@@ -2442,7 +2449,7 @@ static void mxser_shutdown(struct mxser_struct *info)
*/ */
if (info->xmit_buf) { if (info->xmit_buf) {
free_page((unsigned long) info->xmit_buf); free_page((unsigned long) info->xmit_buf);
info->xmit_buf = 0; info->xmit_buf = NULL;
} }
info->IER = 0; info->IER = 0;
...@@ -2591,9 +2598,6 @@ static int mxser_change_speed(struct mxser_struct *info, struct termios *old_ter ...@@ -2591,9 +2598,6 @@ static int mxser_change_speed(struct mxser_struct *info, struct termios *old_ter
cval |= 0x04; cval |= 0x04;
if (cflag & PARENB) if (cflag & PARENB)
cval |= UART_LCR_PARITY; cval |= UART_LCR_PARITY;
#ifndef CMSPAR
#define CMSPAR 010000000000
#endif
if (!(cflag & PARODD)) { if (!(cflag & PARODD)) {
cval |= UART_LCR_EPAR; cval |= UART_LCR_EPAR;
} }
...@@ -2807,7 +2811,7 @@ static int mxser_set_baud(struct mxser_struct *info, long newspd) ...@@ -2807,7 +2811,7 @@ static int mxser_set_baud(struct mxser_struct *info, long newspd)
* friends of mxser_ioctl() * friends of mxser_ioctl()
* ------------------------------------------------------------ * ------------------------------------------------------------
*/ */
static int mxser_get_serial_info(struct mxser_struct *info, struct serial_struct *retinfo) static int mxser_get_serial_info(struct mxser_struct *info, struct serial_struct __user *retinfo)
{ {
struct serial_struct tmp; struct serial_struct tmp;
...@@ -2829,7 +2833,7 @@ static int mxser_get_serial_info(struct mxser_struct *info, struct serial_struct ...@@ -2829,7 +2833,7 @@ static int mxser_get_serial_info(struct mxser_struct *info, struct serial_struct
return (0); return (0);
} }
static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct *new_info) static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct __user *new_info)
{ {
struct serial_struct new_serial; struct serial_struct new_serial;
unsigned int flags; unsigned int flags;
...@@ -2869,7 +2873,7 @@ static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct ...@@ -2869,7 +2873,7 @@ static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct
/* */ /* */
if (info->flags & ASYNC_INITIALIZED) { if (info->flags & ASYNC_INITIALIZED) {
if (flags != (info->flags & ASYNC_SPD_MASK)) { if (flags != (info->flags & ASYNC_SPD_MASK)) {
mxser_change_speed(info, 0); mxser_change_speed(info, NULL);
} }
} else { } else {
retval = mxser_startup(info); retval = mxser_startup(info);
...@@ -2887,7 +2891,7 @@ static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct ...@@ -2887,7 +2891,7 @@ static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct
* transmit holding register is empty. This functionality * transmit holding register is empty. This functionality
* allows an RS485 driver to be written in user space. * allows an RS485 driver to be written in user space.
*/ */
static int mxser_get_lsr_info(struct mxser_struct *info, unsigned int *value) static int mxser_get_lsr_info(struct mxser_struct *info, unsigned int __user *value)
{ {
unsigned char status; unsigned char status;
unsigned int result; unsigned int result;
......
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