Linux 4.15.1
Greg KH
maintainerI'm announcing the release of the 4.15.1 kernel.
All users of the 4.15 kernel series must upgrade.
The updated 4.15.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.15.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/x86/crypto/aesni-intel_asm.S | 199 ++++------------- arch/x86/crypto/aesni-intel_glue.c | 70 ++++- crypto/Kconfig | 2 crypto/af_alg.c | 10 crypto/sha3_generic.c | 5 drivers/android/binder.c | 12 + drivers/android/binder_alloc.c | 2 drivers/bluetooth/hci_serdev.c | 1 drivers/crypto/inside-secure/safexcel_hash.c | 56 +++- drivers/firmware/efi/Kconfig | 5 drivers/gpio/gpio-ath79.c | 3 drivers/gpio/gpio-iop.c | 4 drivers/gpio/gpio-stmpe.c | 20 - drivers/gpio/gpiolib.c | 3 drivers/hid/wacom_sys.c | 24 +- drivers/hid/wacom_wac.c | 16 - drivers/iio/adc/stm32-adc.c | 3 drivers/iio/chemical/ccs811.c | 13 - drivers/input/rmi4/rmi_driver.c | 14 - drivers/input/rmi4/rmi_f03.c | 64 ++++- drivers/misc/mei/pci-me.c | 5 drivers/mtd/nand/denali_pci.c | 4 drivers/net/ethernet/intel/igb/igb_main.c | 2 drivers/power/reset/zx-reboot.c | 4 drivers/scsi/aacraid/aachba.c | 15 - drivers/scsi/aacraid/commsup.c | 9 drivers/scsi/storvsc_drv.c | 4 drivers/spi/spi-imx.c | 15 + drivers/staging/ccree/ssi_cipher.c | 1 drivers/staging/ccree/ssi_driver.c | 2 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 7 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 2 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 6 drivers/tty/serial/8250/8250_dw.c | 30 +- drivers/tty/serial/8250/8250_of.c | 5 drivers/tty/serial/8250/8250_uniphier.c | 5 drivers/tty/serial/imx.c | 14 - drivers/tty/tty_io.c | 8 drivers/tty/tty_ldisc.c | 4 drivers/usb/class/cdc-acm.c | 5 drivers/usb/gadget/function/f_fs.c | 3 drivers/usb/gadget/udc/core.c | 2 drivers/usb/serial/Kconfig | 1 drivers/usb/serial/io_edgeport.c | 1 drivers/usb/serial/option.c | 5 drivers/usb/serial/pl2303.c | 1 drivers/usb/serial/pl2303.h | 1 drivers/usb/serial/usb-serial-simple.c | 7 drivers/usb/storage/uas.c | 7 include/linux/tty.h | 2 lib/test_firmware.c | 1 security/integrity/ima/ima_policy.c | 2 sound/pci/hda/patch_realtek.c | 6 tools/gpio/gpio-event-mon.c | 1 tools/usb/usbip/src/usbip_bind.c | 9 tools/usb/usbip/src/usbip_list.c | 9 57 files changed, 424 insertions(+), 309 deletions(-)
Aaron Armstrong Skomra (1):
HID: wacom: EKR: ensure devres groups at higher indexes are released
Andy Shevchenko (1):
serial: 8250_dw: Revert "Improve clock rate setting"
Antoine Tenart (2):
crypto: inside-secure - fix hash when length is a multiple of a block
crypto: inside-secure - avoid unmapping DMA memory that was not mapped
Ard Biesheuvel (1):
crypto: sha3-generic - fixes for alignment and big endian operation
Benjamin Herrenschmidt (1):
usb/gadget: Fix "high bandwidth" check in usb_gadget_ep_match_desc()
Dan Carpenter (1):
scsi: storvsc: missing error code in storvsc_probe()
Dmitry Eremin (1):
staging: lustre: separate a connection destroy from free struct kib_conn
Dmitry Torokhov (2):
Input: synaptics-rmi4 - unmask F03 interrupts when port is opened
Input: synaptics-rmi4 - do not delete interrupt memory too early
Fabio Estevam (1):
serial: imx: Only wakeup via RTSDEN bit if the system has RTS/CTS
Fabrice Gasnier (1):
iio: adc: stm32: fix scan of multiple channels with DMA
Ganesh Mahendran (1):
android: binder: use VM_ALLOC to get vm area
Gaurav Kohli (1):
tty: fix data race between tty_init_dev and flush of buf
Gilad Ben-Yossef (2):
staging: ccree: NULLify backup_info when unused
staging: ccree: fix fips event irq handling build
Greg Kroah-Hartman (2):
USB: serial: pl2303: new device id for Chilitag Linux 4.15.1
Hans de Goede (1):
USB: cdc-acm: Do not log urb submission errors on disconnect
Hauke Mehrtens (1):
crypto: ecdh - fix typo in KPP dependency of CRYPTO_ECDH
Hemant Kumar (1):
usb: f_fs: Prevent gadget unbind if it is already unbound
Jason Gerecke (1):
HID: wacom: Fix reporting of touch toggle (WACOM_HID_WD_MUTE_DEVICE) events
Jesse Chan (4):
power: reset: zx-reboot: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
gpio: iop: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
gpio: ath79: add missing MODULE_DESCRIPTION/LICENSE
mtd: nand: denali_pci: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
Jia-Ju Bai (1):
USB: serial: io_edgeport: fix possible sleep-in-atomic
Joel Stanley (1):
tools/gpio: Fix build error with musl libc
Johan Hovold (1):
USB: serial: simple: add Motorola Tetra driver
Junaid Shahid (2):
crypto: aesni - Fix out-of-bounds access of the data buffer in generic-gcm-aesni
crypto: aesni - Fix out-of-bounds access of the AAD buffer in generic-gcm-aesni
Linus Walleij (1):
gpio: Fix kernel stack leak to userspace
Lukas Wunner (1):
Bluetooth: hci_serdev: Init hci_uart proto_lock to avoid oops
Lyude Paul (1):
igb: Free IRQs when device is hotplugged
Martijn Coenen (1):
ANDROID: binder: remove waitqueue when thread exits.
Masahiro Yamada (1):
serial: 8250_of: fix return code when probe function fails to get reset
Matthew Garrett (1):
x86/efi: Clarify that reset attack mitigation needs appropriate userspace
Mike Rapoport (1):
ima/policy: fix parsing of fsuuid
Narcisa Ana Maria Vasile (1):
iio: chemical: ccs811: Fix output of IIO_CONCENTRATION channels
OKAMOTO Yoshiaki (1):
usb: option: Add support for FS040U modem
Oliver Neukum (2):
CDC-ACM: apply quirk for card reader
usb: uas: unconditionally bring back host after reset
Patrice Chotard (1):
gpio: stmpe: i2c transfer are forbiden in atomic context
Raghava Aditya Renukunta (2):
scsi: aacraid: Fix udev inquiry race condition
scsi: aacraid: Fix hang in kdump
Sabrina Dubroca (2):
crypto: aesni - fix typo in generic_gcmaes_decrypt
crypto: aesni - add wrapper for generic gcm(aes)
Shuah Khan (2):
usbip: prevent bind loops on devices attached to vhci_hcd
usbip: list: don't list devices attached to vhci_hcd
Stefan Agner (1):
spi: imx: do not access registers while clocks disabled
Stephan Mueller (2):
crypto: aesni - handle zero length dst buffer
crypto: af_alg - whitelist mask and type
Takashi Iwai (1):
ALSA: hda - Reduce the suspend time consumption for ALC256
Tomas Winkler (1):
mei: me: allow runtime pm for platform with D0i3
Wei Yongjun (2):
serial: 8250_uniphier: fix error return code in uniphier_uart_probe()
test_firmware: fix missing unlock on error in config_num_requests_store()
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 15 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = NAME = Fearless Coyote
arch/x86/crypto/aesni-intel_asm.S +57 -142
301 lines not on this page · raw message
arch/x86/crypto/aesni-intel_glue.c +56 -14
130 lines not on this page · raw message
crypto/Kconfig +1 -1
@@ -130,7 +130,7 @@ config CRYPTO_DH config CRYPTO_ECDH tristate "ECDH algorithm" - select CRYTPO_KPP + select CRYPTO_KPP select CRYPTO_RNG_DEFAULT help Generic implementation of the ECDH algorithm
crypto/af_alg.c +6 -4
@@ -150,7 +150,7 @@ EXPORT_SYMBOL_GPL(af_alg_release_parent);static int alg_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) { -const u32 forbidden =CRYPTO_ALG_INTERNAL ; +const u32 allowed =CRYPTO_ALG_KERN_DRIVER_ONLY ;struct sock *sk = sock->sk;struct alg_sock *ask =alg_sk (sk);struct sockaddr_alg *sa = (void *)uaddr;
@@ -158,6 +158,10 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)void *private;int err; +/* If caller uses non-allowed flag, return error. */ +if ((sa->salg_feat & ~allowed) || (sa->salg_mask & ~allowed)) +return -EINVAL ; +if (sock->state ==SS_CONNECTED )return -EINVAL ;
@@ -176,9 +180,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)if (IS_ERR (type))return PTR_ERR (type); - private = type->bind (sa->salg_name, - sa->salg_feat & ~forbidden, - sa->salg_mask & ~forbidden); + private = type->bind (sa->salg_name, sa->salg_feat, sa->salg_mask);if (IS_ERR (private)) {module_put (type->owner);return PTR_ERR (private);
crypto/sha3_generic.c +3 -2
@@ -18,6 +18,7 @@#include <linux/types.h> #include <crypto/sha3.h> #include <asm/byteorder.h> +#include <asm/unaligned.h> #define KECCAK_ROUNDS 24
@@ -149,7 +150,7 @@ static int sha3_update(struct shash_desc *desc, const u8 *data,unsigned int i;for (i =0 ; i < sctx->rsizw; i++) - sctx->st[i] ^= ((u64 *) src)[i]; + sctx->st[i] ^=get_unaligned_le64 (src +8 * i);keccakf (sctx->st); done += sctx->rsiz;
@@ -174,7 +175,7 @@ static int sha3_final(struct shash_desc *desc, u8 *out) sctx->buf[sctx->rsiz -1 ] |=0x80 ;for (i =0 ; i < sctx->rsizw; i++) - sctx->st[i] ^= ((u64 *) sctx->buf)[i]; + sctx->st[i] ^=get_unaligned_le64 (sctx->buf +8 * i);keccakf (sctx->st);
drivers/android/binder.c +12 -0
@@ -4302,6 +4302,18 @@ static int binder_thread_release(struct binder_proc *proc,if (t)spin_lock (&t->lock); } + +/* +* If this thread used poll, make sure we remove the waitqueue +* from any epoll data structures holding it with POLLFREE. +* waitqueue_active() is safe to use here because we're holding +* the inner lock. +*/ +if ((thread->looper &BINDER_LOOPER_STATE_POLL ) && +waitqueue_active (&thread->wait)) { +wake_up_poll (&thread->wait,POLLHUP |POLLFREE ); + } +binder_inner_proc_unlock (thread->proc);if (send_reply)
drivers/android/binder_alloc.c +1 -1
@@ -666,7 +666,7 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc, goto err_already_mapped; } - area =get_vm_area (vma->vm_end - vma->vm_start,VM_IOREMAP ); + area =get_vm_area (vma->vm_end - vma->vm_start,VM_ALLOC );if (area ==NULL ) { ret = -ENOMEM ; failure_string ="get_vm_area" ;
drivers/bluetooth/hci_serdev.c +1 -0
@@ -303,6 +303,7 @@ int hci_uart_register_device(struct hci_uart *hu,hci_set_drvdata (hdev, hu);INIT_WORK (&hu->write_work, hci_uart_write_work); +percpu_init_rwsem (&hu->proto_lock);/* Only when vendor specific setup callback is provided, consider * the manufacturer information valid. This avoids filling in the
drivers/crypto/inside-secure/safexcel_hash.c +37 -19
90 lines not on this page · raw message
drivers/firmware/efi/Kconfig +4 -1
@@ -159,7 +159,10 @@ config RESET_ATTACK_MITIGATION using the TCG Platform Reset Attack Mitigation specification. This protects against an attacker forcibly rebooting the system while it still contains secrets in RAM, booting another OS and extracting the - secrets. + secrets. This should only be enabled when userland is configured to + clear the MemoryOverwriteRequest flag on clean shutdown after secrets + have been evicted, since otherwise it will trigger even on clean + reboots. endmenu
drivers/gpio/gpio-ath79.c +3 -0
@@ -324,3 +324,6 @@ static struct platform_driver ath79_gpio_driver = { };module_platform_driver (ath79_gpio_driver); + +MODULE_DESCRIPTION ("Atheros AR71XX/AR724X/AR913X GPIO API support" ); +MODULE_LICENSE ("GPL v2" );
drivers/gpio/gpio-iop.c +4 -0
@@ -58,3 +58,7 @@ static int __init iop3xx_gpio_init(void)return platform_driver_register (&iop3xx_gpio_driver); }arch_initcall (iop3xx_gpio_init); + +MODULE_DESCRIPTION ("GPIO handling for Intel IOP3xx processors" ); +MODULE_AUTHOR ("Lennert Buytenhek <[email protected]>" ); +MODULE_LICENSE ("GPL" );
drivers/gpio/gpio-stmpe.c +10 -10
@@ -190,6 +190,16 @@ static void stmpe_gpio_irq_sync_unlock(struct irq_data *d) };int i, j; +/* +* STMPE1600: to be able to get IRQ from pins, +* a read must be done on GPMR register, or a write in +* GPSR or GPCR registers +*/ +if (stmpe->partnum ==STMPE1600 ) { +stmpe_reg_read (stmpe, stmpe->regs[STMPE_IDX_GPMR_LSB ]); +stmpe_reg_read (stmpe, stmpe->regs[STMPE_IDX_GPMR_CSB ]); + } +for (i =0 ; i <CACHE_NR_REGS ; i++) {/* STMPE801 and STMPE1600 don't have RE and FE registers */ if ((stmpe->partnum == STMPE801 ||
@@ -227,21 +237,11 @@ static void stmpe_gpio_irq_unmask(struct irq_data *d) {struct gpio_chip *gc =irq_data_get_irq_chip_data (d);struct stmpe_gpio *stmpe_gpio =gpiochip_get_data (gc); -struct stmpe *stmpe = stmpe_gpio->stmpe;int offset = d->hwirq;int regoffset = offset /8 ;int mask =BIT (offset %8 ); stmpe_gpio->regs[REG_IE ][regoffset] |= mask; - -/* -* STMPE1600 workaround: to be able to get IRQ from pins, -* a read must be done on GPMR register, or a write in -* GPSR or GPCR registers -*/ -if (stmpe->partnum ==STMPE1600 ) -stmpe_reg_read (stmpe, - stmpe->regs[STMPE_IDX_GPMR_LSB + regoffset]); } static void stmpe_dbg_show_one(struct seq_file *s,
drivers/gpio/gpiolib.c +3 -0
@@ -732,6 +732,9 @@ static irqreturn_t lineevent_irq_thread(int irq, void *p)struct gpioevent_data ge;int ret, level; +/* Do not leak kernel stack to userspace */ +memset (&ge,0 ,sizeof (ge)); + ge.timestamp =ktime_get_real_ns (); level =gpiod_get_value_cansleep (le->desc);
drivers/hid/wacom_sys.c +12 -12
@@ -2347,23 +2347,23 @@ static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index)int i;unsigned long flags; -spin_lock_irqsave (&remote->remote_lock, flags); - remote->remotes[index].registered = false; -spin_unlock_irqrestore (&remote->remote_lock, flags); +for (i =0 ; i <WACOM_MAX_REMOTES ; i++) { +if (remote->remotes[i].serial == serial) { -if (remote->remotes[index].battery.battery) -devres_release_group (&wacom->hdev->dev, - &remote->remotes[index].battery.bat_desc); +spin_lock_irqsave (&remote->remote_lock, flags); + remote->remotes[i].registered = false; +spin_unlock_irqrestore (&remote->remote_lock, flags); -if (remote->remotes[index].group.name) -devres_release_group (&wacom->hdev->dev, - &remote->remotes[index]); +if (remote->remotes[i].battery.battery) +devres_release_group (&wacom->hdev->dev, + &remote->remotes[i].battery.bat_desc); + +if (remote->remotes[i].group.name) +devres_release_group (&wacom->hdev->dev, + &remote->remotes[i]); -for (i =0 ; i <WACOM_MAX_REMOTES ; i++) { -if (remote->remotes[i].serial == serial) { remote->remotes[i].serial =0 ; remote->remotes[i].group.name =NULL ; - remote->remotes[i].registered = false; remote->remotes[i].battery.battery =NULL ; wacom->led.groups[i].select =WACOM_STATUS_UNKNOWN ; }
drivers/hid/wacom_wac.c +8 -8
@@ -1924,7 +1924,6 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *fieldstruct wacom_features *features = &wacom_wac->features;unsigned equivalent_usage =wacom_equivalent_usage (usage->hid);int i; -bool is_touch_on = value;bool do_report = false;/*
@@ -1969,16 +1968,17 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *fieldbreak ;case WACOM_HID_WD_MUTE_DEVICE : -if (wacom_wac->shared->touch_input && value) { - wacom_wac->shared->is_touch_on = !wacom_wac->shared->is_touch_on; - is_touch_on = wacom_wac->shared->is_touch_on; - } - -/* fall through*/ case WACOM_HID_WD_TOUCHONOFF :if (wacom_wac->shared->touch_input) { +bool *is_touch_on = &wacom_wac->shared->is_touch_on; + +if (equivalent_usage ==WACOM_HID_WD_MUTE_DEVICE && value) + *is_touch_on = !(*is_touch_on); +else if (equivalent_usage ==WACOM_HID_WD_TOUCHONOFF ) + *is_touch_on = value; +input_report_switch (wacom_wac->shared->touch_input, -SW_MUTE_DEVICE , !is_touch_on); +SW_MUTE_DEVICE , !(*is_touch_on));input_sync (wacom_wac->shared->touch_input); }break ;
drivers/iio/adc/stm32-adc.c +2 -1
@@ -1315,6 +1315,7 @@ static int stm32_adc_set_watermark(struct iio_dev *indio_dev, unsigned int val) {struct stm32_adc *adc =iio_priv (indio_dev);unsigned int watermark =STM32_DMA_BUFFER_SIZE /2 ; +unsigned int rx_buf_sz =STM32_DMA_BUFFER_SIZE ;/* * dma cyclic transfers are used, buffer is split into two periods.
@@ -1323,7 +1324,7 @@ static int stm32_adc_set_watermark(struct iio_dev *indio_dev, unsigned int val)* - one buffer (period) driver can push with iio_trigger_poll(). */ watermark =min (watermark, val * (unsigned )(sizeof (u16))); - adc->rx_buf_sz = watermark *2 ; + adc->rx_buf_sz =min (rx_buf_sz, watermark *2 * adc->num_conv);return 0 ; }
drivers/iio/chemical/ccs811.c +3 -10
@@ -96,7 +96,6 @@ static const struct iio_chan_spec ccs811_channels[] = { .channel2 = IIO_MOD_CO2, .modified = 1, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | - BIT(IIO_CHAN_INFO_OFFSET) | BIT(IIO_CHAN_INFO_SCALE), .scan_index = 0, .scan_type = {
@@ -255,24 +254,18 @@ static int ccs811_read_raw(struct iio_dev *indio_dev,switch (chan->channel2) {case IIO_MOD_CO2 : *val =0 ; - *val2 =12834 ; + *val2 =100 ;return IIO_VAL_INT_PLUS_MICRO ;case IIO_MOD_VOC : *val =0 ; - *val2 =84246 ; -return IIO_VAL_INT_PLUS_MICRO ; + *val2 =100 ; +return IIO_VAL_INT_PLUS_NANO ;default :return -EINVAL ; }default :return -EINVAL ; } -case IIO_CHAN_INFO_OFFSET : -if (!(chan->type ==IIO_CONCENTRATION && - chan->channel2 ==IIO_MOD_CO2 )) -return -EINVAL ; - *val =-400 ; -return IIO_VAL_INT ;default :return -EINVAL ; }
drivers/input/rmi4/rmi_driver.c +7 -7
@@ -41,6 +41,13 @@ void rmi_free_function_list(struct rmi_device *rmi_dev)rmi_dbg (RMI_DEBUG_CORE , &rmi_dev->dev,"Freeing function list\n" ); +/* Doing it in the reverse order so F01 will be removed last */ +list_for_each_entry_safe_reverse (fn, tmp, + &data->function_list, node) { +list_del (&fn->node); +rmi_unregister_function (fn); + } +devm_kfree (&rmi_dev->dev, data->irq_memory); data->irq_memory =NULL ; data->irq_status =NULL ;
@@ -50,13 +57,6 @@ void rmi_free_function_list(struct rmi_device *rmi_dev) data->f01_container =NULL ; data->f34_container =NULL ; - -/* Doing it in the reverse order so F01 will be removed last */ -list_for_each_entry_safe_reverse (fn, tmp, - &data->function_list, node) { -list_del (&fn->node); -rmi_unregister_function (fn); - } }static int reset_one_function (struct rmi_function *fn)
drivers/input/rmi4/rmi_f03.c +54 -10
111 lines not on this page · raw message
drivers/misc/mei/pci-me.c +4 -1
@@ -238,8 +238,11 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)*/ mei_me_set_pm_domain (dev); -if (mei_pg_is_enabled (dev)) +if (mei_pg_is_enabled (dev)) {pm_runtime_put_noidle (&pdev->dev); +if (hw->d0i3_supported) +pm_runtime_allow (&pdev->dev); + }dev_dbg (&pdev->dev,"initialization successful.\n" );
drivers/mtd/nand/denali_pci.c +4 -0
@@ -125,3 +125,7 @@ static struct pci_driver denali_pci_driver = { .remove = denali_pci_remove, };module_pci_driver (denali_pci_driver); + +MODULE_DESCRIPTION ("PCI driver for Denali NAND controller" ); +MODULE_AUTHOR ("Intel Corporation and its suppliers" ); +MODULE_LICENSE ("GPL v2" );
drivers/net/ethernet/intel/igb/igb_main.c +1 -1
@@ -3676,7 +3676,7 @@ static int __igb_close(struct net_device *netdev, bool suspending)int igb_close (struct net_device *netdev) { -if (netif_device_present (netdev)) +if (netif_device_present (netdev) || netdev->dismantle)return __igb_close (netdev, false);return 0 ; }
drivers/power/reset/zx-reboot.c +4 -0
@@ -82,3 +82,7 @@ static struct platform_driver zx_reboot_driver = { }, };module_platform_driver (zx_reboot_driver); + +MODULE_DESCRIPTION ("ZTE SoCs reset driver" ); +MODULE_AUTHOR ("Jun Nie <[email protected]>" ); +MODULE_LICENSE ("GPL v2" );
drivers/scsi/aacraid/aachba.c +11 -4
@@ -913,8 +913,15 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex)memset (str,' ' ,sizeof (*str));if (sup_adap_info->adapter_type_text[0 ]) { -char *cp = sup_adap_info->adapter_type_text;int c; +char *cp; +char *cname =kmemdup (sup_adap_info->adapter_type_text, +sizeof (sup_adap_info->adapter_type_text), +GFP_ATOMIC ); +if (!cname) +return ; + + cp = cname;if ((cp[0 ] =='A' ) && (cp[1 ] =='O' ) && (cp[2 ] =='C' ))inqstrcpy ("SMC" , str->vid);else {
@@ -923,7 +930,7 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex) ++cp; c = *cp; *cp ='\0' ; -inqstrcpy (sup_adap_info->adapter_type_text, str->vid); +inqstrcpy (cname, str->vid); *cp = c;while (*cp && *cp !=' ' ) ++cp;
@@ -937,8 +944,8 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex) cp[sizeof (str->pid)] ='\0' ; }inqstrcpy (cp, str->pid); -if (c) - cp[sizeof (str->pid)] = c; + +kfree (cname); }else {struct aac_driver_ident *mp =aac_get_driver_ident (dev->cardtype);
drivers/scsi/aacraid/commsup.c +1 -8
@@ -1643,14 +1643,7 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) out: aac->in_reset =0 ;scsi_unblock_requests (host); -/* -* Issue bus rescan to catch any configuration that might have -* occurred -*/ -if (!retval) { -dev_info (&aac->pdev->dev,"Issuing bus rescan\n" ); -scsi_scan_host (host); - } +if (jafo) {spin_lock_irq (host->host_lock); }
drivers/scsi/storvsc_drv.c +3 -1
@@ -1834,8 +1834,10 @@ static int storvsc_probe(struct hv_device *device,fc_host_node_name (host) = stor_device->node_name;fc_host_port_name (host) = stor_device->port_name; stor_device->rport =fc_remote_port_add (host,0 , &ids); -if (!stor_device->rport) +if (!stor_device->rport) { + ret = -ENOMEM ; goto err_out4; + } }#endif return 0 ;
drivers/spi/spi-imx.c +13 -2
@@ -1668,12 +1668,23 @@ static int spi_imx_remove(struct platform_device *pdev) {struct spi_master *master =platform_get_drvdata (pdev);struct spi_imx_data *spi_imx =spi_master_get_devdata (master); +int ret;spi_bitbang_stop (&spi_imx->bitbang); + ret =clk_enable (spi_imx->clk_per); +if (ret) +return ret; + + ret =clk_enable (spi_imx->clk_ipg); +if (ret) { +clk_disable (spi_imx->clk_per); +return ret; + } +writel (0 , spi_imx->base +MXC_CSPICTRL ); -clk_unprepare (spi_imx->clk_ipg); -clk_unprepare (spi_imx->clk_per); +clk_disable_unprepare (spi_imx->clk_ipg); +clk_disable_unprepare (spi_imx->clk_per);spi_imx_sdma_exit (spi_imx);spi_master_put (master);
drivers/staging/ccree/ssi_cipher.c +1 -0
@@ -908,6 +908,7 @@ static int ssi_ablkcipher_decrypt(struct ablkcipher_request *req)scatterwalk_map_and_copy (req_ctx->backup_info, req->src, (req->nbytes - ivsize), ivsize,0 ); req_ctx->is_giv = false; + req_ctx->backup_info =NULL ;return ssi_blkcipher_process (tfm, req_ctx, req->dst, req->src, req->nbytes, req->info, ivsize, (void *)req,DRV_CRYPTO_DIRECTION_DECRYPT ); }
drivers/staging/ccree/ssi_driver.c +1 -1
@@ -117,7 +117,7 @@ static irqreturn_t cc_isr(int irq, void *dev_id) irr &= ~SSI_COMP_IRQ_MASK ;complete_request (drvdata); } -#ifdef CC_SUPPORT_FIPS +#ifdef CONFIG_CRYPTO_FIPS /* TEE FIPS interrupt */ if (likely ((irr &SSI_GPR0_IRQ_MASK ) !=0 )) {/* Mask interrupt - will be unmasked in Deferred service handler */
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +3 -4
@@ -826,14 +826,15 @@ struct kib_conn *kiblnd_create_conn(struct kib_peer *peer, struct rdma_cm_id *cmreturn conn; failed_2: -kiblnd_destroy_conn (conn, true); +kiblnd_destroy_conn (conn); +LIBCFS_FREE (conn,sizeof (*conn)); failed_1:LIBCFS_FREE (init_qp_attr,sizeof (*init_qp_attr)); failed_0:return NULL ; } -void kiblnd_destroy_conn (struct kib_conn *conn,bool free_conn) +void kiblnd_destroy_conn (struct kib_conn *conn) {struct rdma_cm_id *cmid = conn->ibc_cmid;struct kib_peer *peer = conn->ibc_peer;
@@ -896,8 +897,6 @@ void kiblnd_destroy_conn(struct kib_conn *conn, bool free_conn)rdma_destroy_id (cmid);atomic_dec (&net->ibn_nconns); } - -LIBCFS_FREE (conn,sizeof (*conn)); }int kiblnd_close_peer_conns_locked (struct kib_peer *peer,int why)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +1 -1
@@ -1016,7 +1016,7 @@ int kiblnd_close_peer_conns_locked(struct kib_peer *peer, int why);struct kib_conn *kiblnd_create_conn (struct kib_peer *peer,struct rdma_cm_id *cmid,int state,int version); -void kiblnd_destroy_conn (struct kib_conn *conn,bool free_conn); +void kiblnd_destroy_conn (struct kib_conn *conn);void kiblnd_close_conn (struct kib_conn *conn,int error);void kiblnd_close_conn_locked (struct kib_conn *conn,int error);
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +4 -2
@@ -3314,11 +3314,13 @@ kiblnd_connd(void *arg)spin_unlock_irqrestore (lock, flags); dropped_lock =1 ; -kiblnd_destroy_conn (conn, !peer); +kiblnd_destroy_conn (conn);spin_lock_irqsave (lock, flags); -if (!peer) +if (!peer) { +kfree (conn);continue ; + } conn->ibc_peer = peer;if (peer->ibp_reconnected <KIB_RECONN_HIGH_RACE )
drivers/tty/serial/8250/8250_dw.c +12 -18
@@ -252,31 +252,25 @@ static void dw8250_set_termios(struct uart_port *p, struct ktermios *termios, struct ktermios *old) {unsigned int baud =tty_termios_baud_rate (termios); -unsigned int target_rate, min_rate, max_rate;struct dw8250_data *d = p->private_data;long rate; -int i, ret; +int ret;if (IS_ERR (d->clk) || !old) goto out; -/* Find a clk rate within +/-1.6% of an integer multiple of baudx16 */ - target_rate = baud *16 ; - min_rate = target_rate - (target_rate >>6 ); - max_rate = target_rate + (target_rate >>6 ); - -for (i =1 ; i <=UART_DIV_MAX ; i++) { - rate =clk_round_rate (d->clk, i * target_rate); -if (rate >= i * min_rate && rate <= i * max_rate) -break ; - } -if (i <=UART_DIV_MAX ) { -clk_disable_unprepare (d->clk); +clk_disable_unprepare (d->clk); + rate =clk_round_rate (d->clk, baud *16 ); +if (rate <0 ) + ret = rate; +else if (rate ==0 ) + ret = -ENOENT ; +else ret =clk_set_rate (d->clk, rate); -clk_prepare_enable (d->clk); -if (!ret) - p->uartclk = rate; - } +clk_prepare_enable (d->clk); + +if (!ret) + p->uartclk = rate; out: p->status &= ~UPSTAT_AUTOCTS ;
drivers/tty/serial/8250/8250_of.c +4 -1
@@ -136,8 +136,11 @@ static int of_platform_serial_setup(struct platform_device *ofdev, } info->rst =devm_reset_control_get_optional_shared (&ofdev->dev,NULL ); -if (IS_ERR (info->rst)) +if (IS_ERR (info->rst)) { + ret =PTR_ERR (info->rst); goto err_dispose; + } + ret =reset_control_deassert (info->rst);if (ret) goto err_dispose;
drivers/tty/serial/8250/8250_uniphier.c +3 -2
@@ -250,12 +250,13 @@ static int uniphier_uart_probe(struct platform_device *pdev) up.dl_read = uniphier_serial_dl_read; up.dl_write = uniphier_serial_dl_write; - priv->line =serial8250_register_8250_port (&up); -if (priv->line <0 ) { + ret =serial8250_register_8250_port (&up); +if (ret <0 ) {dev_err (dev,"failed to register 8250 port\n" );clk_disable_unprepare (priv->clk);return ret; } + priv->line = ret;platform_set_drvdata (pdev, priv);
drivers/tty/serial/imx.c +8 -6
@@ -2238,12 +2238,14 @@ static void serial_imx_enable_wakeup(struct imx_port *sport, bool on) val &= ~UCR3_AWAKEN ;writel (val, sport->port.membase +UCR3 ); - val =readl (sport->port.membase +UCR1 ); -if (on) - val |=UCR1_RTSDEN ; -else - val &= ~UCR1_RTSDEN ; -writel (val, sport->port.membase +UCR1 ); +if (sport->have_rtscts) { + val =readl (sport->port.membase +UCR1 ); +if (on) + val |=UCR1_RTSDEN ; +else + val &= ~UCR1_RTSDEN ; +writel (val, sport->port.membase +UCR1 ); + } }static int imx_serial_port_suspend_noirq (struct device *dev)
drivers/tty/tty_io.c +7 -1
@@ -1323,6 +1323,9 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx)"%s: %s driver does not set tty->port. This will crash the kernel later. Fix the driver!\n" , __func__, tty->driver->name); + retval =tty_ldisc_lock (tty,5 *HZ ); +if (retval) + goto err_release_lock; tty->port->itty = tty;/*
@@ -1333,6 +1336,7 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx) retval =tty_ldisc_setup (tty, tty->link);if (retval) goto err_release_tty; +tty_ldisc_unlock (tty);/* Return the tty locked so that it cannot vanish under the caller */ return tty;
@@ -1345,9 +1349,11 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx)/* call the tty release_tty routine to clean out this slot */ err_release_tty: -tty_unlock (tty); +tty_ldisc_unlock (tty);tty_info_ratelimited (tty,"ldisc open failed (%d), clearing slot %d\n" , retval, idx); +err_release_lock: +tty_unlock (tty);release_tty (tty, idx);return ERR_PTR (retval); }
drivers/tty/tty_ldisc.c +2 -2
@@ -337,7 +337,7 @@ static inline void __tty_ldisc_unlock(struct tty_struct *tty)ldsem_up_write (&tty->ldisc_sem); } -static int tty_ldisc_lock (struct tty_struct *tty,unsigned long timeout) +int tty_ldisc_lock (struct tty_struct *tty,unsigned long timeout) {int ret;
@@ -348,7 +348,7 @@ static int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)return 0 ; } -static void tty_ldisc_unlock (struct tty_struct *tty) +void tty_ldisc_unlock (struct tty_struct *tty) {clear_bit (TTY_LDISC_HALTED , &tty->flags);__tty_ldisc_unlock (tty);
drivers/usb/class/cdc-acm.c +4 -1
@@ -425,7 +425,7 @@ static int acm_submit_read_urb(struct acm *acm, int index, gfp_t mem_flags) res =usb_submit_urb (acm->read_urbs[index], mem_flags);if (res) { -if (res != -EPERM ) { +if (res != -EPERM && res != -ENODEV ) {dev_err (&acm->data->dev,"urb %d failed submission with %d\n" , index, res);
@@ -1752,6 +1752,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x0ace, 0x1611), /* ZyDAS 56K USB MODEM - new version */ .driver_info =SINGLE_RX_URB ,/* firmware bug */ }, + { USB_DEVICE(0x11ca, 0x0201), /* VeriFone Mx870 Gadget Serial */ + .driver_info = SINGLE_RX_URB, + }, { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ },
drivers/usb/gadget/function/f_fs.c +2 -1
@@ -3700,7 +3700,8 @@ static void ffs_closed(struct ffs_data *ffs) ci = opts->func_inst.group.cg_item.ci_parent->ci_parent;ffs_dev_unlock (); -unregister_gadget_item (ci); +if (test_bit (FFS_FL_BOUND , &ffs->flags)) +unregister_gadget_item (ci);return ; done:ffs_dev_unlock ();
drivers/usb/gadget/udc/core.c +1 -1
@@ -912,7 +912,7 @@ int usb_gadget_ep_match_desc(struct usb_gadget *gadget,return 0 ;/* "high bandwidth" works only at high speed */ -if (!gadget_is_dualspeed (gadget) &&usb_endpoint_maxp (desc) & (3 <<11 )) +if (!gadget_is_dualspeed (gadget) &&usb_endpoint_maxp_mult (desc) >1 )return 0 ;switch (type) {
drivers/usb/serial/Kconfig +1 -0
@@ -63,6 +63,7 @@ config USB_SERIAL_SIMPLE - Google USB serial devices - HP4x calculators - a number of Motorola phones + - Motorola Tetra devices - Novatel Wireless GPS receivers - Siemens USB/MPI adapter. - ViVOtech ViVOpay USB device.
drivers/usb/serial/io_edgeport.c +0 -1
@@ -2282,7 +2282,6 @@ static int write_cmd_usb(struct edgeport_port *edge_port,/* something went wrong */ dev_err (dev,"%s - usb_submit_urb(write command) failed, status = %d\n" , __func__, status); -usb_kill_urb (urb);usb_free_urb (urb);atomic_dec (&CmdUrbs);return status;
drivers/usb/serial/option.c +5 -0
@@ -380,6 +380,9 @@ static void option_instat_callback(struct urb *urb);#define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603#define FOUR_G_SYSTEMS_PRODUCT_W100 0x9b01 +/* Fujisoft products */ +#define FUJISOFT_PRODUCT_FS040U 0x9b02 +/* iBall 3.5G connect wireless modem */ #define IBALL_3_5G_CONNECT 0x9605
@@ -1894,6 +1897,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W100), .driver_info = (kernel_ulong_t)&four_g_w100_blacklist }, + {USB_DEVICE(LONGCHEER_VENDOR_ID, FUJISOFT_PRODUCT_FS040U), + .driver_info = (kernel_ulong_t)&net_intf3_blacklist}, { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) }, { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff), .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
drivers/usb/serial/pl2303.c +1 -0
@@ -38,6 +38,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_DCU11) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ3) }, + { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_CHILITAG) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MMX) },
drivers/usb/serial/pl2303.h +1 -0
@@ -12,6 +12,7 @@#define PL2303_PRODUCT_ID_DCU11 0x1234#define PL2303_PRODUCT_ID_PHAROS 0xaaa0#define PL2303_PRODUCT_ID_RSAQ3 0xaaa2 +#define PL2303_PRODUCT_ID_CHILITAG 0xaaa8#define PL2303_PRODUCT_ID_ALDIGA 0x0611#define PL2303_PRODUCT_ID_MMX 0x0612#define PL2303_PRODUCT_ID_GPRS 0x0609
drivers/usb/serial/usb-serial-simple.c +7 -0
@@ -77,6 +77,11 @@ DEVICE(vivopay, VIVOPAY_IDS); { USB_DEVICE(0x22b8, 0x2c64) } /* Motorola V950 phone */DEVICE (moto_modem,MOTO_IDS ); +/* Motorola Tetra driver */ +#define MOTOROLA_TETRA_IDS () \ + { USB_DEVICE(0x0cad, 0x9011) }/* Motorola Solutions TETRA PEI */ +DEVICE (motorola_tetra,MOTOROLA_TETRA_IDS ); +/* Novatel Wireless GPS driver */ #define NOVATEL_IDS () \ { USB_DEVICE(0x09d7, 0x0100) }/* NovAtel FlexPack GPS */
@@ -107,6 +112,7 @@ static struct usb_serial_driver * const serial_drivers[] = { &google_device, &vivopay_device, &moto_modem_device, + &motorola_tetra_device, &novatel_gps_device, &hp4x_device, &suunto_device,
@@ -122,6 +128,7 @@ static const struct usb_device_id id_table[] = {GOOGLE_IDS (),VIVOPAY_IDS (),MOTO_IDS (), +MOTOROLA_TETRA_IDS (),NOVATEL_IDS (),HP4X_IDS (), SUUNTO_IDS(),
drivers/usb/storage/uas.c +3 -4
@@ -1076,20 +1076,19 @@ static int uas_post_reset(struct usb_interface *intf)return 0 ; err =uas_configure_endpoints (devinfo); -if (err) { +if (err && err !=ENODEV )shost_printk (KERN_ERR , shost,"%s: alloc streams error %d after reset" , __func__, err); -return 1 ; - } +/* we must unblock the host in every case lest we deadlock */ spin_lock_irqsave (shost->host_lock, flags);scsi_report_bus_reset (shost,0 );spin_unlock_irqrestore (shost->host_lock, flags);scsi_unblock_requests (shost); -return 0 ; +return err ?1 :0 ; }static int uas_suspend (struct usb_interface *intf,pm_message_t message)
include/linux/tty.h +2 -0
@@ -405,6 +405,8 @@ extern const char *tty_name(const struct tty_struct *tty);extern struct tty_struct *tty_kopen (dev_t device);extern void tty_kclose (struct tty_struct *tty);extern int tty_dev_name_to_number (const char *name,dev_t *number); +extern int tty_ldisc_lock (struct tty_struct *tty,unsigned long timeout); +extern void tty_ldisc_unlock (struct tty_struct *tty);#else static inline void tty_kref_put (struct tty_struct *tty) { }
lib/test_firmware.c +1 -0
@@ -371,6 +371,7 @@ static ssize_t config_num_requests_store(struct device *dev,if (test_fw_config->reqs) {pr_err ("Must call release_all_firmware prior to changing config\n" ); rc = -EINVAL ; +mutex_unlock (&test_fw_mutex); goto out; }mutex_unlock (&test_fw_mutex);
security/integrity/ima/ima_policy.c +1 -1
@@ -743,7 +743,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)case Opt_fsuuid:ima_log_string (ab,"fsuuid" , args[0 ].from); -if (uuid_is_null (&entry->fsuuid)) { +if (!uuid_is_null (&entry->fsuuid)) { result = -EINVAL ;break ; }
sound/pci/hda/patch_realtek.c +4 -2
@@ -3154,11 +3154,13 @@ static void alc256_shutup(struct hda_codec *codec)if (hp_pin_sense)msleep (85 ); +/* 3k pull low control for Headset jack. */ +/* NOTE: call this before clearing the pin, otherwise codec stalls */ +alc_update_coef_idx (codec,0x46 ,0 ,3 <<12 ); +snd_hda_codec_write (codec, hp_pin,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,0x0 ); -alc_update_coef_idx (codec,0x46 ,0 ,3 <<12 );/* 3k pull low control for Headset jack. */ -if (hp_pin_sense)msleep (100 );
tools/gpio/gpio-event-mon.c +1 -0
@@ -23,6 +23,7 @@#include <getopt.h> #include <inttypes.h> #include <sys/ioctl.h> +#include <sys/types.h> #include <linux/gpio.h> int monitor_device(const char *device_name,
tools/usb/usbip/src/usbip_bind.c +9 -0
@@ -144,6 +144,7 @@ static int bind_device(char *busid)int rc;struct udev *udev;struct udev_device *dev; +const char *devpath;/* Check whether the device with this bus ID exists. */ udev =udev_new ();
@@ -152,8 +153,16 @@ static int bind_device(char *busid)err ("device with the specified bus ID does not exist" );return -1 ; } + devpath =udev_device_get_devpath (dev);udev_unref (udev); +/* If the device is already attached to vhci_hcd - bail out */ +if (strstr (devpath,USBIP_VHCI_DRV_NAME )) { +err ("bind loop detected: device: %s is attached to %s\n" , + devpath,USBIP_VHCI_DRV_NAME ); +return -1 ; + } + rc =unbind_other (busid);if (rc ==UNBIND_ST_FAILED ) {err ("could not unbind driver from device on busid %s" , busid);
tools/usb/usbip/src/usbip_list.c +9 -0
@@ -187,6 +187,7 @@ static int list_devices(bool parsable)const char *busid;char product_name[128 ];int ret =-1 ; +const char *devpath;/* Create libudev context. */ udev =udev_new ();
@@ -209,6 +210,14 @@ static int list_devices(bool parsable) path =udev_list_entry_get_name (dev_list_entry); dev =udev_device_new_from_syspath (udev, path); +/* Ignore devices attached to vhci_hcd */ + devpath =udev_device_get_devpath (dev); +if (strstr (devpath,USBIP_VHCI_DRV_NAME )) { +dbg ("Skip the device %s already attached to %s\n" , + devpath,USBIP_VHCI_DRV_NAME ); +continue ; + } +/* Get device information. */ idVendor =udev_device_get_sysattr_value (dev,"idVendor" ); idProduct =udev_device_get_sysattr_value (dev,"idProduct" );