Linux 5.6.1
Greg KH
maintainerI'm announcing the release of the 5.6.1 kernel.
All users of the 5.6 kernel series must upgrade.
The updated 5.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.6.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 drivers/ata/ahci.c | 1 drivers/media/usb/b2c2/flexcop-usb.c | 6 - drivers/media/usb/dvb-usb/dib0700_core.c | 4 drivers/media/usb/gspca/ov519.c | 10 ++ drivers/media/usb/gspca/stv06xx/stv06xx.c | 19 ++++ drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c | 4 drivers/media/usb/gspca/xirlink_cit.c | 18 ++++ drivers/media/usb/usbtv/usbtv-core.c | 2 drivers/media/usb/usbtv/usbtv-video.c | 5 - drivers/media/v4l2-core/v4l2-device.c | 1 drivers/staging/kpc2000/kpc2000/core.c | 4 drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt | 7 - drivers/staging/wfx/bus_sdio.c | 15 +-- drivers/staging/wfx/bus_spi.c | 41 +++++----- drivers/staging/wfx/main.c | 21 +++-- drivers/staging/wfx/main.h | 1 drivers/staging/wfx/queue.c | 16 +-- drivers/staging/wlan-ng/hfa384x_usb.c | 2 drivers/staging/wlan-ng/prism2usb.c | 1 drivers/usb/class/cdc-acm.c | 18 ++-- drivers/usb/musb/musb_host.c | 17 +--- drivers/usb/serial/io_edgeport.c | 2 drivers/usb/serial/option.c | 6 + fs/libfs.c | 8 + kernel/bpf/verifier.c | 19 ---- 27 files changed, 148 insertions(+), 103 deletions(-)
Dafna Hirschfeld (1):
media: v4l2-core: fix a use-after-free bug of sd->devnode
Dan Carpenter (1):
staging: kpc2000: prevent underflow in cpld_reconfigure()
Daniel Borkmann (1):
bpf: Undo incorrect __reg_bound_offset32 handling
Eric Biggers (1):
libfs: fix infoleak in simple_attr_read()
Greg Kroah-Hartman (1):
Linux 5.6.1
Johan Hovold (6):
media: flexcop-usb: fix endpoint sanity check
media: usbtv: fix control-message timeouts
media: ov519: add missing endpoint sanity checks
media: dib0700: fix rc endpoint lookup
media: stv06xx: add missing descriptor sanity checks
media: xirlink_cit: add missing descriptor sanity checks
Kai-Heng Feng (1):
ahci: Add Intel Comet Lake H RAID PCI ID
Larry Finger (1):
staging: rtl8188eu: Add ASUS USB-N10 Nano B1 to device table
Mans Rullgard (1):
usb: musb: fix crash with highmen PIO and usbmon
Matthias Reichl (1):
USB: cdc-acm: restore capability check order
Michał Mirosław (3):
staging: wfx: add proper "compatible" string
staging: wfx: fix init/remove vs IRQ race
staging: wfx: annotate nested gc_list vs tx queue locking
Pawel Dembicki (3):
USB: serial: option: add support for ASKEY WWHC050
USB: serial: option: add BroadMobi BM806U
USB: serial: option: add Wistron Neweb D19Q1
Qiujun Huang (3):
USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback
staging: wlan-ng: fix ODEBUG bug in prism2sta_disconnect_usb
staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 6 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = NAME = Kleptomaniac Octopus
drivers/ata/ahci.c +1 -0
@@ -401,6 +401,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0xa252), board_ahci }, /* Lewisburg RAID*/ { PCI_VDEVICE(INTEL, 0xa256), board_ahci }, /* Lewisburg RAID*/ { PCI_VDEVICE(INTEL, 0xa356), board_ahci }, /* Cannon Lake PCH-H RAID */ + { PCI_VDEVICE(INTEL, 0x06d7), board_ahci }, /* Comet Lake-H RAID */ { PCI_VDEVICE(INTEL, 0x0f22), board_ahci_mobile }, /* Bay Trail AHCI */ { PCI_VDEVICE(INTEL, 0x0f23), board_ahci_mobile }, /* Bay Trail AHCI */ { PCI_VDEVICE(INTEL, 0x22a3), board_ahci_mobile }, /* Cherry Tr. AHCI */
drivers/media/usb/b2c2/flexcop-usb.c +3 -3
@@ -511,6 +511,9 @@ static int flexcop_usb_init(struct flexcop_usb *fc_usb)return ret; } +if (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints <1 ) +return -ENODEV ; +switch (fc_usb->udev->speed) {case USB_SPEED_LOW :err ("cannot handle USB speed because it is too slow." );
@@ -544,9 +547,6 @@ static int flexcop_usb_probe(struct usb_interface *intf,struct flexcop_device *fc =NULL ;int ret; -if (intf->cur_altsetting->desc.bNumEndpoints <1 ) -return -ENODEV ; -if ((fc =flexcop_device_kmalloc (sizeof (struct flexcop_usb ))) ==NULL ) {err ("out of memory\n" );return -ENOMEM ;
drivers/media/usb/dvb-usb/dib0700_core.c +2 -2
@@ -818,7 +818,7 @@ int dib0700_rc_setup(struct dvb_usb_device *d, struct usb_interface *intf)/* Starting in firmware 1.20, the RC info is provided on a bulk pipe */ -if (intf->altsetting[0 ].desc.bNumEndpoints < rc_ep +1 ) +if (intf->cur_altsetting->desc.bNumEndpoints < rc_ep +1 )return -ENODEV ; purb =usb_alloc_urb (0 ,GFP_KERNEL );
@@ -838,7 +838,7 @@ int dib0700_rc_setup(struct dvb_usb_device *d, struct usb_interface *intf)* Some devices like the Hauppauge NovaTD model 52009 use an interrupt * endpoint, while others use a bulk one. */ - e = &intf->altsetting[0 ].endpoint[rc_ep].desc; + e = &intf->cur_altsetting->endpoint[rc_ep].desc;if (usb_endpoint_dir_in (e)) {if (usb_endpoint_xfer_bulk (e)) { pipe =usb_rcvbulkpipe (d->udev, rc_ep);
drivers/media/usb/gspca/ov519.c +10 -0
@@ -3477,6 +3477,11 @@ static void ov511_mode_init_regs(struct sd *sd)return ; } +if (alt->desc.bNumEndpoints <1 ) { + sd->gspca_dev.usb_err = -ENODEV ; +return ; + } + packet_size =le16_to_cpu (alt->endpoint[0 ].desc.wMaxPacketSize);reg_w (sd, R51x_FIFO_PSIZE, packet_size >>5 );
@@ -3603,6 +3608,11 @@ static void ov518_mode_init_regs(struct sd *sd)return ; } +if (alt->desc.bNumEndpoints <1 ) { + sd->gspca_dev.usb_err = -ENODEV ; +return ; + } + packet_size =le16_to_cpu (alt->endpoint[0 ].desc.wMaxPacketSize);ov518_reg_w32 (sd, R51x_FIFO_PSIZE, packet_size & ~7 ,2 );
drivers/media/usb/gspca/stv06xx/stv06xx.c +18 -1
@@ -282,6 +282,9 @@ static int stv06xx_start(struct gspca_dev *gspca_dev)return -EIO ; } +if (alt->desc.bNumEndpoints <1 ) +return -ENODEV ; + packet_size =le16_to_cpu (alt->endpoint[0 ].desc.wMaxPacketSize); err =stv06xx_write_bridge (sd,STV_ISO_SIZE_L , packet_size);if (err <0 )
@@ -306,11 +309,21 @@ static int stv06xx_start(struct gspca_dev *gspca_dev)static int stv06xx_isoc_init (struct gspca_dev *gspca_dev) { +struct usb_interface_cache *intfc;struct usb_host_interface *alt;struct sd *sd = (struct sd *) gspca_dev; + intfc = gspca_dev->dev->actconfig->intf_cache[0 ]; + +if (intfc->num_altsetting <2 ) +return -ENODEV ; + + alt = &intfc->altsetting[1 ]; + +if (alt->desc.bNumEndpoints <1 ) +return -ENODEV ; +/* Start isoc bandwidth "negotiation" at max isoc bandwidth */ - alt = &gspca_dev->dev->actconfig->intf_cache[0 ]->altsetting[1 ]; alt->endpoint[0 ].desc.wMaxPacketSize =cpu_to_le16 (sd->sensor->max_packet_size[gspca_dev->curr_mode]);
@@ -323,6 +336,10 @@ static int stv06xx_isoc_nego(struct gspca_dev *gspca_dev)struct usb_host_interface *alt;struct sd *sd = (struct sd *) gspca_dev; +/* +* Existence of altsetting and endpoint was verified in +* stv06xx_isoc_init() +*/ alt = &gspca_dev->dev->actconfig->intf_cache[0 ]->altsetting[1 ]; packet_size =le16_to_cpu (alt->endpoint[0 ].desc.wMaxPacketSize); min_packet_size = sd->sensor->min_packet_size[gspca_dev->curr_mode];
drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c +4 -0
@@ -185,6 +185,10 @@ static int pb0100_start(struct sd *sd) alt =usb_altnum_to_altsetting (intf, sd->gspca_dev.alt);if (!alt)return -ENODEV ; + +if (alt->desc.bNumEndpoints <1 ) +return -ENODEV ; + packet_size =le16_to_cpu (alt->endpoint[0 ].desc.wMaxPacketSize);/* If we don't have enough bandwidth use a lower framerate */
drivers/media/usb/gspca/xirlink_cit.c +17 -1
@@ -1442,6 +1442,9 @@ static int cit_get_packet_size(struct gspca_dev *gspca_dev)return -EIO ; } +if (alt->desc.bNumEndpoints <1 ) +return -ENODEV ; +return le16_to_cpu (alt->endpoint[0 ].desc.wMaxPacketSize); }
@@ -2626,6 +2629,7 @@ static int sd_start(struct gspca_dev *gspca_dev)static int sd_isoc_init (struct gspca_dev *gspca_dev) { +struct usb_interface_cache *intfc;struct usb_host_interface *alt;int max_packet_size;
@@ -2641,8 +2645,17 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)break ; } + intfc = gspca_dev->dev->actconfig->intf_cache[0 ]; + +if (intfc->num_altsetting <2 ) +return -ENODEV ; + + alt = &intfc->altsetting[1 ]; + +if (alt->desc.bNumEndpoints <1 ) +return -ENODEV ; +/* Start isoc bandwidth "negotiation" at max isoc bandwidth */ - alt = &gspca_dev->dev->actconfig->intf_cache[0 ]->altsetting[1 ]; alt->endpoint[0 ].desc.wMaxPacketSize =cpu_to_le16 (max_packet_size);return 0 ;
@@ -2665,6 +2678,9 @@ static int sd_isoc_nego(struct gspca_dev *gspca_dev)break ; } +/* +* Existence of altsetting and endpoint was verified in sd_isoc_init() +*/ alt = &gspca_dev->dev->actconfig->intf_cache[0 ]->altsetting[1 ]; packet_size =le16_to_cpu (alt->endpoint[0 ].desc.wMaxPacketSize);if (packet_size <= min_packet_size)
drivers/media/usb/usbtv/usbtv-core.c +1 -1
@@ -56,7 +56,7 @@ int usbtv_set_regs(struct usbtv *usbtv, const u16 regs[][2], int size) ret =usb_control_msg (usbtv->udev, pipe,USBTV_REQUEST_REG ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , - value, index,NULL ,0 ,0 ); + value, index,NULL ,0 ,USB_CTRL_GET_TIMEOUT );if (ret <0 )return ret; }
drivers/media/usb/usbtv/usbtv-video.c +3 -2
@@ -800,7 +800,8 @@ static int usbtv_s_ctrl(struct v4l2_ctrl *ctrl) ret =usb_control_msg (usbtv->udev,usb_rcvctrlpipe (usbtv->udev,0 ),USBTV_CONTROL_REG ,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , -0 ,USBTV_BASE +0x0244 , (void *)data,3 ,0 ); +0 ,USBTV_BASE +0x0244 , (void *)data,3 , +USB_CTRL_GET_TIMEOUT );if (ret <0 ) goto error; }
@@ -851,7 +852,7 @@ static int usbtv_s_ctrl(struct v4l2_ctrl *ctrl) ret =usb_control_msg (usbtv->udev,usb_sndctrlpipe (usbtv->udev,0 ),USBTV_CONTROL_REG ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , -0 , index, (void *)data, size,0 ); +0 , index, (void *)data, size,USB_CTRL_SET_TIMEOUT ); error:if (ret <0 )
drivers/media/v4l2-core/v4l2-device.c +1 -0
@@ -179,6 +179,7 @@ static void v4l2_subdev_release(struct v4l2_subdev *sd)if (sd->internal_ops && sd->internal_ops->release) sd->internal_ops->release (sd); + sd->devnode =NULL ;module_put (owner); }
drivers/staging/kpc2000/kpc2000/core.c +2 -2
@@ -110,10 +110,10 @@ static ssize_t cpld_reconfigure(struct device *dev, const char *buf, size_t count) {struct kp2000_device *pcard =dev_get_drvdata (dev); -long wr_val; +unsigned long wr_val;int rv; - rv =kstrtol (buf,0 , &wr_val); + rv =kstrtoul (buf,0 , &wr_val);if (rv <0 )return rv;if (wr_val >7 )
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -0
@@ -32,6 +32,7 @@ static const struct usb_device_id rtw_usb_id_tbl[] = {/****** 8188EUS ********/ {USB_DEVICE(0x056e, 0x4008)}, /* Elecom WDC-150SU2M */ {USB_DEVICE(0x07b8, 0x8179)}, /* Abocom - Abocom */ + {USB_DEVICE(0x0B05, 0x18F0)}, /* ASUS USB-N10 Nano B1 */ {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */ {USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */ {USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */
drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt +4 -3
@@ -6,7 +6,7 @@ SPI You have to declare the WFxxx chip in your device tree. Required properties: - - compatible: Should be "silabs,wfx-spi" + - compatible: Should be "silabs,wf200" - reg: Chip select address of device - spi-max-frequency: Maximum SPI clocking speed of device in Hz - interrupts-extended: Should contain interrupt line (interrupt-parent +
@@ -15,6 +15,7 @@ Required properties: Optional properties: - reset-gpios: phandle of gpio that will be used to reset chip during probe. Without this property, you may encounter issues with warm boot. + (Legacy: when compatible == "silabs,wfx-spi", the gpio is inverted.) Please consult Documentation/devicetree/bindings/spi/spi-bus.txt for optional SPI connection related properties,
@@ -23,12 +24,12 @@ Example: &spi1 { wfx { - compatible = "silabs,wfx-spi"; + compatible = "silabs,wf200"; pinctrl-names = "default"; pinctrl-0 = <&wfx_irq &wfx_gpios>; interrupts-extended = <&gpio 16 IRQ_TYPE_EDGE_RISING>; wakeup-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio 13 GPIO_ACTIVE_LOW>; reg = <0>; spi-max-frequency = <42000000>; };
drivers/staging/wfx/bus_sdio.c +6 -9
@@ -200,25 +200,23 @@ static int wfx_sdio_probe(struct sdio_func *func,if (ret) goto err0; - ret =wfx_sdio_irq_subscribe (bus); -if (ret) - goto err1; - bus->core =wfx_init_common (&func->dev, &wfx_sdio_pdata, &wfx_sdio_hwbus_ops, bus);if (!bus->core) { ret = -EIO ; - goto err2; + goto err1; } + ret =wfx_sdio_irq_subscribe (bus); +if (ret) + goto err1; + ret =wfx_probe (bus->core);if (ret) - goto err3; + goto err2;return 0 ; -err3: -wfx_free_common (bus->core); err2:wfx_sdio_irq_unsubscribe (bus); err1:
@@ -234,7 +232,6 @@ static void wfx_sdio_remove(struct sdio_func *func)struct wfx_sdio_priv *bus =sdio_get_drvdata (func);wfx_release (bus->core); -wfx_free_common (bus->core);wfx_sdio_irq_unsubscribe (bus);sdio_claim_host (func);sdio_disable_func (func);
drivers/staging/wfx/bus_spi.c +24 -17
89 lines not on this page · raw message
drivers/staging/wfx/main.c +13 -8
@@ -262,6 +262,16 @@ static int wfx_send_pdata_pds(struct wfx_dev *wdev)return ret; } +static void wfx_free_common (void *data) +{ +struct wfx_dev *wdev = data; + +mutex_destroy (&wdev->rx_stats_lock); +mutex_destroy (&wdev->conf_mutex); +wfx_tx_queues_deinit (wdev); +ieee80211_free_hw (wdev->hw); +} + struct wfx_dev *wfx_init_common(struct device *dev, const struct wfx_platform_data *pdata, const struct hwbus_ops *hwbus_ops,
@@ -332,15 +342,10 @@ struct wfx_dev *wfx_init_common(struct device *dev,wfx_init_hif_cmd (&wdev->hif_cmd);wfx_tx_queues_init (wdev); -return wdev; -} +if (devm_add_action_or_reset (dev, wfx_free_common, wdev)) +return NULL ; -void wfx_free_common (struct wfx_dev *wdev) -{ -mutex_destroy (&wdev->rx_stats_lock); -mutex_destroy (&wdev->conf_mutex); -wfx_tx_queues_deinit (wdev); -ieee80211_free_hw (wdev->hw); +return wdev; }int wfx_probe (struct wfx_dev *wdev)
drivers/staging/wfx/main.h +0 -1
@@ -34,7 +34,6 @@ struct wfx_dev *wfx_init_common(struct device *dev,const struct wfx_platform_data *pdata, const struct hwbus_ops *hwbus_ops, void *hwbus_priv); -void wfx_free_common (struct wfx_dev *wdev);int wfx_probe (struct wfx_dev *wdev);void wfx_release (struct wfx_dev *wdev);
drivers/staging/wfx/queue.c +8 -8
@@ -130,12 +130,12 @@ static void wfx_tx_queue_clear(struct wfx_dev *wdev, struct wfx_queue *queue,spin_lock_bh (&queue->queue.lock);while ((item =__skb_dequeue (&queue->queue)) !=NULL )skb_queue_head (gc_list, item); -spin_lock_bh (&stats->pending.lock); +spin_lock_nested (&stats->pending.lock,1 );for (i =0 ; i <ARRAY_SIZE (stats->link_map_cache); ++i) { stats->link_map_cache[i] -= queue->link_map_cache[i]; queue->link_map_cache[i] =0 ; } -spin_unlock_bh (&stats->pending.lock); +spin_unlock (&stats->pending.lock);spin_unlock_bh (&queue->queue.lock); }
@@ -207,9 +207,9 @@ void wfx_tx_queue_put(struct wfx_dev *wdev, struct wfx_queue *queue, ++queue->link_map_cache[tx_priv->link_id]; -spin_lock_bh (&stats->pending.lock); +spin_lock_nested (&stats->pending.lock,1 ); ++stats->link_map_cache[tx_priv->link_id]; -spin_unlock_bh (&stats->pending.lock); +spin_unlock (&stats->pending.lock);spin_unlock_bh (&queue->queue.lock); }
@@ -237,11 +237,11 @@ static struct sk_buff *wfx_tx_queue_get(struct wfx_dev *wdev,__skb_unlink (skb, &queue->queue); --queue->link_map_cache[tx_priv->link_id]; -spin_lock_bh (&stats->pending.lock); +spin_lock_nested (&stats->pending.lock,1 );__skb_queue_tail (&stats->pending, skb);if (!--stats->link_map_cache[tx_priv->link_id]) wakeup_stats = true; -spin_unlock_bh (&stats->pending.lock); +spin_unlock (&stats->pending.lock); }spin_unlock_bh (&queue->queue.lock);if (wakeup_stats)
@@ -259,10 +259,10 @@ int wfx_pending_requeue(struct wfx_dev *wdev, struct sk_buff *skb)spin_lock_bh (&queue->queue.lock); ++queue->link_map_cache[tx_priv->link_id]; -spin_lock_bh (&stats->pending.lock); +spin_lock_nested (&stats->pending.lock,1 ); ++stats->link_map_cache[tx_priv->link_id];__skb_unlink (skb, &stats->pending); -spin_unlock_bh (&stats->pending.lock); +spin_unlock (&stats->pending.lock);__skb_queue_tail (&queue->queue, skb);spin_unlock_bh (&queue->queue.lock);return 0 ;
drivers/staging/wlan-ng/hfa384x_usb.c +2 -0
@@ -3372,6 +3372,8 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev, WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN)) {pr_debug ("overlen frm: len=%zd\n" , skblen -sizeof (struct p80211_caphdr )); + +return ; } skb =dev_alloc_skb (skblen);
drivers/staging/wlan-ng/prism2usb.c +1 -0
@@ -180,6 +180,7 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)cancel_work_sync (&hw->link_bh);cancel_work_sync (&hw->commsqual_bh); +cancel_work_sync (&hw->usb_work);/* Now we complete any outstanding commands * and tell everyone who is waiting for their
drivers/usb/class/cdc-acm.c +9 -9
@@ -923,16 +923,16 @@ static int set_serial_info(struct tty_struct *tty, struct serial_struct *ss)mutex_lock (&acm->port.mutex); -if ((ss->close_delay != old_close_delay) || - (ss->closing_wait != old_closing_wait)) { -if (!capable (CAP_SYS_ADMIN )) +if (!capable (CAP_SYS_ADMIN )) { +if ((ss->close_delay != old_close_delay) || + (ss->closing_wait != old_closing_wait)) retval = -EPERM ; -else { - acm->port.close_delay = close_delay; - acm->port.closing_wait = closing_wait; - } - }else - retval = -EOPNOTSUPP ; +else + retval = -EOPNOTSUPP ; + }else { + acm->port.close_delay = close_delay; + acm->port.closing_wait = closing_wait; + }mutex_unlock (&acm->port.mutex);return retval;
drivers/usb/musb/musb_host.c +5 -12
@@ -1436,10 +1436,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)* We need to map sg if the transfer_buffer is * NULL. */ -if (!urb->transfer_buffer) - qh->use_sg = true; - -if (qh->use_sg) { +if (!urb->transfer_buffer) {/* sg_miter_start is already done in musb_ep_program */ if (!sg_miter_next (&qh->sg_miter)) {dev_err (musb->controller,"error: sg list empty\n" );
@@ -1447,9 +1444,8 @@ void musb_host_tx(struct musb *musb, u8 epnum) status = -EINVAL ; goto done; } - urb->transfer_buffer = qh->sg_miter.addr; length =min_t (u32, length, qh->sg_miter.length); -musb_write_fifo (hw_ep, length, urb->transfer_buffer); +musb_write_fifo (hw_ep, length, qh->sg_miter.addr); qh->sg_miter.consumed = length;sg_miter_stop (&qh->sg_miter); }else {
@@ -1458,11 +1454,6 @@ void musb_host_tx(struct musb *musb, u8 epnum) qh->segsize = length; -if (qh->use_sg) { -if (offset + length >= urb->transfer_buffer_length) - qh->use_sg = false; - } -musb_ep_select (mbase, epnum);musb_writew (epio,MUSB_TXCSR ,MUSB_TXCSR_H_WZC_BITS |MUSB_TXCSR_TXPKTRDY );
@@ -1977,8 +1968,10 @@ void musb_host_rx(struct musb *musb, u8 epnum) urb->actual_length += xfer_len; qh->offset += xfer_len;if (done) { -if (qh->use_sg) +if (qh->use_sg) { qh->use_sg = false; + urb->transfer_buffer =NULL ; + }if (urb->status == -EINPROGRESS ) urb->status = status;
drivers/usb/serial/io_edgeport.c +1 -1
@@ -710,7 +710,7 @@ static void edge_interrupt_callback(struct urb *urb)/* grab the txcredits for the ports if available */ position =2 ; portNumber =0 ; -while ((position < length) && +while ((position < length -1 ) && (portNumber < edge_serial->serial->num_ports)) { txCredits = data[position] | (data[position+1 ] <<8 );if (txCredits) {
drivers/usb/serial/option.c +6 -0
@@ -1992,8 +1992,14 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */ + { USB_DEVICE_INTERFACE_CLASS(0x1435, 0xd191, 0xff), /* Wistron Neweb D19Q1 */ + .driver_info = RSVD(1) | RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(0x1690, 0x7588, 0xff), /* ASKEY WWHC050 */ + .driver_info = RSVD(1) | RSVD(4) }, { USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2031, 0xff), /* Olicard 600 */ .driver_info = RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2033, 0xff), /* BroadMobi BM806U */ + .driver_info = RSVD(4) }, { USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2060, 0xff), /* BroadMobi BM818 */ .driver_info = RSVD(4) }, { USB_DEVICE_INTERFACE_CLASS(0x2020, 0x4000, 0xff) }, /* OLICARD300 - MT6225 */
fs/libfs.c +5 -3
@@ -891,7 +891,7 @@ int simple_attr_open(struct inode *inode, struct file *file, {struct simple_attr *attr; - attr =kmalloc (sizeof (*attr),GFP_KERNEL ); + attr =kzalloc (sizeof (*attr),GFP_KERNEL );if (!attr)return -ENOMEM ;
@@ -931,9 +931,11 @@ ssize_t simple_attr_read(struct file *file, char __user *buf,if (ret)return ret; -if (*ppos) {/* continued read */ +if (*ppos && attr->get_buf[0 ]) { +/* continued read */ size =strlen (attr->get_buf); - }else {/* first read */ + }else { +/* first read */ u64 val; ret = attr->get (attr->data, &val);if (ret)
kernel/bpf/verifier.c +0 -19
@@ -1034,17 +1034,6 @@ static void __reg_bound_offset(struct bpf_reg_state *reg) reg->umax_value)); } -static void __reg_bound_offset32 (struct bpf_reg_state *reg) -{ -u64 mask =0xffffFFFF ; -struct tnum range =tnum_range (reg->umin_value & mask, - reg->umax_value & mask); -struct tnum lo32 =tnum_cast (reg->var_off,4 ); -struct tnum hi32 =tnum_lshift (tnum_rshift (reg->var_off,32 ),32 ); - - reg->var_off =tnum_or (hi32,tnum_intersect (lo32, range)); -} -/* Reset the min/max bounds of a register */ static void __mark_reg_unbounded (struct bpf_reg_state *reg) {
@@ -5717,10 +5706,6 @@ static void reg_set_min_max(struct bpf_reg_state *true_reg,/* We might have learned some bits from the bounds. */ __reg_bound_offset (false_reg);__reg_bound_offset (true_reg); -if (is_jmp32) { -__reg_bound_offset32 (false_reg); -__reg_bound_offset32 (true_reg); - }/* Intersecting with the old var_off might have improved our bounds * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), * then new var_off is (0; 0x7f...fc) which improves our umax.
@@ -5830,10 +5815,6 @@ static void reg_set_min_max_inv(struct bpf_reg_state *true_reg,/* We might have learned some bits from the bounds. */ __reg_bound_offset (false_reg);__reg_bound_offset (true_reg); -if (is_jmp32) { -__reg_bound_offset32 (false_reg); -__reg_bound_offset32 (true_reg); - }/* Intersecting with the old var_off might have improved our bounds * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), * then new var_off is (0; 0x7f...fc) which improves our umax.