diff options
Diffstat (limited to 'tty.current')
6 files changed, 0 insertions, 259 deletions
diff --git a/tty.current/68328serial-check-return-value-of-copy_-_user-instead-of-access_ok.patch b/tty.current/68328serial-check-return-value-of-copy_-_user-instead-of-access_ok.patch deleted file mode 100644 index 66fa8888f7f299..00000000000000 --- a/tty.current/68328serial-check-return-value-of-copy_-_user-instead-of-access_ok.patch +++ /dev/null @@ -1,87 +0,0 @@ -From segooon@gmail.com Thu Aug 19 10:41:51 2010 -From: Kulikov Vasiliy <segooon@gmail.com> -To: kernel-janitors@vger.kernel.org -Cc: Greg Kroah-Hartman <gregkh@suse.de>, - Andrew Morton <akpm@linux-foundation.org>, - Greg Ungerer <gerg@uclinux.org>, - Christoph Egger <siccegge@cs.fau.de>, Tejun Heo <tj@kernel.org>, - linux-kernel@vger.kernel.org -Subject: 68328serial: check return value of copy_*_user() instead of access_ok() -Date: Sun, 1 Aug 2010 10:29:06 +0400 -Message-Id: <1280644146-4418-1-git-send-email-segooon@gmail.com> - -As copy_*_user() calls access_ok() it should not be called explicitly. - -Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/serial/68328serial.c | 29 +++++++++++------------------ - 1 file changed, 11 insertions(+), 18 deletions(-) - ---- a/drivers/serial/68328serial.c -+++ b/drivers/serial/68328serial.c -@@ -869,7 +869,9 @@ static int get_serial_info(struct m68k_s - tmp.close_delay = info->close_delay; - tmp.closing_wait = info->closing_wait; - tmp.custom_divisor = info->custom_divisor; -- copy_to_user(retinfo,&tmp,sizeof(*retinfo)); -+ if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) -+ return -EFAULT; -+ - return 0; - } - -@@ -882,7 +884,8 @@ static int set_serial_info(struct m68k_s - - if (!new_info) - return -EFAULT; -- copy_from_user(&new_serial,new_info,sizeof(new_serial)); -+ if (copy_from_user(&new_serial, new_info, sizeof(new_serial))) -+ return -EFAULT; - old_info = *info; - - if (!capable(CAP_SYS_ADMIN)) { -@@ -943,8 +946,7 @@ static int get_lsr_info(struct m68k_seri - status = 0; - #endif - local_irq_restore(flags); -- put_user(status,value); -- return 0; -+ return put_user(status, value); - } - - /* -@@ -999,27 +1001,18 @@ static int rs_ioctl(struct tty_struct *t - send_break(info, arg ? arg*(100) : 250); - return 0; - case TIOCGSERIAL: -- if (access_ok(VERIFY_WRITE, (void *) arg, -- sizeof(struct serial_struct))) -- return get_serial_info(info, -- (struct serial_struct *) arg); -- return -EFAULT; -+ return get_serial_info(info, -+ (struct serial_struct *) arg); - case TIOCSSERIAL: - return set_serial_info(info, - (struct serial_struct *) arg); - case TIOCSERGETLSR: /* Get line status register */ -- if (access_ok(VERIFY_WRITE, (void *) arg, -- sizeof(unsigned int))) -- return get_lsr_info(info, (unsigned int *) arg); -- return -EFAULT; -+ return get_lsr_info(info, (unsigned int *) arg); - case TIOCSERGSTRUCT: -- if (!access_ok(VERIFY_WRITE, (void *) arg, -- sizeof(struct m68k_serial))) -+ if (copy_to_user((struct m68k_serial *) arg, -+ info, sizeof(struct m68k_serial))) - return -EFAULT; -- copy_to_user((struct m68k_serial *) arg, -- info, sizeof(struct m68k_serial)); - return 0; -- - default: - return -ENOIOCTLCMD; - } diff --git a/tty.current/ip2-remove-unneeded-null-check.patch b/tty.current/ip2-remove-unneeded-null-check.patch deleted file mode 100644 index b56fd60a7a1fa4..00000000000000 --- a/tty.current/ip2-remove-unneeded-null-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -From akpm@linux-foundation.org Thu Aug 19 10:33:35 2010 -Message-Id: <201008122048.o7CKmvB4011929@imap1.linux-foundation.org> -Subject: ip2: remove unneeded NULL check -To: mm-commits@vger.kernel.org -Cc: error27@gmail.com, greg@kroah.com, mhw@wittsend.com -From: Dan Carpenter <error27@gmail.com> -Date: Thu, 12 Aug 2010 13:48:57 -0700 - -From: Dan Carpenter <error27@gmail.com> - -We don't pass NULL tty pointers to the close function, and anyway we -already dereferenced it at this point. This check can be removed. - -Signed-off-by: Dan Carpenter <error27@gmail.com> -Cc: "Michael H. Warfield" <mhw@wittsend.com> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/ip2/ip2main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/char/ip2/ip2main.c -+++ b/drivers/char/ip2/ip2main.c -@@ -1650,7 +1650,7 @@ ip2_close( PTTY tty, struct file *pFile - /* disable DSS reporting */ - i2QueueCommands(PTYPE_INLINE, pCh, 100, 4, - CMD_DCD_NREP, CMD_CTS_NREP, CMD_DSR_NREP, CMD_RI_NREP); -- if ( !tty || (tty->termios->c_cflag & HUPCL) ) { -+ if (tty->termios->c_cflag & HUPCL) { - i2QueueCommands(PTYPE_INLINE, pCh, 100, 2, CMD_RTSDN, CMD_DTRDN); - pCh->dataSetOut &= ~(I2_DTR | I2_RTS); - i2QueueCommands( PTYPE_INLINE, pCh, 100, 1, CMD_PAUSE(25)); diff --git a/tty.current/ip2-return-efault-on-copy_to_user-errors.patch b/tty.current/ip2-return-efault-on-copy_to_user-errors.patch deleted file mode 100644 index 5a665e2eb67eed..00000000000000 --- a/tty.current/ip2-return-efault-on-copy_to_user-errors.patch +++ /dev/null @@ -1,33 +0,0 @@ -From akpm@linux-foundation.org Thu Aug 19 10:34:11 2010 -Message-Id: <201008122048.o7CKmxm5011932@imap1.linux-foundation.org> -Subject: ip2: return -EFAULT on copy_to_user errors -To: mm-commits@vger.kernel.org -Cc: error27@gmail.com, greg@kroah.com, mhw@wittsend.com -From: Dan Carpenter <error27@gmail.com> -Date: Thu, 12 Aug 2010 13:48:59 -0700 - -From: Dan Carpenter <error27@gmail.com> - -copy_to_user() returns the number of bytes remaining but we want to return -a negative error code on errors. - -Signed-off-by: Dan Carpenter <error27@gmail.com> -Cc: "Michael H. Warfield" <mhw@wittsend.com> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/ip2/ip2main.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/char/ip2/ip2main.c -+++ b/drivers/char/ip2/ip2main.c -@@ -2930,6 +2930,8 @@ ip2_ipl_ioctl (struct file *pFile, UINT - if ( pCh ) - { - rc = copy_to_user(argp, pCh, sizeof(i2ChanStr)); -+ if (rc) -+ rc = -EFAULT; - } else { - rc = -ENODEV; - } diff --git a/tty.current/rocket-add-a-mutex_unlock.patch b/tty.current/rocket-add-a-mutex_unlock.patch deleted file mode 100644 index 3194ba254c045b..00000000000000 --- a/tty.current/rocket-add-a-mutex_unlock.patch +++ /dev/null @@ -1,30 +0,0 @@ -From error27@gmail.com Thu Aug 19 10:34:47 2010 -Date: Wed, 11 Aug 2010 20:00:09 +0200 -From: Dan Carpenter <error27@gmail.com> -To: Greg Kroah-Hartman <gregkh@suse.de> -Cc: Alan Cox <alan@linux.intel.com>, kernel-janitors@vger.kernel.org -Subject: rocket: add a mutex_unlock() -Message-ID: <20100811180009.GA645@bicker> -Content-Disposition: inline - -This path needs a mutex_unlock(). This is stuff from the bkl to mutex -transition. - -Signed-off-by: Dan Carpenter <error27@gmail.com> -Acked-by: Alan Cox <alan@linux.intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/rocket.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/char/rocket.c -+++ b/drivers/char/rocket.c -@@ -1244,6 +1244,7 @@ static int set_config(struct tty_struct - } - info->flags = ((info->flags & ~ROCKET_USR_MASK) | (new_serial.flags & ROCKET_USR_MASK)); - configure_r_port(tty, info, NULL); -+ mutex_unlock(&info->port.mutex); - return 0; - } - diff --git a/tty.current/serial-print-early-console-device-address-in-hex.patch b/tty.current/serial-print-early-console-device-address-in-hex.patch deleted file mode 100644 index eeaaf2d1933c96..00000000000000 --- a/tty.current/serial-print-early-console-device-address-in-hex.patch +++ /dev/null @@ -1,40 +0,0 @@ -From tony.luck@intel.com Thu Aug 12 13:41:16 2010 -From: "Luck, Tony" <tony.luck@intel.com> -To: "Greg KH" <gregkh@suse.de> -Cc: linux-kernel@vger.kernel.org, - "Samium Gromoff" <_deepfire@feelingofgreen.ru>, - "Randy Dunlap" <randy.dunlap@oracle.com>, - "KOSAKI Motohiro" <kosaki.motohiro@jp.fujitsu.com>, - "Andrew Morton" <akpm@linux-foundation.org> -Subject: serial: print early console device address in hex -Date: Thu, 12 Aug 2010 12:16:43 -0700 -Message-Id: <4c64489b11469c2a9e@agluck-desktop.sc.intel.com> - -Device addresses are usually printed in hex. - -Signed-off-by: Tony Luck <tony.luck@intel.com> -Cc: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/serial/8250_early.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/serial/8250_early.c -+++ b/drivers/serial/8250_early.c -@@ -203,13 +203,13 @@ static int __init parse_options(struct e - - if (mmio || mmio32) - printk(KERN_INFO -- "Early serial console at MMIO%s 0x%llu (options '%s')\n", -+ "Early serial console at MMIO%s 0x%llx (options '%s')\n", - mmio32 ? "32" : "", - (unsigned long long)port->mapbase, - device->options); - else - printk(KERN_INFO -- "Early serial console at I/O port 0x%lu (options '%s')\n", -+ "Early serial console at I/O port 0x%lx (options '%s')\n", - port->iobase, - device->options); - diff --git a/tty.current/synclink-add-mutex_unlock-on-error-path.patch b/tty.current/synclink-add-mutex_unlock-on-error-path.patch deleted file mode 100644 index 6236e23a34a495..00000000000000 --- a/tty.current/synclink-add-mutex_unlock-on-error-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -From error27@gmail.com Thu Aug 19 10:34:59 2010 -Date: Wed, 11 Aug 2010 20:01:46 +0200 -From: Dan Carpenter <error27@gmail.com> -To: Greg Kroah-Hartman <gregkh@suse.de> -Cc: Paul Fulghum <paulkf@microgate.com>, - Alan Cox <alan@linux.intel.com>, - Stephen Hemminger <shemminger@vyatta.com>, - kernel-janitors@vger.kernel.org -Subject: synclink: add mutex_unlock() on error path -Message-ID: <20100811180146.GB645@bicker> -Content-Disposition: inline - -There is a path which still holds its mutex here. - -Signed-off-by: Dan Carpenter <error27@gmail.com> -Acked-by: Alan Cox <alan@linux.intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/synclink_gt.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/char/synclink_gt.c -+++ b/drivers/char/synclink_gt.c -@@ -691,8 +691,10 @@ static int open(struct tty_struct *tty, - if (info->port.count == 1) { - /* 1st open on this device, init hardware */ - retval = startup(info); -- if (retval < 0) -+ if (retval < 0) { -+ mutex_unlock(&info->port.mutex); - goto cleanup; -+ } - } - mutex_unlock(&info->port.mutex); - retval = block_til_ready(tty, filp, info); |