[PATCH] serial167 __user annotations, NULL noise removal (e5a301ee) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/char/serial167.c

+26 −26

Original line number	Original line	Diff line number	Diff line
	@@ -839,7 +839,7 @@ shutdown(struct cyclades_port * info)
	local_irq_save(flags);		local_irq_save(flags);
	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;
	}		}

	base_addr[CyCAR] = (u_char)channel;		base_addr[CyCAR] = (u_char)channel;
	@@ -1354,7 +1354,7 @@ cy_unthrottle(struct tty_struct * tty)

	static int		static int
	get_serial_info(struct cyclades_port * info,		get_serial_info(struct cyclades_port * info,
	struct serial_struct * retinfo)		struct serial_struct __user * retinfo)
	{		{
	struct serial_struct tmp;		struct serial_struct tmp;

	@@ -1376,7 +1376,7 @@ get_serial_info(struct cyclades_port * info,

	static int		static int
	set_serial_info(struct cyclades_port * info,		set_serial_info(struct cyclades_port * info,
	struct serial_struct * new_info)		struct serial_struct __user * new_info)
	{		{
	struct serial_struct new_serial;		struct serial_struct new_serial;
	struct cyclades_port old_info;		struct cyclades_port old_info;
	@@ -1503,7 +1503,7 @@ send_break( struct cyclades_port * info, int duration)
	} /* send_break */		} /* send_break */

	static int		static int
	get_mon_info(struct cyclades_port * info, struct cyclades_monitor * mon)		get_mon_info(struct cyclades_port * info, struct cyclades_monitor __user * mon)
	{		{

	if (copy_to_user(mon, &info->mon, sizeof(struct cyclades_monitor)))		if (copy_to_user(mon, &info->mon, sizeof(struct cyclades_monitor)))
	@@ -1516,7 +1516,7 @@ get_mon_info(struct cyclades_port * info, struct cyclades_monitor * mon)
	}		}

	static int		static int
	set_threshold(struct cyclades_port * info, unsigned long *arg)		set_threshold(struct cyclades_port * info, unsigned long __user *arg)
	{		{
	volatile unsigned char base_addr = (u_char )BASE_ADDR;		volatile unsigned char base_addr = (u_char )BASE_ADDR;
	unsigned long value;		unsigned long value;
	@@ -1533,7 +1533,7 @@ set_threshold(struct cyclades_port * info, unsigned long *arg)
	}		}

	static int		static int
	get_threshold(struct cyclades_port * info, unsigned long *value)		get_threshold(struct cyclades_port * info, unsigned long __user *value)
	{		{
	volatile unsigned char base_addr = (u_char )BASE_ADDR;		volatile unsigned char base_addr = (u_char )BASE_ADDR;
	int channel;		int channel;
	@@ -1546,7 +1546,7 @@ get_threshold(struct cyclades_port * info, unsigned long *value)
	}		}

	static int		static int
	set_default_threshold(struct cyclades_port * info, unsigned long *arg)		set_default_threshold(struct cyclades_port * info, unsigned long __user *arg)
	{		{
	unsigned long value;		unsigned long value;

	@@ -1558,13 +1558,13 @@ set_default_threshold(struct cyclades_port * info, unsigned long *arg)
	}		}

	static int		static int
	get_default_threshold(struct cyclades_port * info, unsigned long *value)		get_default_threshold(struct cyclades_port * info, unsigned long __user *value)
	{		{
	return put_user(info->default_threshold,value);		return put_user(info->default_threshold,value);
	}		}

	static int		static int
	set_timeout(struct cyclades_port * info, unsigned long *arg)		set_timeout(struct cyclades_port * info, unsigned long __user *arg)
	{		{
	volatile unsigned char base_addr = (u_char )BASE_ADDR;		volatile unsigned char base_addr = (u_char )BASE_ADDR;
	int channel;		int channel;
	@@ -1581,7 +1581,7 @@ set_timeout(struct cyclades_port * info, unsigned long *arg)
	}		}

	static int		static int
	get_timeout(struct cyclades_port * info, unsigned long *value)		get_timeout(struct cyclades_port * info, unsigned long __user *value)
	{		{
	volatile unsigned char base_addr = (u_char )BASE_ADDR;		volatile unsigned char base_addr = (u_char )BASE_ADDR;
	int channel;		int channel;
	@@ -1601,7 +1601,7 @@ set_default_timeout(struct cyclades_port * info, unsigned long value)
	}		}

	static int		static int
	get_default_timeout(struct cyclades_port * info, unsigned long *value)		get_default_timeout(struct cyclades_port * info, unsigned long __user *value)
	{		{
	return put_user(info->default_timeout,value);		return put_user(info->default_timeout,value);
	}		}
	@@ -1613,6 +1613,7 @@ cy_ioctl(struct tty_struct tty, struct file file,
	unsigned long val;		unsigned long val;
	struct cyclades_port * info = (struct cyclades_port *)tty->driver_data;		struct cyclades_port * info = (struct cyclades_port *)tty->driver_data;
	int ret_val = 0;		int ret_val = 0;
			void __user argp = (void __user )arg;

	#ifdef SERIAL_DEBUG_OTHER		#ifdef SERIAL_DEBUG_OTHER
	printk("cy_ioctl %s, cmd = %x arg = %lx\n", tty->name, cmd, arg); /* */		printk("cy_ioctl %s, cmd = %x arg = %lx\n", tty->name, cmd, arg); /* */
	@@ -1620,28 +1621,28 @@ cy_ioctl(struct tty_struct tty, struct file file,

	switch (cmd) {		switch (cmd) {
	case CYGETMON:		case CYGETMON:
	ret_val = get_mon_info(info, (struct cyclades_monitor *)arg);		ret_val = get_mon_info(info, argp);
	break;		break;
	case CYGETTHRESH:		case CYGETTHRESH:
	ret_val = get_threshold(info, (unsigned long *)arg);		ret_val = get_threshold(info, argp);
	break;		break;
	case CYSETTHRESH:		case CYSETTHRESH:
	ret_val = set_threshold(info, (unsigned long *)arg);		ret_val = set_threshold(info, argp);
	break;		break;
	case CYGETDEFTHRESH:		case CYGETDEFTHRESH:
	ret_val = get_default_threshold(info, (unsigned long *)arg);		ret_val = get_default_threshold(info, argp);
	break;		break;
	case CYSETDEFTHRESH:		case CYSETDEFTHRESH:
	ret_val = set_default_threshold(info, (unsigned long *)arg);		ret_val = set_default_threshold(info, argp);
	break;		break;
	case CYGETTIMEOUT:		case CYGETTIMEOUT:
	ret_val = get_timeout(info, (unsigned long *)arg);		ret_val = get_timeout(info, argp);
	break;		break;
	case CYSETTIMEOUT:		case CYSETTIMEOUT:
	ret_val = set_timeout(info, (unsigned long *)arg);		ret_val = set_timeout(info, argp);
	break;		break;
	case CYGETDEFTIMEOUT:		case CYGETDEFTIMEOUT:
	ret_val = get_default_timeout(info, (unsigned long *)arg);		ret_val = get_default_timeout(info, argp);
	break;		break;
	case CYSETDEFTIMEOUT:		case CYSETDEFTIMEOUT:
	ret_val = set_default_timeout(info, (unsigned long)arg);		ret_val = set_default_timeout(info, (unsigned long)arg);
	@@ -1664,21 +1665,20 @@ cy_ioctl(struct tty_struct tty, struct file file,

	/* The following commands are incompletely implemented!!! */		/* The following commands are incompletely implemented!!! */
	case TIOCGSOFTCAR:		case TIOCGSOFTCAR:
	ret_val = put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long *) arg);		ret_val = put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) argp);
	break;		break;
	case TIOCSSOFTCAR:		case TIOCSSOFTCAR:
	ret_val = get_user(val, (unsigned long *) arg);		ret_val = get_user(val, (unsigned long __user *) argp);
	if (ret_val)		if (ret_val)
	break;		break;
	tty->termios->c_cflag =		tty->termios->c_cflag =
	((tty->termios->c_cflag & ~CLOCAL) \| (val ? CLOCAL : 0));		((tty->termios->c_cflag & ~CLOCAL) \| (val ? CLOCAL : 0));
	break;		break;
	case TIOCGSERIAL:		case TIOCGSERIAL:
	ret_val = get_serial_info(info, (struct serial_struct *) arg);		ret_val = get_serial_info(info, argp);
	break;		break;
	case TIOCSSERIAL:		case TIOCSSERIAL:
	ret_val = set_serial_info(info,		ret_val = set_serial_info(info, argp);
	(struct serial_struct *) arg);
	break;		break;
	default:		default:
	ret_val = -ENOIOCTLCMD;		ret_val = -ENOIOCTLCMD;
	@@ -1773,7 +1773,7 @@ cy_close(struct tty_struct * tty, struct file * filp)
	tty->driver->flush_buffer(tty);		tty->driver->flush_buffer(tty);
	tty_ldisc_flush(tty);		tty_ldisc_flush(tty);
	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) {
	msleep_interruptible(jiffies_to_msecs(info->close_delay));		msleep_interruptible(jiffies_to_msecs(info->close_delay));
	@@ -2250,7 +2250,7 @@ scrn[1] = '\0';
	info->card = index;		info->card = index;
	info->line = port_num;		info->line = port_num;
	info->flags = STD_COM_FLAGS;		info->flags = STD_COM_FLAGS;
	info->tty = 0;		info->tty = NULL;
	info->xmit_fifo_size = 12;		info->xmit_fifo_size = 12;
	info->cor1 = CyPARITY_NONE\|Cy_8_BITS;		info->cor1 = CyPARITY_NONE\|Cy_8_BITS;
	info->cor2 = CyETC;		info->cor2 = CyETC;