linux/drivers/staging/tty, branch v3.0.56

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-05-23T19:49:28Z

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits) staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_ staging:iio: Trivial kconfig reorganization and uniformity improvements. staging:iio:documenation partial update. staging:iio: use pollfunc allocation helpers in remaining drivers. staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out. staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev. staging:iio:meter:ade7758: Use private data space from iio_allocate_device staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value. staging:iio: ring core cleanups + check if read_last available in lis3l02dq staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name. staging:iio: poll func allocation clean up. staging:iio:ad7780 trivial unused header cleanup. staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes staging:iio:adc:AD7780: Convert to new channel registration method staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv() staging:iio:adc: AD7606: Consitently use indio_dev staging:iio: Rip out helper for software rings. staging:iio:adc:AD7298: Use private data space from iio_allocate_device staging:iio: rationalization of different buffer implementation hooks. staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev. ... Fix up trivial conflicts in - drivers/staging/intel_sst/intelmid.c: patches applied in both branches - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion

Revert wrong fixes for common misspellings

2011-04-27T06:31:11Z

These changes were incorrectly fixed by codespell. They were now manually corrected. Signed-off-by: Lucas De Marchi

staging: istallion: fix arbitrary kernel memory reads/writes

2011-04-25T23:45:22Z

stli_brdstats is defined as global variable. After de-BKL-ization in the patch b4eda9cb48eac1b7 an access to the variable is not serialized anymore. This leads to the race window between the check and the use in stli_getbrdstats(): if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t))) return -EFAULT; if (stli_brdstats.brd >= STL_MAXBRDS) <<< return -ENODEV; brdp = stli_brds[stli_brdstats.brd]; <<< If one process calls COM_GETBRDSTATS ioctl() with sane .brd, second process calls COM_GETBRDSTATS ioctl() with invalid .brd, and the second process' copy_from_user() executes exactly between the check and stli_brds[] indexation of the first process, then the first process gets contents of memory at *stli_brds[stli_brdstats.brd] address. Also the resulting .nrpanels field may be too big, in this case stli_brdstats.panels array overflows. Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman

Fix common misspellings

2011-03-31T14:26:23Z

Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi

drivers/staging/tty/specialix.c: convert func_enter to func_exit

2011-03-24T02:46:39Z

Convert calls to func_enter on leaving a function to func_exit. The semantic patch that fixes this problem is as follows: (http://coccinelle.lip6.fr/) // @@ @@ - func_enter(); + func_exit(); return...; // Signed-off-by: Julia Lawall Cc: Roger Wolff Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

tty: move cd1865.h to drivers/staging/tty/

2011-03-07T20:04:50Z

The file is required by the specialix driver, which was moved to drivers/staging/. Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman

Staging: tty: fix build with epca.c driver

2011-03-07T20:03:07Z

I forgot to move the digi*.h files from drivers/char/ to drivers/staging/tty/ Thanks to Randy for pointing out the issue. Reported-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman

tty: move obsolete and broken tty drivers to drivers/staging/tty/

2011-02-23T00:57:21Z

As planned by Arnd Bergmann, this moves the following drivers to the drivers/staging/tty/ directory where they will be removed after 2.6.41 if no one steps up to claim them. epca epca ip2 istallion riscom8 serial167 specialix stallion Cc: Arnd Bergmann Cc: Alan Cox Cc: Jiri Slaby Signed-off-by: Greg Kroah-Hartman