4.9.187-stable review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 158/223 nfsd: Fix overflow causing non-working mounts on 1 TB machines
In reply to Greg Kroah-Hartman[ Upstream commit 3b2d4dcf71c4a91b420f835e52ddea8192300a3b ]
Since commit 10a68cdf10 (nfsd: fix performance-limiting session calculation) (Linux 5.1-rc1 and 4.19.31), shares from NFS servers with 1 TB of memory cannot be mounted anymore. The mount just hangs on the client.
The gist of commit 10a68cdf10 is the change below.
-avail = clamp_t(int, avail, slotsize, avail/3);
+avail = clamp_t(int, avail, slotsize, total_avail/3);Here are the macros.
#define min_t(type, x, y) __careful_cmp((type)(x), (type)(y), <)
#define clamp_t(type, val, lo, hi) min_t(type, max_t(type, val, lo), hi)total_avail is 8,434,659,328 on the 1 TB machine. clamp_t() casts the values to int, which for 32-bit integers can only hold values −2,147,483,648 (−2^31) through 2,147,483,647 (2^31 − 1).
avail (in the function signature) is just 65536, so that no overflow was happening. Before the commit the assignment would result in 21845, and num = 4.
When using total_avail, it is causing the assignment to be 18446744072226137429 (printed as %lu), and num is then 4164608182.
My next guess is, that nfsd_drc_mem_used is then exceeded, and the server thinks there is no memory available any more for this client.
Updating the arguments of clamp_t() and min_t() to unsigned long fixes the issue.
Now, avail = 65536 (before commit 10a68cdf10 avail = 21845), but num = 4 remains the same.
--- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4state.c +1 -1
@@ -1511,7 +1511,7 @@ static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca)* Never use more than a third of the remaining memory, * unless it's the only way to give this client a slot: */ - avail =clamp_t (int, avail, slotsize, total_avail/3 ); + avail = clamp_t(unsigned long, avail, slotsize, total_avail/3); num =min_t (int, num, avail / slotsize); nfsd_drc_mem_used += num * slotsize;spin_unlock (&nfsd_drc_lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/223 drm/panel: simple: Fix panel_simple_dsi_probe
In reply to Greg Kroah-Hartman[ Upstream commit 7ad9db66fafb0f0ad53fd2a66217105da5ddeffe ]
In case mipi_dsi_attach() fails remove the registered panel to avoid added panel without corresponding device.
--- drivers/gpu/drm/panel/panel-simple.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-simple.c +8 -1
@@ -1944,7 +1944,14 @@ static int panel_simple_dsi_probe(struct mipi_dsi_device *dsi) dsi->format = desc->format; dsi->lanes = desc->lanes; -return mipi_dsi_attach (dsi); + err =mipi_dsi_attach (dsi); +if (err) { +struct panel_simple *panel =dev_get_drvdata (&dsi->dev); + +drm_panel_remove (&panel->base); + } + +return err; }static int panel_simple_dsi_remove (struct mipi_dsi_device *dsi)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 160/223 usb: core: hub: Disable hub-initiated U1/U2
In reply to Greg Kroah-Hartman[ Upstream commit 561759292774707b71ee61aecc07724905bb7ef1 ]
If the device rejects the control transfer to enable device-initiated U1/U2 entry, then the device will not initiate U1/U2 transition. To improve the performance, the downstream port should not initate transition to U1/U2 to avoid the delay from the device link command response (no packet can be transmitted while waiting for a response from the device). If the device has some quirks and does not implement U1/U2, it may reject all the link state change requests, and the downstream port may resend and flood the bus with more requests. This will affect the device performance even further. This patch disables the hub-initated U1/U2 if the device-initiated U1/U2 entry fails.
Reference: USB 3.2 spec 7.2.4.2.3
--- drivers/usb/core/hub.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/usb/core/hub.c +16 -12
@@ -3879,6 +3879,9 @@ static int usb_set_lpm_timeout(struct usb_device *udev,* control transfers to set the hub timeout or enable device-initiated U1/U2 * will be successful. * +* If the control transfer to enable device-initiated U1/U2 entry fails, then +* hub-initiated U1/U2 will be disabled. +* * If we cannot set the parent hub U1/U2 timeout, we attempt to let the xHCI * driver know about it. If that call fails, it should be harmless, and just * take up more slightly more bus bandwidth for unnecessary U1/U2 exit latency.
@@ -3933,23 +3936,24 @@ static void usb_enable_link_state(struct usb_hcd *hcd, struct usb_device *udev,* host know that this link state won't be enabled. */ hcd->driver->disable_usb3_lpm_timeout (hcd, udev, state); - }else { -/* Only a configured device will accept the Set Feature -* U1/U2_ENABLE -*/ -if (udev->actconfig) -usb_set_device_initiated_lpm (udev, state, true); +return ; + } -/* As soon as usb_set_lpm_timeout(timeout) returns 0, the -* hub-initiated LPM is enabled. Thus, LPM is enabled no -* matter the result of usb_set_device_initiated_lpm(). -* The only difference is whether device is able to initiate -* LPM. -*/ +/* Only a configured device will accept the Set Feature +* U1/U2_ENABLE +*/ +if (udev->actconfig && +usb_set_device_initiated_lpm (udev, state, true) ==0 ) {if (state ==USB3_LPM_U1 ) udev->usb3_lpm_u1_enabled =1 ;else if (state ==USB3_LPM_U2 ) udev->usb3_lpm_u2_enabled =1 ; + }else { +/* Don't request U1/U2 entry if the device +* cannot transition to U1/U2. +*/ +usb_set_lpm_timeout (udev, state,0 ); + hcd->driver->disable_usb3_lpm_timeout (hcd, udev, state); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/223 tty: max310x: Fix invalid baudrate divisors calculator
In reply to Greg Kroah-Hartman[ Upstream commit 35240ba26a932b279a513f66fa4cabfd7af55221 ]
Current calculator doesn't do it' job quite correct. First of all the max310x baud-rates generator supports the divisor being less than 16. In this case the x2/x4 modes can be used to double or quadruple the reference frequency. But the current baud-rate setter function just filters all these modes out by the first condition and setups these modes only if there is a clocks-baud division remainder. The former doesn't seem right at all, since enabling the x2/x4 modes causes the line noise tolerance reduction and should be only used as a last resort to enable a requested too high baud-rate.
Finally the fraction is supposed to be calculated from D = Fref/(c*baud) formulae, but not from D % 16, which causes the precision loss. So to speak the current baud-rate calculator code works well only if the baud perfectly fits to the uart reference input frequency.
Lets fix the calculator by implementing the algo fully compliant with the fractional baud-rate generator described in the datasheet:
D = Fref / (c*baud), where c={16,8,4} is the x1/x2/x4 rate mode respectively, Fref - reference input frequency. The divisor fraction is calculated from the same formulae, but making sure it is found with a resolution of 0.0625 (four bits).
--- drivers/tty/serial/max310x.c | 51 ++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 20 deletions(-)
drivers/tty/serial/max310x.c +31 -20
@@ -494,37 +494,48 @@ static bool max310x_reg_precious(struct device *dev, unsigned int reg)static int max310x_set_baud (struct uart_port *port,int baud) { -unsigned int mode =0 , clk = port->uartclk, div = clk / baud; +unsigned int mode =0 , div =0 , frac =0 , c =0 ,F =0 ; -/* Check for minimal value for divider */ -if (div <16 ) - div =16 ; - -if (clk % baud && (div /16 ) <0x8000 ) { +/* +* Calculate the integer divisor first. Select a proper mode +* in case if the requested baud is too high for the pre-defined +* clocks frequency. +*/ + div = port->uartclk / baud; +if (div <8 ) { +/* Mode x4 */ + c =4 ; + mode =MAX310X_BRGCFG_4XMODE_BIT ; + }else if (div <16 ) {/* Mode x2 */ + c =8 ; mode =MAX310X_BRGCFG_2XMODE_BIT ; - clk = port->uartclk *2 ; - div = clk / baud; - -if (clk % baud && (div /16 ) <0x8000 ) { -/* Mode x4 */ - mode =MAX310X_BRGCFG_4XMODE_BIT ; - clk = port->uartclk *4 ; - div = clk / baud; - } + }else { + c =16 ; } -max310x_port_write (port,MAX310X_BRGDIVMSB_REG , (div /16 ) >>8 ); -max310x_port_write (port,MAX310X_BRGDIVLSB_REG , div /16 ); -max310x_port_write (port,MAX310X_BRGCFG_REG , (div %16 ) | mode); +/* Calculate the divisor in accordance with the fraction coefficient */ + div /= c; +F = c*baud; + +/* Calculate the baud rate fraction */ +if (div >0 ) + frac = (16 *(port->uartclk %F )) /F ; +else + div =1 ; + +max310x_port_write (port,MAX310X_BRGDIVMSB_REG , div >>8 ); +max310x_port_write (port,MAX310X_BRGDIVLSB_REG , div); +max310x_port_write (port,MAX310X_BRGCFG_REG , frac | mode); -return DIV_ROUND_CLOSEST (clk, div); +/* Return the actual baud rate we just programmed */ +return (16 *port->uartclk) / (c*(16 *div + frac)); }static int max310x_update_best_err (unsigned long f,long *besterr) {/* Use baudrate 115200 for calculate error */ -long err = f % (115200 *16 ); +long err = f % (460800 *16 );if ((*besterr <0 ) || (*besterr > err)) { *besterr = err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/223 pinctrl: rockchip: fix leaked of_node references
In reply to Greg Kroah-Hartman[ Upstream commit 3c89c70634bb0b6f48512de873e7a45c7e1fbaa5 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/pinctrl/pinctrl-rockchip.c:3221:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 3196, but without a corresponding object release within this function. ./drivers/pinctrl/pinctrl-rockchip.c:3223:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 3196, but without a corresponding object release within this function.
--- drivers/pinctrl/pinctrl-rockchip.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/pinctrl-rockchip.c +1 -0
@@ -2208,6 +2208,7 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank, base, &rockchip_regmap_config); } +of_node_put (node); } bank->irq =irq_of_parse_and_map (bank->of_node,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 163/223 tty: serial: cpm_uart - fix init when SMC is relocated
In reply to Greg Kroah-Hartman[ Upstream commit 06aaa3d066db87e8478522d910285141d44b1e58 ]
SMC relocation can also be activated earlier by the bootloader, so the driver's behaviour cannot rely on selected kernel config.
When the SMC is relocated, CPM_CR_INIT_TRX cannot be used.
But the only thing CPM_CR_INIT_TRX does is to clear the rstate and tstate registers, so this can be done manually, even when SMC is not relocated.
--- drivers/tty/serial/cpm_uart/cpm_uart_core.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/tty/serial/cpm_uart/cpm_uart_core.c +11 -6
@@ -421,7 +421,16 @@ static int cpm_uart_startup(struct uart_port *port)clrbits16 (&pinfo->sccp->scc_sccm,UART_SCCM_RX ); }cpm_uart_initbd (pinfo); -cpm_line_cr_cmd (pinfo,CPM_CR_INIT_TRX ); +if (IS_SMC (pinfo)) { +out_be32 (&pinfo->smcup->smc_rstate,0 ); +out_be32 (&pinfo->smcup->smc_tstate,0 ); +out_be16 (&pinfo->smcup->smc_rbptr, +in_be16 (&pinfo->smcup->smc_rbase)); +out_be16 (&pinfo->smcup->smc_tbptr, +in_be16 (&pinfo->smcup->smc_tbase)); + }else { +cpm_line_cr_cmd (pinfo,CPM_CR_INIT_TRX ); + } }/* Install interrupt handler. */ retval =request_irq (port->irq, cpm_uart_int,0 ,"cpm_uart" , port);
@@ -875,16 +884,14 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo) (u8 __iomem *)pinfo->tx_bd_base - DPRAM_BASE);/* -* In case SMC1 is being relocated... +* In case SMC is being relocated... */ -#if defined (CONFIG_I2C_SPI_SMC1_UCODE_PATCH )out_be16 (&up->smc_rbptr,in_be16 (&pinfo->smcup->smc_rbase));out_be16 (&up->smc_tbptr,in_be16 (&pinfo->smcup->smc_tbase));out_be32 (&up->smc_rstate,0 );out_be32 (&up->smc_tstate,0 );out_be16 (&up->smc_brkcr,1 );/* number of break chars */ out_be16 (&up->smc_brkec,0 ); -#endif /* Set up the uart parameters in the * parameter ram.
@@ -898,8 +905,6 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo)out_be16 (&up->smc_brkec,0 );out_be16 (&up->smc_brkcr,1 ); -cpm_line_cr_cmd (pinfo,CPM_CR_INIT_TRX ); -/* Set UART mode, 8 bit, no parity, one stop. * Enable receive and transmit. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/223 drm/bridge: tc358767: read display_props in get_modes()
In reply to Greg Kroah-Hartman[ Upstream commit 3231573065ad4f4ecc5c9147b24f29f846dc0c2f ]
We need to know the link bandwidth to filter out modes we cannot support, so we need to have read the display props before doing the filtering.
To ensure we have up to date display props, call tc_get_display_props() in the beginning of tc_connector_get_modes().
--- drivers/gpu/drm/bridge/tc358767.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/bridge/tc358767.c +7 -0
@@ -1153,6 +1153,13 @@ static int tc_connector_get_modes(struct drm_connector *connector)struct tc_data *tc =connector_to_tc (connector);struct edid *edid;unsigned int count; +int ret; + + ret =tc_get_display_props (tc); +if (ret <0 ) { +dev_err (tc->dev,"failed to read display props: %d\n" , ret); +return 0 ; + }if (tc->panel && tc->panel->funcs && tc->panel->funcs->get_modes) { count = tc->panel->funcs->get_modes (tc->panel);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 165/223 drm/bridge: sii902x: pixel clock unit is 10kHz instead of 1kHz
In reply to Greg Kroah-Hartman[ Upstream commit 8dbfc5b65023b67397aca28e8adb25c819f6398c ]
The pixel clock unit in the first two registers (0x00 and 0x01) of sii9022 is 10kHz, not 1kHz as in struct drm_display_mode. Division by 10 fixes the issue.
--- drivers/gpu/drm/bridge/sii902x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/sii902x.c +3 -2
@@ -250,10 +250,11 @@ static void sii902x_bridge_mode_set(struct drm_bridge *bridge,struct regmap *regmap = sii902x->regmap;u8 buf[HDMI_INFOFRAME_SIZE (AVI )];struct hdmi_avi_infoframe frame; +u16 pixel_clock_10kHz = adj->clock /10 ;int ret; - buf[0 ] = adj->clock; - buf[1 ] = adj->clock >>8 ; + buf[0 ] = pixel_clock_10kHz &0xff ; + buf[1 ] = pixel_clock_10kHz >>8 ; buf[2 ] = adj->vrefresh; buf[3 ] =0x00 ; buf[4 ] = adj->hdisplay;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 166/223 memstick: Fix error cleanup path of memstick_init
In reply to Greg Kroah-Hartman[ Upstream commit 65f1a0d39c289bb6fc85635528cd36c4b07f560e ]
If bus_register fails. On its error handling path, it has cleaned up what it has done. There is no need to call bus_unregister again. Otherwise, if bus_unregister is called, issues such as null-ptr-deref will arise.
Syzkaller report this:
kobject_add_internal failed for memstick (error: -12 parent: bus)
BUG: KASAN: null-ptr-deref in sysfs_remove_file_ns+0x1b/0x40 fs/sysfs/file.c:467 Read of size 8 at addr 0000000000000078 by task syz-executor.0/4460 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xa9/0x10e lib/dump_stack.c:113 __kasan_report+0x171/0x18d mm/kasan/report.c:321 kasan_report+0xe/0x20 mm/kasan/common.c:614 sysfs_remove_file_ns+0x1b/0x40 fs/sysfs/file.c:467 sysfs_remove_file include/linux/sysfs.h:519 [inline] bus_remove_file+0x6c/0x90 drivers/base/bus.c:145 remove_probe_files drivers/base/bus.c:599 [inline] bus_unregister+0x6e/0x100 drivers/base/bus.c:916 ? 0xffffffffc1590000 memstick_init+0x7a/0x1000 [memstick] do_one_initcall+0xb9/0x3b5 init/main.c:914 do_init_module+0xe0/0x330 kernel/module.c:3468 load_module+0x38eb/0x4270 kernel/module.c:3819 __do_sys_finit_module+0x162/0x190 kernel/module.c:3909 do_syscall_64+0x72/0x2a0 arch/x86/entry/common.c:298 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/memstick/core/memstick.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/memstick/core/memstick.c +9 -4
@@ -629,13 +629,18 @@ static int __init memstick_init(void)return -ENOMEM ; rc =bus_register (&memstick_bus_type); -if (!rc) - rc =class_register (&memstick_host_class); +if (rc) + goto error_destroy_workqueue; -if (!rc) -return 0 ; + rc =class_register (&memstick_host_class); +if (rc) + goto error_bus_unregister; + +return 0 ; +error_bus_unregister:bus_unregister (&memstick_bus_type); +error_destroy_workqueue:destroy_workqueue (workqueue);return rc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 167/223 tty/serial: digicolor: Fix digicolor-usart already registered warning
In reply to Greg Kroah-Hartman[ Upstream commit c7ad9ba0611c53cfe194223db02e3bca015f0674 ]
When modprobe/rmmod/modprobe module, if platform_driver_register() fails, the kernel complained,
proc_dir_entry 'driver/digicolor-usart' already registered
WARNING: CPU: 1 PID: 5636 at fs/proc/generic.c:360 proc_register+0x19d/0x270
Fix this by adding uart_unregister_driver() when platform_driver_register() fails.
--- drivers/tty/serial/digicolor-usart.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/tty/serial/digicolor-usart.c +5 -1
@@ -545,7 +545,11 @@ static int __init digicolor_uart_init(void)if (ret)return ret; -return platform_driver_register (&digicolor_uart_platform); + ret =platform_driver_register (&digicolor_uart_platform); +if (ret) +uart_unregister_driver (&digicolor_uart); + +return ret; }module_init (digicolor_uart_init);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 168/223 tty: serial: msm_serial: avoid system lockup condition
In reply to Greg Kroah-Hartman[ Upstream commit ba3684f99f1b25d2a30b6956d02d339d7acb9799 ]
The function msm_wait_for_xmitr can be taken with interrupts disabled. In order to avoid a potential system lockup - demonstrated under stress testing conditions on SoC QCS404/5 - make sure we wait for a bounded amount of time.
Tested on SoC QCS404.
--- drivers/tty/serial/msm_serial.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/msm_serial.c +4 -0
@@ -391,10 +391,14 @@ static void msm_request_rx_dma(struct msm_port *msm_port, resource_size_t base)static inline void msm_wait_for_xmitr (struct uart_port *port) { +unsigned int timeout =500000 ; +while (!(msm_read (port,UART_SR ) &UART_SR_TX_EMPTY )) {if (msm_read (port,UART_ISR ) &UART_ISR_TX_READY )break ;udelay (1 ); +if (!timeout--) +break ; }msm_write (port,UART_CR_CMD_RESET_TX_READY ,UART_CR ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 169/223 serial: 8250: Fix TX interrupt handling condition
In reply to Greg Kroah-Hartman[ Upstream commit db1b5bc047b3cadaedab3826bba82c3d9e023c4b ]
Interrupt handler checked THRE bit (transmitter holding register empty) in LSR to detect if TX fifo is empty.
In case when there is only receive interrupts the TX handling got called because THRE bit in LSR is set when there is no transmission (FIFO empty). TX handling caused TX stop, which in RS-485 half-duplex mode actually resets receiver FIFO. This is not desired during reception because of possible data loss.
The fix is to check if THRI is set in IER in addition of the TX fifo status. THRI in IER is set when TX is started and cleared when TX is stopped.
This ensures that TX handling is only called when there is really transmission on going and an interrupt for THRE and not when there are only RX interrupts.
--- drivers/tty/serial/8250/8250_port.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/8250_port.c +2 -1
@@ -1819,7 +1819,8 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) status =serial8250_rx_chars (up, status); }serial8250_modem_status (up); -if ((!up->dma || up->dma->tx_err) && (status &UART_LSR_THRE )) +if ((!up->dma || up->dma->tx_err) && (status &UART_LSR_THRE ) && + (up->ier &UART_IER_THRI ))serial8250_tx_chars (up);spin_unlock_irqrestore (&port->lock, flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 170/223 drm/virtio: Add memory barriers for capset cache.
In reply to Greg Kroah-Hartman[ Upstream commit 9ff3a5c88e1f1ab17a31402b96d45abe14aab9d7 ]
After data is copied to the cache entry, atomic_set is used indicate that the data is the entry is valid without appropriate memory barriers. Similarly the read side was missing the corresponding memory barriers.
--- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 3 +++ drivers/gpu/drm/virtio/virtgpu_vq.c | 2 ++ 2 files changed, 5 insertions(+)
drivers/gpu/drm/virtio/virtgpu_ioctl.c +3 -0
@@ -521,6 +521,9 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev, ret =wait_event_timeout (vgdev->resp_wq,atomic_read (&cache_ent->is_valid),5 *HZ ); +/* is_valid check must proceed before copy of the cache entry. */ +smp_rmb (); + ptr = cache_ent->caps_cache; copy_exit:
drivers/gpu/drm/virtio/virtgpu_vq.c +2 -0
@@ -618,6 +618,8 @@ static void virtio_gpu_cmd_capset_cb(struct virtio_gpu_device *vgdev, cache_ent->id == le32_to_cpu(cmd->capset_id)) {memcpy (cache_ent->caps_cache, resp->capset_data, cache_ent->size); +/* Copy must occur before is_valid is signalled. */ +smp_wmb ();atomic_set (&cache_ent->is_valid,1 );break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 171/223 phy: renesas: rcar-gen2: Fix memory leak at error paths
In reply to Greg Kroah-Hartman[ Upstream commit d4a36e82924d3305a17ac987a510f3902df5a4b2 ]
This patch fixes memory leak at error paths of the probe function. In for_each_child_of_node, if the loop returns, the driver should call of_put_node() before returns.
--- drivers/phy/phy-rcar-gen2.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/phy/phy-rcar-gen2.c +2 -0
@@ -288,6 +288,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) error =of_property_read_u32 (np,"reg" , &channel_num);if (error || channel_num >2 ) {dev_err (dev,"Invalid \"reg\" property\n" ); +of_node_put (np);return error; } channel->select_mask = select_mask[channel_num];
@@ -303,6 +304,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) &rcar_gen2_phy_ops);if (IS_ERR (phy->phy)) {dev_err (dev,"Failed to create PHY\n" ); +of_node_put (np);return PTR_ERR (phy->phy); }phy_set_drvdata (phy->phy, phy);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 172/223 drm/rockchip: Properly adjust to a true clock in adjusted_mode
In reply to Greg Kroah-Hartman[ Upstream commit 99b9683f2142b20bad78e61f7f829e8714e45685 ]
When fixing up the clock in vop_crtc_mode_fixup() we're not doing it quite correctly. Specifically if we've got the true clock 266666667 Hz, we'll perform this calculation:
266666667 / 1000 => 266666
Later when we try to set the clock we'll do clk_set_rate(266666 * 1000). The common clock framework won't actually pick the proper clock in this case since it always wants clocks <= the specified one.
Let's solve this by using DIV_ROUND_UP.
--- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +2 -1
@@ -865,7 +865,8 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,struct vop *vop =to_vop (crtc); adjusted_mode->clock = -clk_round_rate (vop->dclk, mode->clock *1000 ) /1000 ; +DIV_ROUND_UP (clk_round_rate (vop->dclk, mode->clock *1000 ), +1000 );return true; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 173/223 tty: serial_core: Set port active bit in uart_port_activate
In reply to Greg Kroah-Hartman[ Upstream commit 13b18d35909707571af9539f7731389fbf0feb31 ]
A bug was introduced by commit b3b576461864 ("tty: serial_core: convert uart_open to use tty_port_open"). It caused a constant warning printed into the system log regarding the tty and port counter mismatch:
[ 21.644197] ttyS ttySx: tty_port_close_start: tty->count = 1 port count = 2
in case if session hangup was detected so the warning is printed starting from the second open-close iteration.
Particularly the problem was discovered in situation when there is a serial tty device without hardware back-end being setup. It is considered by the tty-serial subsystems as a hardware problem with session hang up. In this case uart_startup() will return a positive value with TTY_IO_ERROR flag set in corresponding tty_struct instance. The same value will get passed to be returned from the activate() callback and then being returned from tty_port_open(). But since in this case tty_port_block_til_ready() isn't called the TTY_PORT_ACTIVE flag isn't set (while the method had been called before tty_port_open conversion was introduced and the rest of the subsystem code expected the bit being set in this case), which prevents the uart_hangup() method to perform any cleanups including the tty port counter setting to zero. So the next attempt to open/close the tty device will discover the counters mismatch.
In order to fix the problem we need to manually set the TTY_PORT_ACTIVE flag in case if uart_startup() returned a positive value. In this case the hang up procedure will perform a full set of cleanup actions including the port ref-counter resetting.
--- drivers/tty/serial/serial_core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/tty/serial/serial_core.c +6 -1
@@ -1725,6 +1725,7 @@ static int uart_port_activate(struct tty_port *port, struct tty_struct *tty) { struct uart_state *state = container_of(port, struct uart_state, port);struct uart_port *uport; +int ret; uport =uart_port_check (state);if (!uport || uport->flags &UPF_DEAD )
@@ -1735,7 +1736,11 @@ static int uart_port_activate(struct tty_port *port, struct tty_struct *tty)/* * Start up the serial port. */ -return uart_startup (tty, state,0 ); + ret =uart_startup (tty, state,0 ); +if (ret >0 ) +tty_port_set_active (port,1 ); + +return ret; }static const char *uart_type (struct uart_port *port)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 174/223 usb: gadget: Zero ffs_io_data
In reply to Greg Kroah-Hartman[ Upstream commit 508595515f4bcfe36246e4a565cf280937aeaade ]
In some cases the "Allocate & copy" block in ffs_epfile_io() is not executed. Consequently, in such a case ffs_alloc_buffer() is never called and struct ffs_io_data is not initialized properly. This in turn leads to problems when ffs_free_buffer() is called at the end of ffs_epfile_io().
This patch uses kzalloc() instead of kmalloc() in the aio case and memset() in non-aio case to properly initialize struct ffs_io_data.
--- drivers/usb/gadget/function/f_fs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/f_fs.c +4 -2
@@ -1101,11 +1101,12 @@ static ssize_t ffs_epfile_write_iter(struct kiocb *kiocb, struct iov_iter *from)ENTER ();if (!is_sync_kiocb (kiocb)) { - p =kmalloc (sizeof (io_data),GFP_KERNEL ); + p =kzalloc (sizeof (io_data),GFP_KERNEL );if (unlikely (!p))return -ENOMEM ; p->aio = true; }else { +memset (p,0 ,sizeof (*p)); p->aio = false; }
@@ -1137,11 +1138,12 @@ static ssize_t ffs_epfile_read_iter(struct kiocb *kiocb, struct iov_iter *to)ENTER ();if (!is_sync_kiocb (kiocb)) { - p =kmalloc (sizeof (io_data),GFP_KERNEL ); + p =kzalloc (sizeof (io_data),GFP_KERNEL );if (unlikely (!p))return -ENOMEM ; p->aio = true; }else { +memset (p,0 ,sizeof (*p)); p->aio = false; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 175/223 powerpc/pci/of: Fix OF flags parsing for 64bit BARs
In reply to Greg Kroah-Hartman[ Upstream commit df5be5be8735ef2ae80d5ae1f2453cd81a035c4b ]
When the firmware does PCI BAR resource allocation, it passes the assigned addresses and flags (prefetch/64bit/...) via the "reg" property of a PCI device device tree node so the kernel does not need to do resource allocation.
The flags are stored in resource::flags - the lower byte stores PCI_BASE_ADDRESS_SPACE/etc bits and the other bytes are IORESOURCE_IO/etc. Some flags from PCI_BASE_ADDRESS_xxx and IORESOURCE_xxx are duplicated, such as PCI_BASE_ADDRESS_MEM_PREFETCH/PCI_BASE_ADDRESS_MEM_TYPE_64/etc. When parsing the "reg" property, we copy the prefetch flag but we skip on PCI_BASE_ADDRESS_MEM_TYPE_64 which leaves the flags out of sync.
The missing IORESOURCE_MEM_64 flag comes into play under 2 conditions:
1. we remove PCI_PROBE_ONLY for pseries (by hacking pSeries_setup_arch() or by passing "/chosen/linux,pci-probe-only");
2. we request resource alignment (by passing pci=resource_alignment= via the kernel cmd line to request PAGE_SIZE alignment or defining ppc_md.pcibios_default_alignment which returns anything but 0). Note that the alignment requests are ignored if PCI_PROBE_ONLY is enabled.
With 1) and 2), the generic PCI code in the kernel unconditionally decides to:
- reassign the BARs in pci_specified_resource_alignment() (works fine)
- write new BARs to the device - this fails for 64bit BARs as the generic code looks at IORESOURCE_MEM_64 (not set) and writes only lower 32bits of the BAR and leaves the upper 32bit unmodified which breaks BAR mapping in the hypervisor.
This fixes the issue by copying the flag. This is useful if we want to enforce certain BAR alignment per platform as handling subpage sized BARs is proven to cause problems with hotplug (SLOF already aligns BARs to 64k).
--- arch/powerpc/kernel/pci_of_scan.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/kernel/pci_of_scan.c +2 -0
@@ -45,6 +45,8 @@ static unsigned int pci_parse_of_flags(u32 addr0, int bridge)if (addr0 &0x02000000 ) { flags =IORESOURCE_MEM |PCI_BASE_ADDRESS_SPACE_MEMORY ; flags |= (addr0 >>22 ) &PCI_BASE_ADDRESS_MEM_TYPE_64 ; +if (flags &PCI_BASE_ADDRESS_MEM_TYPE_64 ) + flags |=IORESOURCE_MEM_64 ; flags |= (addr0 >>28 ) &PCI_BASE_ADDRESS_MEM_TYPE_1M ;if (addr0 &0x40000000 ) flags |=IORESOURCE_PREFETCH
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 176/223 PCI: sysfs: Ignore lockdep for remove attribute
In reply to Greg Kroah-Hartman[ Upstream commit dc6b698a86fe40a50525433eb8e92a267847f6f9 ]
With CONFIG_PROVE_LOCKING=y, using sysfs to remove a bridge with a device below it causes a lockdep warning, e.g.,
# echo 1 > /sys/class/pci_bus/0000:00/device/0000:00:00.0/remove ============================================ WARNING: possible recursive locking detected ... pci_bus 0000:01: busn_res: [bus 01] is released
The remove recursively removes the subtree below the bridge. Each call uses a different lock so there's no deadlock, but the locks were all created with the same lockdep key so the lockdep checker can't tell them apart.
Mark the "remove" sysfs attribute with __ATTR_IGNORE_LOCKDEP() as it is safe to ignore the lockdep check between different "remove" kernfs instances.
There's discussion about a similar issue in USB at [1], which resulted in 356c05d58af0 ("sysfs: get rid of some lockdep false positives") and e9b526fe7048 ("i2c: suppress lockdep warning on delete_device"), which do basically the same thing for USB "remove" and i2c "delete_device" files.
[1] https://lore.kernel.org/r/[email protected]
--- drivers/pci/pci-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci-sysfs.c +1 -1
@@ -371,7 +371,7 @@ static ssize_t remove_store(struct device *dev, struct device_attribute *attr,pci_stop_and_remove_bus_device_locked (to_pci_dev (dev));return count; } -static struct device_attribute dev_remove_attr =__ATTR (remove, +static struct device_attribute dev_remove_attr =__ATTR_IGNORE_LOCKDEP (remove, (S_IWUSR |S_IWGRP ),NULL , remove_store);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 177/223 kbuild: Add -Werror=unknown-warning-option to CLANG_FLAGS
In reply to Greg Kroah-Hartman[ Upstream commit 589834b3a0097a4908f4112eac0ca2feb486fa32 ]
In commit ebcc5928c5d9 ("arm64: Silence gcc warnings about arch ABI drift"), the arm64 Makefile added -Wno-psabi to KBUILD_CFLAGS, which is a GCC only option so clang rightfully complains:
warning: unknown warning option '-Wno-psabi' [-Wunknown-warning-option]
https://clang.llvm.org/docs/DiagnosticsReference.html#wunknown-warning-option
However, by default, this is merely a warning so the build happily goes on with a slew of these warnings in the process.
Commit c3f0d0bc5b01 ("kbuild, LLVMLinux: Add -Werror to cc-option to support clang") worked around this behavior in cc-option by adding -Werror so that unknown flags cause an error. However, this all happens silently and when an unknown flag is added to the build unconditionally like -Wno-psabi, cc-option will always fail because there is always an unknown flag in the list of flags. This manifested as link time failures in the arm64 libstub because -fno-stack-protector didn't get added to KBUILD_CFLAGS.
To avoid these weird cryptic failures in the future, make clang behave like gcc and immediately error when it encounters an unknown flag by adding -Werror=unknown-warning-option to CLANG_FLAGS. This can be added unconditionally for clang because it is supported by at least 3.0.0, according to godbolt [1] and 4.0.0, according to its documentation [2], which is far earlier than we typically support.
[1]: https://godbolt.org/z/7F7rm3
[2]: https://releases.llvm.org/4.0.0/tools/clang/docs/DiagnosticsReference.html#wunknown-warning-option
--- Makefile | 1 + 1 file changed, 1 insertion(+)
Makefile +1 -0
@@ -515,6 +515,7 @@ ifneq ($(GCC_TOOLCHAIN),) CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN) endif CLANG_FLAGS += -no-integrated-as +CLANG_FLAGS += -Werror=unknown-warning-option KBUILD_CFLAGS += $(CLANG_FLAGS) KBUILD_AFLAGS += $(CLANG_FLAGS) endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 178/223 PCI: xilinx-nwl: Fix Multi MSI data programming
In reply to Greg Kroah-Hartman[ Upstream commit 181fa434d0514e40ebf6e9721f2b72700287b6e2 ]
According to the PCI Local Bus specification Revision 3.0, section 6.8.1.3 (Message Control for MSI), endpoints that are Multiple Message Capable as defined by bits [3:1] in the Message Control for MSI can request a number of vectors that is power of two aligned.
As specified in section 6.8.1.6 "Message data for MSI", the Multiple Message Enable field (bits [6:4] of the Message Control register) defines the number of low order message data bits the function is permitted to modify to generate its system software allocated vectors.
The MSI controller in the Xilinx NWL PCIe controller supports a number of MSI vectors specified through a bitmap and the hwirq number for an MSI, that is the value written in the MSI data TLP is determined by the bitmap allocation.
For instance, in a situation where two endpoints sitting on the PCI bus request the following MSI configuration, with the current PCI Xilinx bitmap allocation code (that does not align MSI vector allocation on a power of two boundary):
Endpoint #1: Requesting 1 MSI vector - allocated bitmap bits 0 Endpoint #2: Requesting 2 MSI vectors - allocated bitmap bits [1,2]
The bitmap value(s) corresponds to the hwirq number that is programmed into the Message Data for MSI field in the endpoint MSI capability and is detected by the root complex to fire the corresponding MSI irqs. The value written in Message Data for MSI field corresponds to the first bit allocated in the bitmap for Multi MSI vectors.
The current Xilinx NWL MSI allocation code allows a bitmap allocation that is not a power of two boundaries, so endpoint #2, is allowed to toggle Message Data bit[0] to differentiate between its two vectors (meaning that the MSI data will be respectively 0x0 and 0x1 for the two vectors allocated to endpoint #2).
This clearly aliases with the Endpoint #1 vector allocation, resulting in a broken Multi MSI implementation.
Update the code to allocate MSI bitmap ranges with a power of two alignment, fixing the bug.
--- drivers/pci/host/pcie-xilinx-nwl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/pci/host/pcie-xilinx-nwl.c +5 -6
@@ -456,15 +456,13 @@ static int nwl_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,int i;mutex_lock (&msi->lock); - bit =bitmap_find_next_zero_area (msi->bitmap,INT_PCI_MSI_NR ,0 , - nr_irqs,0 ); -if (bit >=INT_PCI_MSI_NR ) { + bit =bitmap_find_free_region (msi->bitmap,INT_PCI_MSI_NR , +get_count_order (nr_irqs)); +if (bit <0 ) {mutex_unlock (&msi->lock);return -ENOSPC ; } -bitmap_set (msi->bitmap, bit, nr_irqs); -for (i =0 ; i < nr_irqs; i++) { irq_domain_set_info(domain, virq + i, bit + i, &nwl_irq_chip, domain->host_data, handle_simple_irq,
@@ -482,7 +480,8 @@ static void nwl_irq_domain_free(struct irq_domain *domain, unsigned int virq,struct nwl_msi *msi = &pcie->msi;mutex_lock (&msi->lock); -bitmap_clear (msi->bitmap, data->hwirq, nr_irqs); +bitmap_release_region (msi->bitmap, data->hwirq, +get_count_order (nr_irqs));mutex_unlock (&msi->lock); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 179/223 iio: iio-utils: Fix possible incorrect mask calculation
In reply to Greg Kroah-Hartman[ Upstream commit 208a68c8393d6041a90862992222f3d7943d44d6 ]
On some machines, iio-sensor-proxy was returning all 0's for IIO sensor values. It turns out that the bits_used for this sensor is 32, which makes the mask calculation:
*mask = (1 << 32) - 1;
If the compiler interprets the 1 literals as 32-bit ints, it generates undefined behavior depending on compiler version and optimization level. On my system, it optimizes out the shift, so the mask value becomes
*mask = (1) - 1;
With a mask value of 0, iio-sensor-proxy will always return 0 for every axis.
Avoid incorrect 0 values caused by compiler optimization.
See original fix by Brett Dutro <[email protected]> in iio-sensor-proxy:
https://github.com/hadess/iio-sensor-proxy/commit/9615ceac7c134d838660e209726cd86aa2064fd3
--- tools/iio/iio_utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/iio/iio_utils.c +2 -2
@@ -159,9 +159,9 @@ int iioutils_get_type(unsigned *is_signed, unsigned *bytes, unsigned *bits_used, *be = (endianchar =='b' ); *bytes = padint /8 ;if (*bits_used ==64 ) - *mask = ~0 ; + *mask = ~(0ULL );else - *mask = (1ULL << *bits_used) -1 ; + *mask = (1ULL << *bits_used) -1ULL ; *is_signed = (signchar =='s' );if (fclose (sysfsfp)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 180/223 recordmcount: Fix spurious mcount entries on powerpc
In reply to Greg Kroah-Hartman[ Upstream commit 80e5302e4bc85a6b685b7668c36c6487b5f90e9a ]
An impending change to enable HAVE_C_RECORDMCOUNT on powerpc leads to warnings such as the following:
# modprobe kprobe_example ftrace-powerpc: Not expected bl: opcode is 3c4c0001 WARNING: CPU: 0 PID: 227 at kernel/trace/ftrace.c:2001 ftrace_bug+0x90/0x318 Modules linked in: CPU: 0 PID: 227 Comm: modprobe Not tainted 5.2.0-rc6-00678-g1c329100b942 #2 NIP: c000000000264318 LR: c00000000025d694 CTR: c000000000f5cd30 REGS: c000000001f2b7b0 TRAP: 0700 Not tainted (5.2.0-rc6-00678-g1c329100b942) MSR: 900000010282b033 <SF,HV,VEC,VSX,EE,FP,ME,IR,DR,RI,LE,TM[E]> CR: 28228222 XER: 00000000 CFAR: c0000000002642fc IRQMASK: 0 <snip> NIP [c000000000264318] ftrace_bug+0x90/0x318 LR [c00000000025d694] ftrace_process_locs+0x4f4/0x5e0 Call Trace: [c000000001f2ba40] [0000000000000004] 0x4 (unreliable) [c000000001f2bad0] [c00000000025d694] ftrace_process_locs+0x4f4/0x5e0 [c000000001f2bb90] [c00000000020ff10] load_module+0x25b0/0x30c0 [c000000001f2bd00] [c000000000210cb0] sys_finit_module+0xc0/0x130 [c000000001f2be20] [c00000000000bda4] system_call+0x5c/0x70 Instruction dump: 419e0018 2f83ffff 419e00bc 2f83ffea 409e00cc 4800001c 0fe00000 3c62ff96 39000001 39400000 386386d0 480000c4 <0fe00000> 3ce20003 39000001 3c62ff96 ---[ end trace 4c438d5cebf78381 ]--- ftrace failed to modify [<c0080000012a0008>] 0xc0080000012a0008 actual: 01:00:4c:3c Initializing ftrace call sites ftrace record flags: 2000000 (0) expected tramp: c00000000006af4c
Looking at the relocation records in __mcount_loc shows a few spurious entries:
RELOCATION RECORDS FOR [__mcount_loc]:
OFFSET TYPE VALUE 0000000000000000 R_PPC64_ADDR64 .text.unlikely+0x0000000000000008 0000000000000008 R_PPC64_ADDR64 .text.unlikely+0x0000000000000014 0000000000000010 R_PPC64_ADDR64 .text.unlikely+0x0000000000000060 0000000000000018 R_PPC64_ADDR64 .text.unlikely+0x00000000000000b4 0000000000000020 R_PPC64_ADDR64 .init.text+0x0000000000000008 0000000000000028 R_PPC64_ADDR64 .init.text+0x0000000000000014
The first entry in each section is incorrect. Looking at the relocation records, the spurious entries correspond to the R_PPC64_ENTRY records:
RELOCATION RECORDS FOR [.text.unlikely]:
OFFSET TYPE VALUE 0000000000000000 R_PPC64_REL64 .TOC.-0x0000000000000008 0000000000000008 R_PPC64_ENTRY *ABS* 0000000000000014 R_PPC64_REL24 _mcount
<snip>
The problem is that we are not validating the return value from get_mcountsym() in sift_rel_mcount(). With this entry, mcountsym is 0, but Elf_r_sym(relp) also ends up being 0. Fix this by ensuring mcountsym is valid before processing the entry.
--- scripts/recordmcount.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/recordmcount.h +2 -1
@@ -326,7 +326,8 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,if (!mcountsym) mcountsym =get_mcountsym (sym0, relp, str0); -if (mcountsym ==Elf_r_sym (relp) && !is_fake_mcount (relp)) { +if (mcountsym && mcountsym ==Elf_r_sym (relp) && + !is_fake_mcount (relp)) {uint_t const addend =_w (_w (relp->r_offset) - recval + mcount_adjust); mrelp->r_offset = _w(offbase
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 181/223 mfd: core: Set fwnode for created devices
In reply to Greg Kroah-Hartman[ Upstream commit c176c6d7e932662668bcaec2d763657096589d85 ]
The logic for setting the of_node on devices created by mfd did not set the fwnode pointer to match, which caused fwnode-based APIs to malfunction on these devices since the fwnode pointer was null. Fix this.
--- drivers/mfd/mfd-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/mfd-core.c +1 -0
@@ -179,6 +179,7 @@ static int mfd_add_device(struct device *parent, int id,for_each_child_of_node (parent->of_node, np) {if (of_device_is_compatible (np, cell->of_compatible)) { pdev->dev.of_node = np; + pdev->dev.fwnode = &np->fwnode;break ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 182/223 mfd: arizona: Fix undefined behavior
In reply to Greg Kroah-Hartman[ Upstream commit 5da6cbcd2f395981aa9bfc571ace99f1c786c985 ]
When the driver is used with a subdevice that is disabled in the kernel configuration, clang gets a little confused about the control flow and fails to notice that n_subdevs is only uninitialized when subdevs is NULL, and we check for that, leading to a false-positive warning:
drivers/mfd/arizona-core.c:1423:19: error: variable 'n_subdevs' is uninitialized when used here
[-Werror,-Wuninitialized]
subdevs, n_subdevs, NULL, 0, NULL);
^~~~~~~~~
drivers/mfd/arizona-core.c:999:15: note: initialize the variable 'n_subdevs' to silence this warning
int n_subdevs, ret, i;
^
= 0Ideally, we would rearrange the code to avoid all those early initializations and have an explicit exit in each disabled case, but it's much easier to chicken out and add one more initialization here to shut up the warning.
--- drivers/mfd/arizona-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/arizona-core.c +1 -1
@@ -1038,7 +1038,7 @@ int arizona_dev_init(struct arizona *arizona)unsigned int reg, val, mask;int (*apply_patch)(struct arizona *) =NULL ;const struct mfd_cell *subdevs =NULL ; -int n_subdevs, ret, i; +int n_subdevs =0 , ret, i;dev_set_drvdata (arizona->dev, arizona);mutex_init (&arizona->clk_lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 183/223 mfd: hi655x-pmic: Fix missing return value check for devm_regmap_init_mmio_clk
In reply to Greg Kroah-Hartman[ Upstream commit 7efd105c27fd2323789b41b64763a0e33ed79c08 ]
Since devm_regmap_init_mmio_clk can fail, add return value checking.
--- drivers/mfd/hi655x-pmic.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mfd/hi655x-pmic.c +2 -0
@@ -111,6 +111,8 @@ static int hi655x_pmic_probe(struct platform_device *pdev) pmic->regmap =devm_regmap_init_mmio_clk (dev,NULL , base, &hi655x_regmap_config); +if (IS_ERR (pmic->regmap)) +return PTR_ERR (pmic->regmap);regmap_read (pmic->regmap,HI655X_BUS_ADDR (HI655X_VER_REG ), &pmic->ver);if ((pmic->ver <PMU_VER_START ) || (pmic->ver >PMU_VER_END )) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 184/223 um: Silence lockdep complaint about mmap_sem
In reply to Greg Kroah-Hartman[ Upstream commit 80bf6ceaf9310b3f61934c69b382d4912deee049 ]
When we get into activate_mm(), lockdep complains that we're doing something strange:
WARNING: possible circular locking dependency detected
5.1.0-10252-gb00152307319-dirty #121 Not tainted
------------------------------------------------------
inside.sh/366 is trying to acquire lock:
(____ptrval____) (&(&p->alloc_lock)->rlock){+.+.}, at: flush_old_exec+0x703/0x8d7
but task is already holding lock:
(____ptrval____) (&mm->mmap_sem){++++}, at: flush_old_exec+0x6c5/0x8d7
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&mm->mmap_sem){++++}:
[...]
__lock_acquire+0x12ab/0x139f
lock_acquire+0x155/0x18e
down_write+0x3f/0x98
flush_old_exec+0x748/0x8d7
load_elf_binary+0x2ca/0xddb
[...]
-> #0 (&(&p->alloc_lock)->rlock){+.+.}:
[...]
__lock_acquire+0x12ab/0x139f
lock_acquire+0x155/0x18e
_raw_spin_lock+0x30/0x83
flush_old_exec+0x703/0x8d7
load_elf_binary+0x2ca/0xddb
[...]
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&mm->mmap_sem);
lock(&(&p->alloc_lock)->rlock);
lock(&mm->mmap_sem);
lock(&(&p->alloc_lock)->rlock);
*** DEADLOCK ***
2 locks held by inside.sh/366:
#0: (____ptrval____) (&sig->cred_guard_mutex){+.+.}, at: __do_execve_file+0x12d/0x869
#1: (____ptrval____) (&mm->mmap_sem){++++}, at: flush_old_exec+0x6c5/0x8d7
stack backtrace:
CPU: 0 PID: 366 Comm: inside.sh Not tainted 5.1.0-10252-gb00152307319-dirty #121
Stack:
[...]
Call Trace:
[<600420de>] show_stack+0x13b/0x155
[<6048906b>] dump_stack+0x2a/0x2c
[<6009ae64>] print_circular_bug+0x332/0x343
[<6009c5c6>] check_prev_add+0x669/0xdad
[<600a06b4>] __lock_acquire+0x12ab/0x139f
[<6009f3d0>] lock_acquire+0x155/0x18e
[<604a07e0>] _raw_spin_lock+0x30/0x83
[<60151e6a>] flush_old_exec+0x703/0x8d7
[<601a8eb8>] load_elf_binary+0x2ca/0xddb
[...]I think it's because in exec_mmap() we have
down_read(&old_mm->mmap_sem);
...
task_lock(tsk);
...
activate_mm(active_mm, mm);
(which does down_write(&mm->mmap_sem))I'm not really sure why lockdep throws in the whole knowledge about the task lock, but it seems that old_mm and mm shouldn't ever be the same (and it doesn't deadlock) so tell lockdep that they're different.
--- arch/um/include/asm/mmu_context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/include/asm/mmu_context.h +1 -1
@@ -56,7 +56,7 @@ static inline void activate_mm(struct mm_struct *old, struct mm_struct *new)* when the new ->mm is used for the first time. */ __switch_mm (&new->context.id); -down_write (&new->mmap_sem); +down_write_nested (&new->mmap_sem,1 );uml_setup_stubs (new);up_write (&new->mmap_sem); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 185/223 powerpc/4xx/uic: clear pending interrupt after irq type/pol change
In reply to Greg Kroah-Hartman[ Upstream commit 3ab3a0689e74e6aa5b41360bc18861040ddef5b1 ]
When testing out gpio-keys with a button, a spurious interrupt (and therefore a key press or release event) gets triggered as soon as the driver enables the irq line for the first time.
This patch clears any potential bogus generated interrupt that was caused by the switching of the associated irq's type and polarity.
--- arch/powerpc/sysdev/uic.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/sysdev/uic.c +1 -0
@@ -158,6 +158,7 @@ static int uic_set_irq_type(struct irq_data *d, unsigned int flow_type)mtdcr (uic->dcrbase +UIC_PR , pr);mtdcr (uic->dcrbase +UIC_TR , tr); +mtdcr (uic->dcrbase +UIC_SR , ~mask);raw_spin_unlock_irqrestore (&uic->lock, flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 186/223 RDMA/i40iw: Set queue pair state when being queried
In reply to Greg Kroah-Hartman[ Upstream commit 2e67e775845373905d2c2aecb9062c2c4352a535 ]
The API for ib_query_qp requires the driver to set qp_state and cur_qp_state on return, add the missing sets.
--- drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/i40iw/i40iw_verbs.c +2 -0
@@ -812,6 +812,8 @@ static int i40iw_query_qp(struct ib_qp *ibqp,struct i40iw_qp *iwqp =to_iwqp (ibqp);struct i40iw_sc_qp *qp = &iwqp->sc_qp; + attr->qp_state = iwqp->ibqp_state; + attr->cur_qp_state = attr->qp_state; attr->qp_access_flags =0 ; attr->cap.max_send_wr = qp->qp_uk.sq_size; attr->cap.max_recv_wr = qp->qp_uk.rq_size;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 187/223 serial: sh-sci: Terminate TX DMA during buffer flushing
In reply to Greg Kroah-Hartman[ Upstream commit 775b7ffd7d6d5db320d99b0a485c51e04dfcf9f1 ]
While the .flush_buffer() callback clears sci_port.tx_dma_len since commit 1cf4a7efdc71cab8 ("serial: sh-sci: Fix race condition causing garbage during shutdown"), it does not terminate a transmit DMA operation that may be in progress.
Fix this by terminating any pending DMA operations, and resetting the corresponding cookie.
--- drivers/tty/serial/sh-sci.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/tty/serial/sh-sci.c +9 -2
@@ -1538,11 +1538,18 @@ static void sci_free_dma(struct uart_port *port)static void sci_flush_buffer (struct uart_port *port) { +struct sci_port *s =to_sci_port (port); +/* * In uart_flush_buffer(), the xmit circular buffer has just been -* cleared, so we have to reset tx_dma_len accordingly. +* cleared, so we have to reset tx_dma_len accordingly, and stop any +* pending transfers */ -to_sci_port (port)->tx_dma_len =0 ; + s->tx_dma_len =0 ; +if (s->chan_tx) { +dmaengine_terminate_async (s->chan_tx); + s->cookie_tx = -EINVAL ; + } }#else /* !CONFIG_SERIAL_SH_SCI_DMA */ static inline void sci_request_dma (struct uart_port *port)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 188/223 serial: sh-sci: Fix TX DMA buffer flushing and workqueue races
In reply to Greg Kroah-Hartman[ Upstream commit 8493eab02608b0e82f67b892aa72882e510c31d0 ]
When uart_flush_buffer() is called, the .flush_buffer() callback zeroes the tx_dma_len field. This may race with the work queue function handling transmit DMA requests:
1. If the buffer is flushed before the first DMA API call, dmaengine_prep_slave_single() may be called with a zero length, causing the DMA request to never complete, leading to messages like:
rcar-dmac e7300000.dma-controller: Channel Address Error happen
and, with debug enabled:
sh-sci e6e88000.serial: sci_dma_tx_work_fn: ffff800639b55000: 0...0, cookie 126
and DMA timeouts.
2. If the buffer is flushed after the first DMA API call, but before the second, dma_sync_single_for_device() may be called with a zero length, causing the transmit data not to be flushed to RAM, and leading to stale data being output.
Fix this by:
1. Letting sci_dma_tx_work_fn() return immediately if the transmit buffer is empty,
2. Extending the critical section to cover all DMA preparational work, so tx_dma_len stays consistent for all of it,
3. Using local copies of circ_buf.head and circ_buf.tail, to make sure they match the actual operation above.
--- drivers/tty/serial/sh-sci.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/tty/serial/sh-sci.c +15 -7
@@ -1291,6 +1291,7 @@ static void work_fn_tx(struct work_struct *work)struct uart_port *port = &s->port;struct circ_buf *xmit = &port->state->xmit;dma_addr_t buf; +int head, tail;/* * DMA is idle now.
@@ -1300,16 +1301,23 @@ static void work_fn_tx(struct work_struct *work)* consistent xmit buffer state. */ spin_lock_irq (&port->lock); - buf = s->tx_dma_addr + (xmit->tail & (UART_XMIT_SIZE -1 )); + head = xmit->head; + tail = xmit->tail; + buf = s->tx_dma_addr + (tail & (UART_XMIT_SIZE -1 )); s->tx_dma_len = min_t(unsigned int, -CIRC_CNT (xmit->head, xmit->tail,UART_XMIT_SIZE ), -CIRC_CNT_TO_END (xmit->head, xmit->tail,UART_XMIT_SIZE )); -spin_unlock_irq (&port->lock); +CIRC_CNT (head, tail,UART_XMIT_SIZE ), +CIRC_CNT_TO_END (head, tail,UART_XMIT_SIZE )); +if (!s->tx_dma_len) { +/* Transmit buffer has been flushed */ +spin_unlock_irq (&port->lock); +return ; + } desc =dmaengine_prep_slave_single (chan, buf, s->tx_dma_len,DMA_MEM_TO_DEV ,DMA_PREP_INTERRUPT |DMA_CTRL_ACK );if (!desc) { +spin_unlock_irq (&port->lock);dev_warn (port->dev,"Failed preparing Tx DMA descriptor\n" );/* switch to PIO */ sci_tx_dma_release (s, true);
@@ -1319,20 +1327,20 @@ static void work_fn_tx(struct work_struct *work)dma_sync_single_for_device (chan->device->dev, buf, s->tx_dma_len,DMA_TO_DEVICE ); -spin_lock_irq (&port->lock); desc->callback = sci_dma_tx_complete; desc->callback_param = s; -spin_unlock_irq (&port->lock); s->cookie_tx =dmaengine_submit (desc);if (dma_submit_error (s->cookie_tx)) { +spin_unlock_irq (&port->lock);dev_warn (port->dev,"Failed submitting Tx DMA descriptor\n" );/* switch to PIO */ sci_tx_dma_release (s, true);return ; } +spin_unlock_irq (&port->lock);dev_dbg (port->dev,"%s: %p: %d...%d, cookie %d\n" , - __func__, xmit->buf, xmit->tail, xmit->head, s->cookie_tx); + __func__, xmit->buf, tail, head, s->cookie_tx);dma_async_issue_pending (chan); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 189/223 kallsyms: exclude kasan local symbols on s390
In reply to Greg Kroah-Hartman[ Upstream commit 33177f01ca3fe550146bb9001bec2fd806b2f40c ]
gcc asan instrumentation emits the following sequence to store frame pc when the kernel is built with CONFIG_RELOCATABLE:debug/vsprintf.s:
.section .data.rel.ro.local,"aw"
.align 8
.LC3:
.quad .LASANPC4826@GOTOFF
.text
.align 8
.type number, @function
number:
.LASANPC4826:
and in case reloc is issued for LASANPC label it also gets into .symtab with the same address as actual function symbol:
$ nm -n vmlinux | grep 0000000001397150 0000000001397150 t .LASANPC4826 0000000001397150 t number
In the end kernel backtraces are almost unreadable:
[ 143.748476] Call Trace: [ 143.748484] ([<000000002da3e62c>] .LASANPC2671+0x114/0x190) [ 143.748492] [<000000002eca1a58>] .LASANPC2612+0x110/0x160 [ 143.748502] [<000000002de9d830>] print_address_description+0x80/0x3b0 [ 143.748511] [<000000002de9dd64>] __kasan_report+0x15c/0x1c8 [ 143.748521] [<000000002ecb56d4>] strrchr+0x34/0x60 [ 143.748534] [<000003ff800a9a40>] kasan_strings+0xb0/0x148 [test_kasan] [ 143.748547] [<000003ff800a9bba>] kmalloc_tests_init+0xe2/0x528 [test_kasan] [ 143.748555] [<000000002da2117c>] .LASANPC4069+0x354/0x748 [ 143.748563] [<000000002dbfbb16>] do_init_module+0x136/0x3b0 [ 143.748571] [<000000002dbff3f4>] .LASANPC3191+0x2164/0x25d0 [ 143.748580] [<000000002dbffc4c>] .LASANPC3196+0x184/0x1b8 [ 143.748587] [<000000002ecdf2ec>] system_call+0xd8/0x2d8
Since LASANPC labels are not even unique and get into .symtab only due to relocs filter them out in kallsyms.
--- scripts/kallsyms.c | 3 +++ 1 file changed, 3 insertions(+)
scripts/kallsyms.c +3 -0
@@ -161,6 +161,9 @@ static int read_symbol(FILE *in, struct sym_entry *s)/* exclude debugging symbols */ else if (stype == 'N')return -1 ; +/* exclude s390 kasan local symbols */ + else if (!strncmp(sym, ".LASANPC", 8)) +return -1 ;/* include the type field in the symbol name, so that it gets * compressed together */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 190/223 perf test mmap-thread-lookup: Initialize variable to suppress memory sanitizer warning
In reply to Greg Kroah-Hartman[ Upstream commit 4e4cf62b37da5ff45c904a3acf242ab29ed5881d ]
Running the 'perf test' command after building perf with a memory sanitizer causes a warning that says:
WARNING: MemorySanitizer: use-of-uninitialized-value... in mmap-thread-lookup.c
Initializing the go variable to 0 silences this harmless warning.
Committer warning:
This was harmless, just a simple test writing whatever was at that sizeof(int) memory area just to signal another thread blocked reading that file created with pipe(). Initialize it tho so that we don't get this warning.
--- tools/perf/tests/mmap-thread-lookup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/mmap-thread-lookup.c +1 -1
@@ -49,7 +49,7 @@ static void *thread_fn(void *arg) {struct thread_data *td = arg;ssize_t ret; -int go; +int go =0 ;if (thread_init (td))return NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 191/223 RDMA/rxe: Fill in wc byte_len with IB_WC_RECV_RDMA_WITH_IMM
In reply to Greg Kroah-Hartman[ Upstream commit bdce1290493caa3f8119f24b5dacc3fb7ca27389 ]
Calculate the correct byte_len on the receiving side when a work completion is generated with IB_WC_RECV_RDMA_WITH_IMM opcode.
According to the IBA byte_len must indicate the number of written bytes, whereas it was always equal to zero for the IB_WC_RECV_RDMA_WITH_IMM opcode, even though data was transferred.
--- drivers/infiniband/sw/rxe/rxe_resp.c | 5 ++++- drivers/infiniband/sw/rxe/rxe_verbs.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_resp.c +4 -1
@@ -432,6 +432,7 @@ static enum resp_states check_rkey(struct rxe_qp *qp, qp->resp.va =reth_va (pkt); qp->resp.rkey =reth_rkey (pkt); qp->resp.resid =reth_len (pkt); + qp->resp.length =reth_len (pkt); } access = (pkt->mask &RXE_READ_MASK ) ?IB_ACCESS_REMOTE_READ :IB_ACCESS_REMOTE_WRITE ;
@@ -841,7 +842,9 @@ static enum resp_states do_complete(struct rxe_qp *qp, pkt->mask & RXE_WRITE_MASK) ?IB_WC_RECV_RDMA_WITH_IMM :IB_WC_RECV ; wc->vendor_err =0 ; - wc->byte_len = wqe->dma.length - wqe->dma.resid; + wc->byte_len = (pkt->mask &RXE_IMMDT_MASK && + pkt->mask &RXE_WRITE_MASK ) ? + qp->resp.length : wqe->dma.length - wqe->dma.resid;/* fields after byte_len are different between kernel and user * space
drivers/infiniband/sw/rxe/rxe_verbs.h +1 -0
@@ -209,6 +209,7 @@ struct rxe_resp_info {struct rxe_mem *mr;u32 resid;u32 rkey; +u32 length;u64 atomic_orig;/* SRQ only */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 192/223 powerpc/boot: add {get, put}_unaligned_be32 to xz_config.h
In reply to Greg Kroah-Hartman[ Upstream commit 9e005b761e7ad153dcf40a6cba1d681fe0830ac6 ]
The next commit will make the way of passing CONFIG options more robust. Unfortunately, it would uncover another hidden issue; without this commit, skiroot_defconfig would be broken like this:
| WRAP arch/powerpc/boot/zImage.pseries | arch/powerpc/boot/wrapper.a(decompress.o): In function `bcj_powerpc.isra.10': | decompress.c:(.text+0x720): undefined reference to `get_unaligned_be32' | decompress.c:(.text+0x7a8): undefined reference to `put_unaligned_be32' | make[1]: *** [arch/powerpc/boot/Makefile;383: arch/powerpc/boot/zImage.pseries] Error 1 | make: *** [arch/powerpc/Makefile;295: zImage] Error 2
skiroot_defconfig is the only defconfig that enables CONFIG_KERNEL_XZ for ppc, which has never been correctly built before.
I figured out the root cause in lib/decompress_unxz.c:
| #ifdef CONFIG_PPC | # define XZ_DEC_POWERPC | #endif
CONFIG_PPC is undefined here in the ppc bootwrapper because autoconf.h is not included except by arch/powerpc/boot/serial.c
XZ_DEC_POWERPC is not defined, therefore, bcj_powerpc() is not compiled for the bootwrapper.
With the next commit passing CONFIG_PPC correctly, we would realize that {get,put}_unaligned_be32 was missing.
Unlike the other decompressors, the ppc bootwrapper duplicates all the necessary helpers in arch/powerpc/boot/.
The other architectures define __KERNEL__ and pull in helpers for building the decompressors.
If ppc bootwrapper had defined __KERNEL__, lib/xz/xz_private.h would have included <asm/unaligned.h>:
| #ifdef __KERNEL__ | # include <linux/xz.h> | # include <linux/kernel.h> | # include <asm/unaligned.h>
However, doing so would cause tons of definition conflicts since the bootwrapper has duplicated everything.
I just added copies of {get,put}_unaligned_be32, following the bootwrapper coding convention.
--- arch/powerpc/boot/xz_config.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/powerpc/boot/xz_config.h +20 -0
@@ -19,10 +19,30 @@ static inline uint32_t swab32p(void *p)#ifdef __LITTLE_ENDIAN__#define get_le32 (p) (*((uint32_t *) (p))) +#define cpu_to_be32 (x) swab32(x) +static inline u32 be32_to_cpup (const u32 *p) +{ +return swab32p ((u32 *)p); +}#else #define get_le32 (p) swab32p(p) +#define cpu_to_be32 (x) (x) +static inline u32 be32_to_cpup (const u32 *p) +{ +return *p; +}#endif +static inline uint32_t get_unaligned_be32 (const void *p) +{ +return be32_to_cpup (p); +} + +static inline void put_unaligned_be32 (u32 val,void *p) +{ + *((u32 *)p) =cpu_to_be32 (val); +} +#define memeq (a, b, size) (memcmp(a, b, size) == 0)#define memzero (buf, size) memset(buf, 0, size)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 193/223 f2fs: avoid out-of-range memory access
In reply to Greg Kroah-Hartman[ Upstream commit 56f3ce675103e3fb9e631cfb4131fc768bc23e9a ]
blkoff_off might over 512 due to fs corrupt or security vulnerability. That should be checked before being using.
Use ENTRIES_IN_SUM to protect invalid value in cur_data_blkoff.
--- fs/f2fs/segment.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/f2fs/segment.c +5 -0
@@ -1709,6 +1709,11 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi) seg_i =CURSEG_I (sbi, i); segno =le32_to_cpu (ckpt->cur_data_segno[i]); blk_off =le16_to_cpu (ckpt->cur_data_blkoff[i]); +if (blk_off >ENTRIES_IN_SUM ) { +f2fs_bug_on (sbi,1 ); +f2fs_put_page (page,1 ); +return -EFAULT ; + } seg_i->next_segno = segno;reset_curseg (sbi, i,0 ); seg_i->alloc_type = ckpt->alloc_type[i];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 194/223 mailbox: handle failed named mailbox channel request
In reply to Greg Kroah-Hartman[ Upstream commit 25777e5784a7b417967460d4fcf9660d05a0c320 ]
Previously, if mbox_request_channel_byname was used with a name which did not exist in the "mbox-names" property of a mailbox client, the mailbox corresponding to the last entry in the "mbox-names" list would be incorrectly selected.
With this patch, -EINVAL is returned if the named mailbox is not found.
--- drivers/mailbox/mailbox.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/mailbox/mailbox.c +4 -2
@@ -389,11 +389,13 @@ struct mbox_chan *mbox_request_channel_byname(struct mbox_client *cl,of_property_for_each_string (np,"mbox-names" , prop, mbox_name) {if (!strncmp (name, mbox_name,strlen (name))) -break ; +return mbox_request_channel (cl, index); index++; } -return mbox_request_channel (cl, index); +dev_err (cl->dev,"%s() could not locate channel named \"%s\"\n" , + __func__, name); +return ERR_PTR (-EINVAL ); }EXPORT_SYMBOL_GPL (mbox_request_channel_byname);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 195/223 powerpc/eeh: Handle hugepages in ioremap space
In reply to Greg Kroah-Hartman[ Upstream commit 33439620680be5225c1b8806579a291e0d761ca0 ]
In commit 4a7b06c157a2 ("powerpc/eeh: Handle hugepages in ioremap space") support for using hugepages in the vmalloc and ioremap areas was enabled for radix. Unfortunately this broke EEH MMIO error checking.
Detection works by inserting a hook which checks the results of the ioreadXX() set of functions. When a read returns a 0xFFs response we need to check for an error which we do by mapping the (virtual) MMIO address back to a physical address, then mapping physical address to a PCI device via an interval tree.
When translating virt -> phys we currently assume the ioremap space is only populated by PAGE_SIZE mappings. If a hugepage mapping is found we emit a WARN_ON(), but otherwise handles the check as though a normal page was found. In pathalogical cases such as copying a buffer containing a lot of 0xFFs from BAR memory this can result in the system not booting because it's too busy printing WARN_ON()s.
There's no real reason to assume huge pages can't be present and we're prefectly capable of handling them, so do that.
--- arch/powerpc/kernel/eeh.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
arch/powerpc/kernel/eeh.c +12 -3
@@ -362,10 +362,19 @@ static inline unsigned long eeh_token_to_phys(unsigned long token) NULL, &hugepage_shift);if (!ptep)return token; -WARN_ON (hugepage_shift); - pa =pte_pfn (*ptep) <<PAGE_SHIFT ; -return pa | (token & (PAGE_SIZE -1 )); + pa =pte_pfn (*ptep); + +/* On radix we can do hugepage mappings for io, so handle that */ +if (hugepage_shift) { + pa <<= hugepage_shift; + pa |= token & ((1ul << hugepage_shift) -1 ); + }else { + pa <<=PAGE_SHIFT ; + pa |= token & (PAGE_SIZE -1 ); + } + +return pa; }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 196/223 sh: prevent warnings when using iounmap
In reply to Greg Kroah-Hartman[ Upstream commit 733f0025f0fb43e382b84db0930ae502099b7e62 ]
When building drm/exynos for sh, as part of an allmodconfig build, the following warning triggered:
exynos7_drm_decon.c: In function `decon_remove':
exynos7_drm_decon.c:769:24: warning: unused variable `ctx'
struct decon_context *ctx = dev_get_drvdata(&pdev->dev);
The ctx variable is only used as argument to iounmap().
In sh - allmodconfig CONFIG_MMU is not defined
so it ended up in:
\#define __iounmap(addr) do { } while (0)
\#define iounmap __iounmap
Fix the warning by introducing a static inline function for iounmap.
This is similar to several other architectures.
--- arch/sh/include/asm/io.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/sh/include/asm/io.h +5 -1
@@ -370,7 +370,11 @@ static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }#define ioremap_nocache ioremap#define ioremap_uc ioremap -#define iounmap __iounmap + +static inline void iounmap (void __iomem *addr) +{ +__iounmap (addr); +}/* * Convert a physical pointer to a virtual kernel pointer for /dev/mem
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 197/223 mm/kmemleak.c: fix check for softirq context
In reply to Greg Kroah-Hartman[ Upstream commit 6ef9056952532c3b746de46aa10d45b4d7797bd8 ]
in_softirq() is a wrong predicate to check if we are in a softirq context. It also returns true if we have BH disabled, so objects are falsely stamped with "softirq" comm. The correct predicate is in_serving_softirq().
If user does cat from /sys/kernel/debug/kmemleak previously they would see this, which is clearly wrong, this is system call context (see the comm):
unreferenced object 0xffff88805bd661c0 (size 64):
comm "softirq", pid 0, jiffies 4294942959 (age 12.400s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 ff ff ff ff 00 00 00 00 ................
00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 ................
backtrace:
[<0000000007dcb30c>] kmemleak_alloc_recursive include/linux/kmemleak.h:55 [inline]
[<0000000007dcb30c>] slab_post_alloc_hook mm/slab.h:439 [inline]
[<0000000007dcb30c>] slab_alloc mm/slab.c:3326 [inline]
[<0000000007dcb30c>] kmem_cache_alloc_trace+0x13d/0x280 mm/slab.c:3553
[<00000000969722b7>] kmalloc include/linux/slab.h:547 [inline]
[<00000000969722b7>] kzalloc include/linux/slab.h:742 [inline]
[<00000000969722b7>] ip_mc_add1_src net/ipv4/igmp.c:1961 [inline]
[<00000000969722b7>] ip_mc_add_src+0x36b/0x400 net/ipv4/igmp.c:2085
[<00000000a4134b5f>] ip_mc_msfilter+0x22d/0x310 net/ipv4/igmp.c:2475
[<00000000d20248ad>] do_ip_setsockopt.isra.0+0x19fe/0x1c00 net/ipv4/ip_sockglue.c:957
[<000000003d367be7>] ip_setsockopt+0x3b/0xb0 net/ipv4/ip_sockglue.c:1246
[<000000003c7c76af>] udp_setsockopt+0x4e/0x90 net/ipv4/udp.c:2616
[<000000000c1aeb23>] sock_common_setsockopt+0x3e/0x50 net/core/sock.c:3130
[<000000000157b92b>] __sys_setsockopt+0x9e/0x120 net/socket.c:2078
[<00000000a9f3d058>] __do_sys_setsockopt net/socket.c:2089 [inline]
[<00000000a9f3d058>] __se_sys_setsockopt net/socket.c:2086 [inline]
[<00000000a9f3d058>] __x64_sys_setsockopt+0x26/0x30 net/socket.c:2086
[<000000001b8da885>] do_syscall_64+0x7c/0x1a0 arch/x86/entry/common.c:301
[<00000000ba770c62>] entry_SYSCALL_64_after_hwframe+0x44/0xa9now they will see this:
unreferenced object 0xffff88805413c800 (size 64):
comm "syz-executor.4", pid 8960, jiffies 4294994003 (age 14.350s) hex dump (first 32 bytes):
00 7a 8a 57 80 88 ff ff e0 00 00 01 00 00 00 00 .z.W............
00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 ................
backtrace:
[<00000000c5d3be64>] kmemleak_alloc_recursive include/linux/kmemleak.h:55 [inline]
[<00000000c5d3be64>] slab_post_alloc_hook mm/slab.h:439 [inline]
[<00000000c5d3be64>] slab_alloc mm/slab.c:3326 [inline]
[<00000000c5d3be64>] kmem_cache_alloc_trace+0x13d/0x280 mm/slab.c:3553
[<0000000023865be2>] kmalloc include/linux/slab.h:547 [inline]
[<0000000023865be2>] kzalloc include/linux/slab.h:742 [inline]
[<0000000023865be2>] ip_mc_add1_src net/ipv4/igmp.c:1961 [inline]
[<0000000023865be2>] ip_mc_add_src+0x36b/0x400 net/ipv4/igmp.c:2085
[<000000003029a9d4>] ip_mc_msfilter+0x22d/0x310 net/ipv4/igmp.c:2475
[<00000000ccd0a87c>] do_ip_setsockopt.isra.0+0x19fe/0x1c00 net/ipv4/ip_sockglue.c:957
[<00000000a85a3785>] ip_setsockopt+0x3b/0xb0 net/ipv4/ip_sockglue.c:1246
[<00000000ec13c18d>] udp_setsockopt+0x4e/0x90 net/ipv4/udp.c:2616
[<0000000052d748e3>] sock_common_setsockopt+0x3e/0x50 net/core/sock.c:3130
[<00000000512f1014>] __sys_setsockopt+0x9e/0x120 net/socket.c:2078
[<00000000181758bc>] __do_sys_setsockopt net/socket.c:2089 [inline]
[<00000000181758bc>] __se_sys_setsockopt net/socket.c:2086 [inline]
[<00000000181758bc>] __x64_sys_setsockopt+0x26/0x30 net/socket.c:2086
[<00000000d4b73623>] do_syscall_64+0x7c/0x1a0 arch/x86/entry/common.c:301
[<00000000c1098bec>] entry_SYSCALL_64_after_hwframe+0x44/0xa9--- mm/kmemleak.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/kmemleak.c +1 -1
@@ -569,7 +569,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,if (in_irq ()) { object->pid =0 ;strncpy (object->comm,"hardirq" ,sizeof (object->comm)); - }else if (in_softirq ()) { + }else if (in_serving_softirq ()) { object->pid =0 ;strncpy (object->comm,"softirq" ,sizeof (object->comm)); }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 198/223 9p: pass the correct prototype to read_cache_page
In reply to Greg Kroah-Hartman[ Upstream commit f053cbd4366051d7eb6ba1b8d529d20f719c2963 ]
Fix the callback 9p passes to read_cache_page to actually have the proper type expected. Casting around function pointers can easily hide typing bugs, and defeats control flow protection.
--- fs/9p/vfs_addr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/9p/vfs_addr.c +4 -2
@@ -49,8 +49,9 @@* @page: structure to page * */ -static int v9fs_fid_readpage (struct p9_fid *fid,struct page *page) +static int v9fs_fid_readpage (void *data,struct page *page) { +struct p9_fid *fid = data;struct inode *inode = page->mapping->host;struct bio_vec bvec = {.bv_page = page, .bv_len =PAGE_SIZE };struct iov_iter to;
@@ -121,7 +122,8 @@ static int v9fs_vfs_readpages(struct file *filp, struct address_space *mapping,if (ret ==0 )return ret; - ret =read_cache_pages (mapping, pages, (void *)v9fs_vfs_readpage, filp); + ret =read_cache_pages (mapping, pages, v9fs_fid_readpage, + filp->private_data);p9_debug (P9_DEBUG_VFS ," = %d\n" , ret);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 199/223 mm/mmu_notifier: use hlist_add_head_rcu()
In reply to Greg Kroah-Hartman[ Upstream commit 543bdb2d825fe2400d6e951f1786d92139a16931 ]
Make mmu_notifier_register() safer by issuing a memory barrier before registering a new notifier. This fixes a theoretical bug on weakly ordered CPUs. For example, take this simplified use of notifiers by a driver:
my_struct->mn.ops = &my_ops; /* (1) */ mmu_notifier_register(&my_struct->mn, mm) ... hlist_add_head(&mn->hlist, &mm->mmu_notifiers); /* (2) */ ...
Once mmu_notifier_register() releases the mm locks, another thread can invalidate a range:
mmu_notifier_invalidate_range()
...
hlist_for_each_entry_rcu(mn, &mm->mmu_notifiers, hlist) {
if (mn->ops->invalidate_range)The read side relies on the data dependency between mn and ops to ensure that the pointer is properly initialized. But the write side doesn't have any dependency between (1) and (2), so they could be reordered and the readers could dereference an invalid mn->ops. mmu_notifier_register() does take all the mm locks before adding to the hlist, but those have acquire semantics which isn't sufficient.
By calling hlist_add_head_rcu() instead of hlist_add_head() we update the hlist using a store-release, ensuring that readers see prior initialization of my_struct. This situation is better illustated by litmus test MP+onceassign+derefonce.
--- mm/mmu_notifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mmu_notifier.c +1 -1
@@ -286,7 +286,7 @@ static int do_mmu_notifier_register(struct mmu_notifier *mn,* thanks to mm_take_all_locks(). */ spin_lock (&mm->mmu_notifier_mm->lock); -hlist_add_head (&mn->hlist, &mm->mmu_notifier_mm->list); +hlist_add_head_rcu (&mn->hlist, &mm->mmu_notifier_mm->list);spin_unlock (&mm->mmu_notifier_mm->lock);mm_drop_all_locks (mm);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 200/223 locking/lockdep: Fix lock used or unused stats error
In reply to Greg Kroah-Hartman[ Upstream commit 68d41d8c94a31dfb8233ab90b9baf41a2ed2da68 ]
The stats variable nr_unused_locks is incremented every time a new lock class is register and decremented when the lock is first used in __lock_acquire(). And after all, it is shown and checked in lockdep_stats.
However, under configurations that either CONFIG_TRACE_IRQFLAGS or CONFIG_PROVE_LOCKING is not defined:
The commit:
091806515124b20 ("locking/lockdep: Consolidate lock usage bit initialization")
missed marking the LOCK_USED flag at IRQ usage initialization because as mark_usage() is not called. And the commit:
886532aee3cd42d ("locking/lockdep: Move mark_lock() inside CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING")further made mark_lock() not defined such that the LOCK_USED cannot be marked at all when the lock is first acquired.
As a result, we fix this by not showing and checking the stats under such configurations for lockdep_stats.
--- kernel/locking/lockdep_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/locking/lockdep_proc.c +3 -2
@@ -229,6 +229,7 @@ static int lockdep_stats_show(struct seq_file *m, void *v) nr_hardirq_read_safe =0 , nr_hardirq_read_unsafe =0 , sum_forward_deps =0 ; +#ifdef CONFIG_PROVE_LOCKING list_for_each_entry (class, &all_lock_classes, lock_entry) {if (class->usage_mask ==0 )
@@ -260,12 +261,12 @@ static int lockdep_stats_show(struct seq_file *m, void *v)if (class->usage_mask &LOCKF_ENABLED_HARDIRQ_READ ) nr_hardirq_read_unsafe++; -#ifdef CONFIG_PROVE_LOCKING sum_forward_deps +=lockdep_count_forward_deps (class); -#endif }#ifdef CONFIG_DEBUG_LOCKDEP DEBUG_LOCKS_WARN_ON (debug_atomic_read (nr_unused_locks) != nr_unused); +#endif +#endif seq_printf (m," lock-classes: %11lu [max: %lu]\n" , nr_lock_classes,MAX_LOCKDEP_KEYS );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 201/223 locking/lockdep: Hide unused class variable
In reply to Greg Kroah-Hartman[ Upstream commit 68037aa78208f34bda4e5cd76c357f718b838cbb ]
The usage is now hidden in an #ifdef, so we need to move the variable itself in there as well to avoid this warning:
kernel/locking/lockdep_proc.c:203:21: error: unused variable 'class' [-Werror,-Wunused-variable]
--- kernel/locking/lockdep_proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/locking/lockdep_proc.c +2 -1
@@ -219,7 +219,6 @@ static void lockdep_stats_debug_show(struct seq_file *m)static int lockdep_stats_show (struct seq_file *m,void *v) { -struct lock_class *class;unsigned long nr_unused =0 , nr_uncategorized =0 , nr_irq_safe =0 , nr_irq_unsafe =0 , nr_softirq_safe = 0, nr_softirq_unsafe = 0,
@@ -230,6 +229,8 @@ static int lockdep_stats_show(struct seq_file *m, void *v) sum_forward_deps =0 ;#ifdef CONFIG_PROVE_LOCKING +struct lock_class *class; +list_for_each_entry (class, &all_lock_classes, lock_entry) {if (class->usage_mask ==0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 202/223 usb: wusbcore: fix unbalanced get/put cluster_id
In reply to Greg Kroah-HartmanFrom: Phong Tran <[email protected]>
commit f90bf1ece48a736097ea224430578fe586a9544c upstream.
syzboot reported that
https://syzkaller.appspot.com/bug?extid=fd2bd7df88c606eea4ef
There is not consitency parameter in cluste_id_get/put calling. In case of getting the id with result is failure, the wusbhc->cluster_id will not be updated and this can not be used for wusb_cluster_id_put().
Tested report
https://groups.google.com/d/msg/syzkaller-bugs/0znZopp3-9k/oxOrhLkLEgAJ
Reproduce and gdb got the details:
139 addr = wusb_cluster_id_get();
(gdb) n
140 if (addr == 0)
(gdb) print addr
$1 = 254 '\376'
(gdb) n
142 result = __hwahc_set_cluster_id(hwahc, addr);
(gdb) print result
$2 = -71
(gdb) break wusb_cluster_id_put
Breakpoint 3 at 0xffffffff836e3f20: file drivers/usb/wusbcore/wusbhc.c, line 384. (gdb) s
Thread 2 hit Breakpoint 3, wusb_cluster_id_put (id=0 '\000') at drivers/usb/wusbcore/wusbhc.c:384
384 id = 0xff - id;
(gdb) n
385 BUG_ON(id >= CLUSTER_IDS);
(gdb) print id
$3 = 255 '\377'
--- drivers/usb/host/hwa-hc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/hwa-hc.c +1 -1
@@ -173,7 +173,7 @@ out:return result; error_set_cluster_id: -wusb_cluster_id_put (wusbhc->cluster_id); +wusb_cluster_id_put (addr); error_cluster_id_get: goto out;
Greg Kroah-Hartman
maintainerPATCH 203/223 usb: pci-quirks: Correct AMD PLL quirk detection
In reply to Greg Kroah-HartmanFrom: Ryan Kennedy <[email protected]>
commit f3dccdaade4118070a3a47bef6b18321431f9ac6 upstream.
The AMD PLL USB quirk is incorrectly enabled on newer Ryzen chipsets. The logic in usb_amd_find_chipset_info currently checks for unaffected chipsets rather than affected ones. This broke once a new chipset was added in e788787ef. It makes more sense to reverse the logic so it won't need to be updated as new chipsets are added. Note that the core of the workaround in usb_amd_quirk_pll does correctly check the chipset.
--- drivers/usb/host/pci-quirks.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
drivers/usb/host/pci-quirks.c +19 -12
@@ -187,7 +187,7 @@ int usb_amd_find_chipset_info(void) {unsigned long flags;struct amd_chipset_info info; -int ret; +int need_pll_quirk =0 ;spin_lock_irqsave (&amd_lock, flags);
@@ -201,21 +201,28 @@ int usb_amd_find_chipset_info(void)spin_unlock_irqrestore (&amd_lock, flags);if (!amd_chipset_sb_type_init (&info)) { - ret =0 ; goto commit; } -/* Below chipset generations needn't enable AMD PLL quirk */ -if (info.sb_type.gen ==AMD_CHIPSET_UNKNOWN || - info.sb_type.gen ==AMD_CHIPSET_SB600 || - info.sb_type.gen ==AMD_CHIPSET_YANGTZE || - (info.sb_type.gen ==AMD_CHIPSET_SB700 && - info.sb_type.rev >0x3b )) { +switch (info.sb_type.gen) { +case AMD_CHIPSET_SB700 : + need_pll_quirk = info.sb_type.rev <=0x3B ; +break ; +case AMD_CHIPSET_SB800 : +case AMD_CHIPSET_HUDSON2 : +case AMD_CHIPSET_BOLTON : + need_pll_quirk =1 ; +break ; +default : + need_pll_quirk =0 ; +break ; + } + +if (!need_pll_quirk) {if (info.smbus_dev) {pci_dev_put (info.smbus_dev); info.smbus_dev =NULL ; } - ret =0 ; goto commit; }
@@ -234,7 +241,7 @@ int usb_amd_find_chipset_info(void) } } - ret = info.probe_result =1 ; + need_pll_quirk = info.probe_result =1 ;printk (KERN_DEBUG "QUIRK: Enable AMD PLL fix\n" ); commit:
@@ -245,7 +252,7 @@ commit:/* Mark that we where here */ amd_chipset.probe_count++; - ret = amd_chipset.probe_result; + need_pll_quirk = amd_chipset.probe_result;spin_unlock_irqrestore (&amd_lock, flags);
@@ -259,7 +266,7 @@ commit:spin_unlock_irqrestore (&amd_lock, flags); } -return ret; +return need_pll_quirk; }EXPORT_SYMBOL_GPL (usb_amd_find_chipset_info);
Greg Kroah-Hartman
maintainerPATCH 204/223 x86/sysfb_efi: Add quirks for some devices with swapped width and height
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit d02f1aa39189e0619c3525d5cd03254e61bf606a upstream.
Some Lenovo 2-in-1s with a detachable keyboard have a portrait screen but advertise a landscape resolution and pitch, resulting in a messed up display if the kernel tries to show anything on the efifb (because of the wrong pitch).
Fix this by adding a new DMI match table for devices which need to have their width and height swapped.
At first it was tried to use the existing table for overriding some of the efifb parameters, but some of the affected devices have variants with different LCD resolutions which will not work with hardcoded override values.
Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1730783
--- arch/x86/kernel/sysfb_efi.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
arch/x86/kernel/sysfb_efi.c +46 -0
@@ -231,9 +231,55 @@ static const struct dmi_system_id efifb_ {}, }; +/* +* Some devices have a portrait LCD but advertise a landscape resolution (and +* pitch). We simply swap width and height for these devices so that we can +* correctly deal with some of them coming with multiple resolutions. +*/ +static const struct dmi_system_id efifb_dmi_swap_width_height[]__initconst = { + { +/* +* Lenovo MIIX310-10ICR, only some batches have the troublesome +* 800x1280 portrait screen. Luckily the portrait version has +* its own BIOS version, so we match on that. +*/ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"LENOVO" ), +DMI_EXACT_MATCH (DMI_PRODUCT_VERSION ,"MIIX 310-10ICR" ), +DMI_EXACT_MATCH (DMI_BIOS_VERSION ,"1HCN44WW" ), + }, + }, + { +/* Lenovo MIIX 320-10ICR with 800x1280 portrait screen */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"LENOVO" ), +DMI_EXACT_MATCH (DMI_PRODUCT_VERSION , +"Lenovo MIIX 320-10ICR" ), + }, + }, + { +/* Lenovo D330 with 800x1280 or 1200x1920 portrait screen */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"LENOVO" ), +DMI_EXACT_MATCH (DMI_PRODUCT_VERSION , +"Lenovo ideapad D330-10IGM" ), + }, + }, + {}, +}; +__init void sysfb_apply_efi_quirks (void ) {if (screen_info.orig_video_isVGA !=VIDEO_TYPE_EFI || !(screen_info.capabilities &VIDEO_CAPABILITY_SKIP_QUIRKS ))dmi_check_system (efifb_dmi_system_table); + +if (screen_info.orig_video_isVGA ==VIDEO_TYPE_EFI && +dmi_check_system (efifb_dmi_swap_width_height)) { +u16 temp = screen_info.lfb_width; + + screen_info.lfb_width = screen_info.lfb_height; + screen_info.lfb_height = temp; + screen_info.lfb_linelength =4 * screen_info.lfb_width; + } }
Greg Kroah-Hartman
maintainerPATCH 205/223 x86/speculation/mds: Apply more accurate check on hypervisor platform
In reply to Greg Kroah-HartmanFrom: Zhenzhong Duan <[email protected]>
commit 517c3ba00916383af6411aec99442c307c23f684 upstream.
X86_HYPER_NATIVE isn't accurate for checking if running on native platform, e.g. CONFIG_HYPERVISOR_GUEST isn't set or "nopv" is enabled.
Checking the CPU feature bit X86_FEATURE_HYPERVISOR to determine if it's running on native platform is more accurate.
This still doesn't cover the platforms on which X86_FEATURE_HYPERVISOR is unsupported, e.g. VMware, but there is nothing which can be done about this scenario.
--- arch/x86/kernel/cpu/bugs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/bugs.c +1 -1
@@ -1205,7 +1205,7 @@ static ssize_t l1tf_show_state(char *bufstatic ssize_t mds_show_state (char *buf) {#ifdef CONFIG_HYPERVISOR_GUEST -if (x86_hyper) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {return sprintf (buf,"%s; SMT Host state unknown\n" , mds_strings[mds_mitigation]); }
Greg Kroah-Hartman
maintainerPATCH 206/223 hpet: Fix division by zero in hpet_time_div()
In reply to Greg Kroah-HartmanFrom: Kefeng Wang <[email protected]>
commit 0c7d37f4d9b8446956e97b7c5e61173cdb7c8522 upstream.
The base value in do_div() called by hpet_time_div() is truncated from unsigned long to uint32_t, resulting in a divide-by-zero exception.
UBSAN: Undefined behaviour in ../drivers/char/hpet.c:572:2 division by zero CPU: 1 PID: 23682 Comm: syz-executor.3 Not tainted 4.4.184.x86_64+ #4 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 0000000000000000 b573382df1853d00 ffff8800a3287b98 ffffffff81ad7561 ffff8800a3287c00 ffffffff838b35b0 ffffffff838b3860 ffff8800a3287c20 0000000000000000 ffff8800a3287bb0 ffffffff81b8f25e ffffffff838b35a0 Call Trace: [<ffffffff81ad7561>] __dump_stack lib/dump_stack.c:15 [inline] [<ffffffff81ad7561>] dump_stack+0xc1/0x120 lib/dump_stack.c:51 [<ffffffff81b8f25e>] ubsan_epilogue+0x12/0x8d lib/ubsan.c:166 [<ffffffff81b900cb>] __ubsan_handle_divrem_overflow+0x282/0x2c8 lib/ubsan.c:262 [<ffffffff823560dd>] hpet_time_div drivers/char/hpet.c:572 [inline] [<ffffffff823560dd>] hpet_ioctl_common drivers/char/hpet.c:663 [inline] [<ffffffff823560dd>] hpet_ioctl_common.cold+0xa8/0xad drivers/char/hpet.c:577 [<ffffffff81e63d56>] hpet_ioctl+0xc6/0x180 drivers/char/hpet.c:676 [<ffffffff81711590>] vfs_ioctl fs/ioctl.c:43 [inline] [<ffffffff81711590>] file_ioctl fs/ioctl.c:470 [inline] [<ffffffff81711590>] do_vfs_ioctl+0x6e0/0xf70 fs/ioctl.c:605 [<ffffffff81711eb4>] SYSC_ioctl fs/ioctl.c:622 [inline] [<ffffffff81711eb4>] SyS_ioctl+0x94/0xc0 fs/ioctl.c:613 [<ffffffff82846003>] tracesys_phase2+0x90/0x95
The main C reproducer autogenerated by syzkaller,
syscall(__NR_mmap, 0x20000000, 0x1000000, 3, 0x32, -1, 0); memcpy((void*)0x20000100, "/dev/hpet\000", 10); syscall(__NR_openat, 0xffffffffffffff9c, 0x20000100, 0, 0); syscall(__NR_ioctl, r[0], 0x40086806, 0x40000000000000);
Fix it by using div64_ul().
--- drivers/char/hpet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/char/hpet.c +1 -2
@@ -569,8 +569,7 @@ static inline unsigned long hpet_time_diunsigned long long m; m = hpets->hp_tick_freq + (dis >>1 ); -do_div (m, dis); -return (unsigned long )m; +return div64_ul (m, dis); } static int
Greg Kroah-Hartman
maintainerPATCH 207/223 ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 70256b42caaf3e13c2932c2be7903a73fbe8bb8b upstream.
Commit 7b9584fa1c0b ("staging: line6: Move altsetting to properties") set a wrong altsetting for LINE6_PODHD500_1 during refactoring.
Set the correct altsetting number to fix the issue.
--- sound/usb/line6/podhd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/line6/podhd.c +1 -1
@@ -385,7 +385,7 @@ static const struct line6_properties pod .name = "POD HD500", .capabilities =LINE6_CAP_PCM | LINE6_CAP_HWMON, - .altsetting = 1, + .altsetting = 0, .ep_ctrl_r = 0x81, .ep_ctrl_w = 0x01, .ep_audio_r = 0x86,
Greg Kroah-Hartman
maintainerPATCH 208/223 ALSA: hda - Add a conexant codec entry to let mute led work
In reply to Greg Kroah-HartmanFrom: Hui Wang <[email protected]>
commit 3f8809499bf02ef7874254c5e23fc764a47a21a0 upstream.
This conexant codec isn't in the supported codec list yet, the hda generic driver can drive this codec well, but on a Lenovo machine with mute/mic-mute leds, we need to apply CXT_FIXUP_THINKPAD_ACPI to make the leds work. After adding this codec to the list, the driver patch_conexant.c will apply THINKPAD_ACPI to this machine.
--- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_conexant.c +1 -0
@@ -1011,6 +1011,7 @@ static int patch_conexant_auto(struct hd*/ static const struct hda_device_id snd_hda_id_conexant[] = { +HDA_CODEC_ENTRY (0x14f11f86 ,"CX8070" , patch_conexant_auto),HDA_CODEC_ENTRY (0x14f12008 ,"CX8200" , patch_conexant_auto),HDA_CODEC_ENTRY (0x14f15045 ,"CX20549 (Venice)" , patch_conexant_auto),HDA_CODEC_ENTRY (0x14f15047 ,"CX20551 (Waikiki)" , patch_conexant_auto),
Greg Kroah-Hartman
maintainerPATCH 209/223 powerpc/tm: Fix oops on sigreturn on systems without TM
In reply to Greg Kroah-HartmanFrom: Michael Neuling <[email protected]>
commit f16d80b75a096c52354c6e0a574993f3b0dfbdfe upstream.
On systems like P9 powernv where we have no TM (or P8 booted with ppc_tm=off), userspace can construct a signal context which still has the MSR TS bits set. The kernel tries to restore this context which results in the following crash:
Unexpected TM Bad Thing exception at c0000000000022fc (msr 0x8000000102a03031) tm_scratch=800000020280f033
Oops: Unrecoverable exception, sig: 6 [#1] LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries Modules linked in: CPU: 0 PID: 1636 Comm: sigfuz Not tainted 5.2.0-11043-g0a8ad0ffa4 #69 NIP: c0000000000022fc LR: 00007fffb2d67e48 CTR: 0000000000000000 REGS: c00000003fffbd70 TRAP: 0700 Not tainted (5.2.0-11045-g7142b497d8) MSR: 8000000102a03031 <SF,VEC,VSX,FP,ME,IR,DR,LE,TM[E]> CR: 42004242 XER: 00000000 CFAR: c0000000000022e0 IRQMASK: 0 GPR00: 0000000000000072 00007fffb2b6e560 00007fffb2d87f00 0000000000000669 GPR04: 00007fffb2b6e728 0000000000000000 0000000000000000 00007fffb2b6f2a8 GPR08: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR12: 0000000000000000 00007fffb2b76900 0000000000000000 0000000000000000 GPR16: 00007fffb2370000 00007fffb2d84390 00007fffea3a15ac 000001000a250420 GPR20: 00007fffb2b6f260 0000000010001770 0000000000000000 0000000000000000 GPR24: 00007fffb2d843a0 00007fffea3a14a0 0000000000010000 0000000000800000 GPR28: 00007fffea3a14d8 00000000003d0f00 0000000000000000 00007fffb2b6e728 NIP [c0000000000022fc] rfi_flush_fallback+0x7c/0x80 LR [00007fffb2d67e48] 0x7fffb2d67e48 Call Trace: Instruction dump: e96a0220 e96a02a8 e96a0330 e96a03b8 394a0400 4200ffdc 7d2903a6 e92d0c00 e94d0c08 e96d0c10 e82d0c18 7db242a6 <4c000024> 7db243a6 7db142a6 f82d0c18
The problem is the signal code assumes TM is enabled when CONFIG_PPC_TRANSACTIONAL_MEM is enabled. This may not be the case as with P9 powernv or if ppc_tm=off is used on P8.
This means any local user can crash the system.
Fix the problem by returning a bad stack frame to the user if they try to set the MSR TS bits with sigreturn() on systems where TM is not supported.
Found with sigfuz kernel selftest on P9.
This fixes CVE-2019-13648.
--- arch/powerpc/kernel/signal_32.c | 3 +++ arch/powerpc/kernel/signal_64.c | 5 +++++ 2 files changed, 8 insertions(+)
arch/powerpc/kernel/signal_32.c +3 -0
@@ -1281,6 +1281,9 @@ long sys_rt_sigreturn(int r3, int r4, in goto bad;if (MSR_TM_ACTIVE (msr_hi<<32 )) { +/* Trying to start TM on non TM system */ +if (!cpu_has_feature (CPU_FTR_TM )) + goto bad;/* We only recheckpoint on return if we're * transaction. */
arch/powerpc/kernel/signal_64.c +5 -0
@@ -741,6 +741,11 @@ int sys_rt_sigreturn(unsigned long r3, uif (MSR_TM_ACTIVE (msr)) {/* We recheckpoint on return. */ struct ucontext __user *uc_transact; + +/* Trying to start TM on non TM system */ +if (!cpu_has_feature (CPU_FTR_TM )) + goto badframe; +if (__get_user (uc_transact, &uc->uc_link)) goto badframe; if (restore_tm_sigcontexts(current, &uc->uc_mcontext,
Greg Kroah-Hartman
maintainerPATCH 210/223 access: avoid the RCU grace period for the temporary subjective credentials
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit d7852fbd0f0423937fa287a598bfde188bb68c22 upstream.
It turns out that 'access()' (and 'faccessat()') can cause a lot of RCU work because it installs a temporary credential that gets allocated and freed for each system call.
The allocation and freeing overhead is mostly benign, but because credentials can be accessed under the RCU read lock, the freeing involves a RCU grace period.
Which is not a huge deal normally, but if you have a lot of access() calls, this causes a fair amount of seconday damage: instead of having a nice alloc/free patterns that hits in hot per-CPU slab caches, you have all those delayed free's, and on big machines with hundreds of cores, the RCU overhead can end up being enormous.
But it turns out that all of this is entirely unnecessary. Exactly because access() only installs the credential as the thread-local subjective credential, the temporary cred pointer doesn't actually need to be RCU free'd at all. Once we're done using it, we can just free it synchronously and avoid all the RCU overhead.
So add a 'non_rcu' flag to 'struct cred', which can be set by users that know they only use it in non-RCU context (there are other potential users for this). We can make it a union with the rcu freeing list head that we need for the RCU case, so this doesn't need any extra storage.
Note that this also makes 'get_current_cred()' clear the new non_rcu flag, in case we have filesystems that take a long-term reference to the cred and then expect the RCU delayed freeing afterwards. It's not entirely clear that this is required, but it makes for clear semantics:
the subjective cred remains non-RCU as long as you only access it synchronously using the thread-local accessors, but you _can_ use it as a generic cred if you want to.
It is possible that we should just remove the whole RCU markings for ->cred entirely. Only ->real_cred is really supposed to be accessed through RCU, and the long-term cred copies that nfs uses might want to explicitly re-enable RCU freeing if required, rather than have get_current_cred() do it implicitly.
But this is a "minimal semantic changes" change for the immediate problem.
--- fs/open.c | 19 +++++++++++++++++++ include/linux/cred.h | 7 ++++++- kernel/cred.c | 21 +++++++++++++++++++-- 3 files changed, 44 insertions(+), 3 deletions(-)
fs/open.c +19 -0
@@ -380,6 +380,25 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con override_cred->cap_permitted; } +/* +* The new set of credentials can *only* be used in +* task-synchronous circumstances, and does not need +* RCU freeing, unless somebody then takes a separate +* reference to it. +* +* NOTE! This is _only_ true because this credential +* is used purely for override_creds() that installs +* it as the subjective cred. Other threads will be +* accessing ->real_cred, not the subjective cred. +* +* If somebody _does_ make a copy of this (using the +* 'get_current_cred()' function), that will clear the +* non_rcu field, because now that other user may be +* expecting RCU freeing. But normal thread-synchronous +* cred accesses will keep things non-RCY. +*/ + override_cred->non_rcu =1 ; + old_cred =override_creds (override_cred); retry: res =user_path_at (dfd, filename, lookup_flags, &path);
include/linux/cred.h +6 -1
@@ -144,7 +144,11 @@ struct cred {struct user_struct *user;/* real user ID subscription */ struct user_namespace *user_ns;/* user_ns the caps and keyrings are relative to. */ struct group_info *group_info;/* supplementary groups for euid/fsgid */ -struct rcu_head rcu;/* RCU deletion hook */ +/* RCU deletion */ +union { +int non_rcu;/* Can we skip RCU deletion? */ +struct rcu_head rcu;/* RCU deletion hook */ + }; };extern void __put_cred (struct cred *);
@@ -242,6 +246,7 @@ static inline const struct cred *get_cre {struct cred *nonconst_cred = (struct cred *) cred;validate_creds (cred); + nonconst_cred->non_rcu =0 ;return get_new_cred (nonconst_cred); }
kernel/cred.c +19 -2
@@ -146,7 +146,10 @@ void __put_cred(struct cred *cred)BUG_ON (cred == current->cred);BUG_ON (cred == current->real_cred); -call_rcu (&cred->rcu, put_cred_rcu); +if (cred->non_rcu) +put_cred_rcu (&cred->rcu); +else +call_rcu (&cred->rcu, put_cred_rcu); }EXPORT_SYMBOL (__put_cred);
@@ -257,6 +260,7 @@ struct cred *prepare_creds(void) old = task->cred;memcpy (new, old,sizeof (struct cred )); + new->non_rcu =0 ;atomic_set (&new->usage,1 );set_cred_subscribers (new,0 );get_group_info (new->group_info);
@@ -536,7 +540,19 @@ const struct cred *override_creds(constvalidate_creds (old);validate_creds (new); -get_cred (new); + +/* +* NOTE! This uses 'get_new_cred()' rather than 'get_cred()'. +* +* That means that we do not clear the 'non_rcu' flag, since +* we are only installing the cred into the thread-synchronous +* '->cred' pointer, not the '->real_cred' pointer that is +* visible to other threads under RCU. +* +* Also note that we did validate_creds() manually, not depending +* on the validation in 'get_cred()'. +*/ +get_new_cred ((struct cred *)new);alter_cred_subscribers (new,1 );rcu_assign_pointer (current->cred, new);alter_cred_subscribers (old,-1 );
@@ -619,6 +635,7 @@ struct cred *prepare_kernel_cred(structvalidate_creds (old); *new = *old; + new->non_rcu =0 ;atomic_set (&new->usage,1 );set_cred_subscribers (new,0 );get_uid (new->user);
Greg Kroah-Hartman
maintainerPATCH 211/223 ipv6: check sk sk_type and protocol early in ip_mroute_set/getsockopt
In reply to Greg Kroah-Hartman[ Upstream commit 99253eb750fda6a644d5188fb26c43bad8d5a745 ]
Commit 5e1859fbcc3c ("ipv4: ipmr: various fixes and cleanups") fixed the issue for ipv4 ipmr:
ip_mroute_setsockopt() & ip_mroute_getsockopt() should not access/set raw_sk(sk)->ipmr_table before making sure the socket is a raw socket, and protocol is IGMP
The same fix should be done for ipv6 ipmr as well.
This patch can fix the panic caused by overwriting the same offset as ipmr_table as in raw_sk(sk) when accessing other type's socket by ip_mroute_setsockopt().
--- net/ipv6/ip6mr.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
net/ipv6/ip6mr.c +8 -3
@@ -1668,6 +1668,10 @@ int ip6_mroute_setsockopt(struct sock *sstruct net *net =sock_net (sk);struct mr6_table *mrt; +if (sk->sk_type !=SOCK_RAW || +inet_sk (sk)->inet_num !=IPPROTO_ICMPV6 ) +return -EOPNOTSUPP ; + mrt =ip6mr_get_table (net,raw6_sk (sk)->ip6mr_table ? :RT6_TABLE_DFLT );if (!mrt)return -ENOENT ;
@@ -1679,9 +1683,6 @@ int ip6_mroute_setsockopt(struct sock *sswitch (optname) {case MRT6_INIT : -if (sk->sk_type !=SOCK_RAW || -inet_sk (sk)->inet_num !=IPPROTO_ICMPV6 ) -return -EOPNOTSUPP ;if (optlen <sizeof (int ))return -EINVAL ;
@@ -1818,6 +1819,10 @@ int ip6_mroute_getsockopt(struct sock *sstruct net *net =sock_net (sk);struct mr6_table *mrt; +if (sk->sk_type !=SOCK_RAW || +inet_sk (sk)->inet_num !=IPPROTO_ICMPV6 ) +return -EOPNOTSUPP ; + mrt =ip6mr_get_table (net,raw6_sk (sk)->ip6mr_table ? :RT6_TABLE_DFLT );if (!mrt)return -ENOENT ;
Greg Kroah-Hartman
maintainerPATCH 212/223 tcp: reset sk_send_head in tcp_write_queue_purge
In reply to Greg Kroah-Hartman[ Upstream commit dbbf2d1e4077bab0c65ece2765d3fc69cf7d610f ]
tcp_write_queue_purge clears all the SKBs in the write queue but does not reset the sk_send_head. As a result, we can have a NULL pointer dereference anywhere that we use tcp_send_head instead of the tcp_write_queue_tail.
For example, after a27fd7a8ed38 (tcp: purge write queue upon RST), we can purge the write queue on RST. Prior to 75c119afe14f (tcp: implement rb-tree based retransmit queue), tcp_push will only check tcp_send_head and then accesses tcp_write_queue_tail to send the actual SKB. As a result, it will dereference a NULL pointer.
This has been reported twice for 4.14 where we don't have 75c119afe14f:
By Timofey Titovets:
[ 422.081094] BUG: unable to handle kernel NULL pointer dereference at 0000000000000038 [ 422.081254] IP: tcp_push+0x42/0x110 [ 422.081314] PGD 0 P4D 0 [ 422.081364] Oops: 0002 [#1] SMP PTI
By Yongjian Xu:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000038 IP: tcp_push+0x48/0x120 PGD 80000007ff77b067 P4D 80000007ff77b067 PUD 7fd989067 PMD 0 Oops: 0002 [#18] SMP PTI Modules linked in: tcp_diag inet_diag tcp_bbr sch_fq iTCO_wdt
iTCO_vendor_support pcspkr ixgbe mdio i2c_i801 lpc_ich joydev input_leds shpchp e1000e igb dca ptp pps_core hwmon mei_me mei ipmi_si ipmi_msghandler sg ses scsi_transport_sas enclosure ext4 jbd2 mbcache sd_mod ahci libahci megaraid_sas wmi ast ttm dm_mirror dm_region_hash dm_log dm_mod dax
CPU: 6 PID: 14156 Comm: [ET_NET 6] Tainted: G D 4.14.26-1.el6.x86_64 #1 Hardware name: LENOVO ThinkServer RD440 /ThinkServer RD440, BIOS A0TS80A 09/22/2014 task: ffff8807d78d8140 task.stack: ffffc9000e944000 RIP: 0010:tcp_push+0x48/0x120 RSP: 0018:ffffc9000e947a88 EFLAGS: 00010246 RAX: 00000000000005b4 RBX: ffff880f7cce9c00 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000040 RDI: ffff8807d00f5000 RBP: ffffc9000e947aa8 R08: 0000000000001c84 R09: 0000000000000000 R10: ffff8807d00f5158 R11: 0000000000000000 R12: ffff8807d00f5000 R13: 0000000000000020 R14: 00000000000256d4 R15: 0000000000000000 FS: 00007f5916de9700(0000) GS:ffff88107fd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000038 CR3: 00000007f8226004 CR4: 00000000001606e0 Call Trace: tcp_sendmsg_locked+0x33d/0xe50 tcp_sendmsg+0x37/0x60 inet_sendmsg+0x39/0xc0 sock_sendmsg+0x49/0x60 sock_write_iter+0xb6/0x100 do_iter_readv_writev+0xec/0x130 ? rw_verify_area+0x49/0xb0 do_iter_write+0x97/0xd0 vfs_writev+0x7e/0xe0 ? __wake_up_common_lock+0x80/0xa0 ? __fget_light+0x2c/0x70 ? __do_page_fault+0x1e7/0x530 do_writev+0x60/0xf0 ? inet_shutdown+0xac/0x110 SyS_writev+0x10/0x20 do_syscall_64+0x6f/0x140 ? prepare_exit_to_usermode+0x8b/0xa0 entry_SYSCALL_64_after_hwframe+0x3d/0xa2 RIP: 0033:0x3135ce0c57 RSP: 002b:00007f5916de4b00 EFLAGS: 00000293 ORIG_RAX: 0000000000000014 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 0000003135ce0c57 RDX: 0000000000000002 RSI: 00007f5916de4b90 RDI: 000000000000606f RBP: 0000000000000000 R08: 0000000000000000 R09: 00007f5916de8c38 R10: 0000000000000000 R11: 0000000000000293 R12: 00000000000464cc R13: 00007f5916de8c30 R14: 00007f58d8bef080 R15: 0000000000000002 Code: 48 8b 97 60 01 00 00 4c 8d 97 58 01 00 00 41 b9 00 00 00 00 41 89 f3 4c 39 d2 49 0f 44 d1 41 81 e3 00 80 00 00 0f 85 b0 00 00 00 <80> 4a 38 08 44 8b 8f 74 06 00 00 44 89 8f 7c 06 00 00 83 e6 01 RIP: tcp_push+0x48/0x120 RSP: ffffc9000e947a88 CR2: 0000000000000038 ---[ end trace 8d545c2e93515549 ]---
There is other scenario which found in stable 4.4:
Allocated:
[<ffffffff82f380a6>] __alloc_skb+0xe6/0x600 net/core/skbuff.c:218 [<ffffffff832466c3>] alloc_skb_fclone include/linux/skbuff.h:856 [inline] [<ffffffff832466c3>] sk_stream_alloc_skb+0xa3/0x5d0 net/ipv4/tcp.c:833 [<ffffffff83249164>] tcp_sendmsg+0xd34/0x2b00 net/ipv4/tcp.c:1178 [<ffffffff83300ef3>] inet_sendmsg+0x203/0x4d0 net/ipv4/af_inet.c:755 Freed: [<ffffffff82f372fd>] __kfree_skb+0x1d/0x20 net/core/skbuff.c:676 [<ffffffff83288834>] sk_wmem_free_skb include/net/sock.h:1447 [inline] [<ffffffff83288834>] tcp_write_queue_purge include/net/tcp.h:1460 [inline] [<ffffffff83288834>] tcp_connect_init net/ipv4/tcp_output.c:3122 [inline] [<ffffffff83288834>] tcp_connect+0xb24/0x30c0 net/ipv4/tcp_output.c:3261 [<ffffffff8329b991>] tcp_v4_connect+0xf31/0x1890 net/ipv4/tcp_ipv4.c:246 BUG: KASAN: use-after-free in tcp_skb_pcount include/net/tcp.h:796 [inline] BUG: KASAN: use-after-free in tcp_init_tso_segs net/ipv4/tcp_output.c:1619 [inline] BUG: KASAN: use-after-free in tcp_write_xmit+0x3fc2/0x4cb0 net/ipv4/tcp_output.c:2056 [<ffffffff81515cd5>] kasan_report.cold.7+0x175/0x2f7 mm/kasan/report.c:408 [<ffffffff814f9784>] __asan_report_load2_noabort+0x14/0x20 mm/kasan/report.c:427 [<ffffffff83286582>] tcp_skb_pcount include/net/tcp.h:796 [inline] [<ffffffff83286582>] tcp_init_tso_segs net/ipv4/tcp_output.c:1619 [inline] [<ffffffff83286582>] tcp_write_xmit+0x3fc2/0x4cb0 net/ipv4/tcp_output.c:2056 [<ffffffff83287a40>] __tcp_push_pending_frames+0xa0/0x290 net/ipv4/tcp_output.c:2307
stable 4.4 and stable 4.9 don't have the commit abb4a8b870b5 ("tcp: purge write queue upon RST") which is referred in dbbf2d1e4077,
in tcp_connect_init, it calls tcp_write_queue_purge, and does not reset sk_send_head, then UAF.
stable 4.14 have the commit abb4a8b870b5 ("tcp: purge write queue upon RST"), in tcp_reset, it calls tcp_write_queue_purge(sk), and does not reset sk_send_head, then UAF.
So this patch can be used to fix stable 4.4 and 4.9.
--- include/net/tcp.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
include/net/tcp.h +6 -5
@@ -1512,6 +1512,11 @@ struct sock *tcp_try_fastopen(struct socvoid tcp_fastopen_init_key_once (bool publish);#define TCP_FASTOPEN_KEY_LENGTH 16 +static inline void tcp_init_send_head (struct sock *sk) +{ + sk->sk_send_head =NULL ; +} +/* Fastopen key context */ struct tcp_fastopen_context {struct crypto_cipher *tfm;
@@ -1528,6 +1533,7 @@ static inline void tcp_write_queue_purgesk_wmem_free_skb (sk, skb);sk_mem_reclaim (sk);tcp_clear_all_retrans_hints (tcp_sk (sk)); +tcp_init_send_head (sk);inet_csk (sk)->icsk_backoff =0 ; }
@@ -1589,11 +1595,6 @@ static inline void tcp_check_send_head(stcp_sk (sk)->highest_sack =NULL ; } -static inline void tcp_init_send_head (struct sock *sk) -{ - sk->sk_send_head =NULL ; -} -static inline void __tcp_add_write_queue_tail (struct sock *sk,struct sk_buff *skb) {__skb_queue_tail (&sk->sk_write_queue, skb);
Greg Kroah-Hartman
maintainerPATCH 213/223 arm64: dts: marvell: Fix A37xx UART0 register size
In reply to Greg Kroah-HartmanFrom: allen yan <[email protected]>
commit c737abc193d16e62e23e2fb585b8b7398ab380d8 upstream.
Armada-37xx UART0 registers are 0x200 bytes wide. Right next to them are the UART1 registers that should not be declared in this node.
Update the example in DT bindings document accordingly.
--- Documentation/devicetree/bindings/serial/mvebu-uart.txt | 2 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/serial/mvebu-uart.txt +1 -1
@@ -8,6 +8,6 @@ Required properties: Example: serial@12000 { compatible = "marvell,armada-3700-uart"; - reg = <0x12000 0x400>; + reg = <0x12000 0x200>; interrupts = <43>; };
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +1 -1
@@ -96,7 +96,7 @@ uart0: serial@12000 { compatible = "marvell,armada-3700-uart"; - reg = <0x12000 0x400>; + reg = <0x12000 0x200>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 214/223 i2c: qup: fixed releasing dma without flush operation completion
In reply to Greg Kroah-HartmanFrom: Abhishek Sahu <[email protected]>
commit 7239872fb3400b21a8f5547257f9f86455867bd6 upstream.
The QUP BSLP BAM generates the following error sometimes if the current I2C DMA transfer fails and the flush operation has been scheduled
“bam-dma-engine 7884000.dma: Cannot free busy channel”
If any I2C error comes during BAM DMA transfer, then the QUP I2C interrupt will be generated and the flush operation will be carried out to make I2C consume all scheduled DMA transfer. Currently, the same completion structure is being used for BAM transfer which has already completed without reinit. It will make flush operation wait_for_completion_timeout completed immediately and will proceed for freeing the DMA resources where the descriptors are still in process.
--- drivers/i2c/busses/i2c-qup.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/i2c/busses/i2c-qup.c +2 -0
@@ -808,6 +808,8 @@ static int qup_i2c_bam_do_xfer(struct qu }if (ret || qup->bus_err || qup->qup_err) { +reinit_completion (&qup->xfer); +if (qup_i2c_change_state (qup,QUP_RUN_STATE )) {dev_err (qup->dev,"change to run state timed out" ); goto desc_err;
Greg Kroah-Hartman
maintainerPATCH 215/223 arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 24951465cbd279f60b1fdc2421b3694405bcff42 upstream.
arch/arm/ defines a SIGMINSTKSZ of 2k, so we should use the same value for compat tasks.
--- arch/arm64/include/asm/compat.h | 1 + 1 file changed, 1 insertion(+)
arch/arm64/include/asm/compat.h +1 -0
@@ -234,6 +234,7 @@ static inline compat_uptr_t ptr_to_compa }#define compat_user_stack_pointer () (user_stack_pointer(task_pt_regs(current))) +#define COMPAT_MINSIGSTKSZ 2048static inline void __user *arch_compat_alloc_user_space (long len) {
Greg Kroah-Hartman
maintainerPATCH 216/223 ISDN: hfcsusb: checking idx of ep configuration
In reply to Greg Kroah-HartmanFrom: Phong Tran <[email protected]>
commit f384e62a82ba5d85408405fdd6aeff89354deaa9 upstream.
The syzbot test with random endpoint address which made the idx is overflow in the table of endpoint configuations.
this adds the checking for fixing the error report from syzbot
KASAN: stack-out-of-bounds Read in hfcsusb_probe [1]
The patch tested by syzbot [2]
[1]:
https://syzkaller.appspot.com/bug?id=30a04378dac680c5d521304a00a86156bb913522
[2]:
https://groups.google.com/d/msg/syzkaller-bugs/_6HBdge8F3E/OJn7wVNpBAAJ
--- drivers/isdn/hardware/mISDN/hfcsusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/isdn/hardware/mISDN/hfcsusb.c +3 -0
@@ -1963,6 +1963,9 @@ hfcsusb_probe(struct usb_interface *intf/* get endpoint base */ idx = ((ep_addr &0x7f ) -1 ) *2 ; +if (idx >15 ) +return -EIO ; +if (ep_addr &0x80 ) idx++; attr = ep->desc.bmAttributes;
Greg Kroah-Hartman
maintainerPATCH 217/223 media: au0828: fix null dereference in error path
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit 6d0d1ff9ff21fbb06b867c13a1d41ce8ddcd8230 upstream.
au0828_usb_disconnect() gets the au0828_dev struct via usb_get_intfdata, so it needs to set up for the error paths.
--- drivers/media/usb/au0828/au0828-core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/media/usb/au0828/au0828-core.c +6 -6
@@ -630,6 +630,12 @@ static int au0828_usb_probe(struct usb_i/* Setup */ au0828_card_setup (dev); +/* +* Store the pointer to the au0828_dev so it can be accessed in +* au0828_usb_disconnect +*/ +usb_set_intfdata (interface, dev); +/* Analog TV */ retval =au0828_analog_register (dev, interface);if (retval) {
@@ -647,12 +653,6 @@ static int au0828_usb_probe(struct usb_i/* Remote controller */ au0828_rc_register (dev); -/* -* Store the pointer to the au0828_dev so it can be accessed in -* au0828_usb_disconnect -*/ -usb_set_intfdata (interface, dev); -pr_info ("Registered device AU0828 [%s]\n" , dev->board.name ==NULL ?"Unset" : dev->board.name);
Greg Kroah-Hartman
maintainerPATCH 218/223 media: cpia2_usb: first wake up, then free in disconnect
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit eff73de2b1600ad8230692f00bc0ab49b166512a upstream.
Kasan reported a use after free in cpia2_usb_disconnect() It first freed everything and then woke up those waiting. The reverse order is correct.
--- drivers/media/usb/cpia2/cpia2_usb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/cpia2/cpia2_usb.c +2 -1
@@ -909,7 +909,6 @@ static void cpia2_usb_disconnect(structcpia2_unregister_camera (cam);v4l2_device_disconnect (&cam->v4l2_dev);mutex_unlock (&cam->v4l2_lock); -v4l2_device_put (&cam->v4l2_dev);if (cam->buffers) {DBG ("Wakeup waiting processes\n" );
@@ -921,6 +920,8 @@ static void cpia2_usb_disconnect(structDBG ("Releasing interface\n" );usb_driver_release_interface (&cpia2_driver, intf); +v4l2_device_put (&cam->v4l2_dev); +LOG ("CPiA2 camera disconnected.\n" ); }
Greg Kroah-Hartman
maintainerPATCH 219/223 media: radio-raremono: change devm_k*alloc to k*alloc
In reply to Greg Kroah-HartmanFrom: Luke Nowakowski-Krijger <[email protected]>
commit c666355e60ddb4748ead3bdd983e3f7f2224aaf0 upstream.
Change devm_k*alloc to k*alloc to manually allocate memory
The manual allocation and freeing of memory is necessary because when the USB radio is disconnected, the memory associated with devm_k*alloc is freed. Meaning if we still have unresolved references to the radio device, then we get use-after-free errors.
This patch fixes this by manually allocating memory, and freeing it in the v4l2.release callback that gets called when the last radio device exits.
--- drivers/media/radio/radio-raremono.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/media/radio/radio-raremono.c +23 -7
@@ -283,6 +283,14 @@ static int vidioc_g_frequency(struct filreturn 0 ; } +static void raremono_device_release (struct v4l2_device *v4l2_dev) +{ +struct raremono_device *radio =to_raremono_dev (v4l2_dev); + +kfree (radio->buffer); +kfree (radio); +} +/* File system interface */ static const struct v4l2_file_operations usb_raremono_fops = { .owner =THIS_MODULE ,
@@ -307,12 +315,14 @@ static int usb_raremono_probe(struct usbstruct raremono_device *radio;int retval =0 ; - radio =devm_kzalloc (&intf->dev,sizeof (struct raremono_device ),GFP_KERNEL ); -if (radio) - radio->buffer =devm_kmalloc (&intf->dev,BUFFER_LENGTH ,GFP_KERNEL ); - -if (!radio || !radio->buffer) + radio =kzalloc (sizeof (*radio),GFP_KERNEL ); +if (!radio) +return -ENOMEM ; + radio->buffer =kmalloc (BUFFER_LENGTH ,GFP_KERNEL ); +if (!radio->buffer) { +kfree (radio);return -ENOMEM ; + } radio->usbdev =interface_to_usbdev (intf); radio->intf = intf;
@@ -336,7 +346,8 @@ static int usb_raremono_probe(struct usbif (retval !=3 || (get_unaligned_be16 (&radio->buffer[1 ]) &0xfff ) ==0x0242 ) {dev_info (&intf->dev,"this is not Thanko's Raremono.\n" ); -return -ENODEV ; + retval = -ENODEV ; + goto free_mem; } dev_info(&intf->dev, "Thanko's Raremono connected: (%04X:%04X)\n",
@@ -345,7 +356,7 @@ static int usb_raremono_probe(struct usb retval =v4l2_device_register (&intf->dev, &radio->v4l2_dev);if (retval <0 ) {dev_err (&intf->dev,"couldn't register v4l2_device\n" ); -return retval; + goto free_mem; }mutex_init (&radio->lock);
@@ -357,6 +368,7 @@ static int usb_raremono_probe(struct usb radio->vdev.ioctl_ops = &usb_raremono_ioctl_ops; radio->vdev.lock = &radio->lock; radio->vdev.release = video_device_release_empty; + radio->v4l2_dev.release = raremono_device_release;usb_set_intfdata (intf, &radio->v4l2_dev);
@@ -372,6 +384,10 @@ static int usb_raremono_probe(struct usb }dev_err (&intf->dev,"could not register video device\n" );v4l2_device_unregister (&radio->v4l2_dev); + +free_mem: +kfree (radio->buffer); +kfree (radio);return retval; }
Greg Kroah-Hartman
maintainerPATCH 220/223 Bluetooth: hci_uart: check for missing tty operations
In reply to Greg Kroah-HartmanFrom: Vladis Dronov <[email protected]>
commit b36a1552d7319bbfd5cf7f08726c23c5c66d4f73 upstream.
Certain ttys operations (pty_unix98_ops) lack tiocmget() and tiocmset() functions which are called by the certain HCI UART protocols (hci_ath, hci_bcm, hci_intel, hci_mrvl, hci_qca) via hci_uart_set_flow_control() or directly. This leads to an execution at NULL and can be triggered by an unprivileged user. Fix this by adding a helper function and a check for the missing tty operations in the protocols code.
This fixes CVE-2019-10207. The Fixes: lines list commits where calls to tiocm[gs]et() or hci_uart_set_flow_control() were added to the HCI UART protocols.
--- drivers/bluetooth/hci_ath.c | 3 +++ drivers/bluetooth/hci_bcm.c | 3 +++ drivers/bluetooth/hci_intel.c | 3 +++ drivers/bluetooth/hci_ldisc.c | 9 +++++++++ drivers/bluetooth/hci_mrvl.c | 3 +++ drivers/bluetooth/hci_uart.h | 1 + 6 files changed, 22 insertions(+)
drivers/bluetooth/hci_ath.c +3 -0
@@ -101,6 +101,9 @@ static int ath_open(struct hci_uart *hu)BT_DBG ("hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + ath =kzalloc (sizeof (*ath),GFP_KERNEL );if (!ath)return -ENOMEM ;
drivers/bluetooth/hci_bcm.c +3 -0
@@ -279,6 +279,9 @@ static int bcm_open(struct hci_uart *hu)bt_dev_dbg (hu->hdev,"hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + bcm =kzalloc (sizeof (*bcm),GFP_KERNEL );if (!bcm)return -ENOMEM ;
drivers/bluetooth/hci_intel.c +3 -0
@@ -407,6 +407,9 @@ static int intel_open(struct hci_uart *hBT_DBG ("hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + intel =kzalloc (sizeof (*intel),GFP_KERNEL );if (!intel)return -ENOMEM ;
drivers/bluetooth/hci_ldisc.c +9 -0
@@ -263,6 +263,15 @@ static int hci_uart_send_frame(struct hcreturn 0 ; } +/* Check the underlying device or tty has flow control support */ +bool hci_uart_has_flow_control (struct hci_uart *hu) +{ +if (hu->tty->driver->ops->tiocmget && hu->tty->driver->ops->tiocmset) +return true; + +return false; +} +/* Flow control or un-flow control the device */ void hci_uart_set_flow_control (struct hci_uart *hu,bool enable) {
drivers/bluetooth/hci_mrvl.c +3 -0
@@ -66,6 +66,9 @@ static int mrvl_open(struct hci_uart *huBT_DBG ("hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + mrvl =kzalloc (sizeof (*mrvl),GFP_KERNEL );if (!mrvl)return -ENOMEM ;
drivers/bluetooth/hci_uart.h +1 -0
@@ -109,6 +109,7 @@ int hci_uart_tx_wakeup(struct hci_uart *int hci_uart_init_ready (struct hci_uart *hu);void hci_uart_init_tty (struct hci_uart *hu);void hci_uart_set_baudrate (struct hci_uart *hu,unsigned int speed); +bool hci_uart_has_flow_control (struct hci_uart *hu);void hci_uart_set_flow_control (struct hci_uart *hu,bool enable);void hci_uart_set_speeds (struct hci_uart *hu,unsigned int init_speed,unsigned int oper_speed);
Greg Kroah-Hartman
maintainerPATCH 221/223 sched/fair: Dont free p->numa_faults with concurrent readers
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 16d51a590a8ce3befb1308e0e7ab77f3b661af33 upstream.
When going through execve(), zero out the NUMA fault statistics instead of freeing them.
During execve, the task is reachable through procfs and the scheduler. A concurrent /proc/*/sched reader can read data from a freed ->numa_faults allocation (confirmed by KASAN) and write it back to userspace. I believe that it would also be possible for a use-after-free read to occur through a race between a NUMA fault and execve(): task_numa_fault() can lead to task_numa_compare(), which invokes task_weight() on the currently running task of a different CPU.
Another way to fix this would be to make ->numa_faults RCU-managed or add extra locking, but it seems easier to wipe the NUMA fault statistics on execve.
--- fs/exec.c | 2 +- include/linux/sched.h | 4 ++-- kernel/fork.c | 2 +- kernel/sched/fair.c | 24 ++++++++++++++++++++---- 4 files changed, 24 insertions(+), 8 deletions(-)
fs/exec.c +1 -1
@@ -1790,7 +1790,7 @@ static int do_execveat_common(int fd, st current->fs->in_exec =0 ; current->in_execve =0 ;acct_update_integrals (current); -task_numa_free (current); +task_numa_free (current, false);free_bprm (bprm);kfree (pathbuf);putname (filename);
include/linux/sched.h +2 -2
@@ -2044,7 +2044,7 @@ static inline bool in_vfork(struct task_extern void task_numa_fault (int last_node,int node,int pages,int flags);extern pid_t task_numa_group_id (struct task_struct *p);extern void set_numabalancing_state (bool enabled); -extern void task_numa_free (struct task_struct *p); +extern void task_numa_free (struct task_struct *p,bool final);extern bool should_numa_migrate_memory (struct task_struct *p,struct page *page,int src_nid,int dst_cpu);#else
@@ -2059,7 +2059,7 @@ static inline pid_t task_numa_group_id(sstatic inline void set_numabalancing_state (bool enabled) { } -static inline void task_numa_free (struct task_struct *p) +static inline void task_numa_free (struct task_struct *p,bool final) { } static inline bool should_numa_migrate_memory(struct task_struct *p,
kernel/fork.c +1 -1
@@ -389,7 +389,7 @@ void __put_task_struct(struct task_strucWARN_ON (tsk == current);cgroup_free (tsk); -task_numa_free (tsk); +task_numa_free (tsk, true);security_task_free (tsk);exit_creds (tsk);delayacct_tsk_free (tsk);
kernel/sched/fair.c +20 -4
@@ -2257,13 +2257,23 @@ no_join:return ; } -void task_numa_free (struct task_struct *p) +/* +* Get rid of NUMA staticstics associated with a task (either current or dead). +* If @final is set, the task is dead and has reached refcount zero, so we can +* safely free all relevant data structures. Otherwise, there might be +* concurrent reads from places like load balancing and procfs, and we should +* reset the data back to default state without freeing ->numa_faults. +*/ +void task_numa_free (struct task_struct *p,bool final) {struct numa_group *grp = p->numa_group; -void *numa_faults = p->numa_faults; +unsigned long *numa_faults = p->numa_faults;unsigned long flags;int i; +if (!numa_faults) +return ; +if (grp) {spin_lock_irqsave (&grp->lock, flags);for (i =0 ; i <NR_NUMA_HINT_FAULT_STATS * nr_node_ids; i++)
@@ -2276,8 +2286,14 @@ void task_numa_free(struct task_struct *put_numa_group (grp); } - p->numa_faults =NULL ; -kfree (numa_faults); +if (final) { + p->numa_faults =NULL ; +kfree (numa_faults); + }else { + p->total_numa_faults =0 ; +for (i =0 ; i <NR_NUMA_HINT_FAULT_STATS * nr_node_ids; i++) + numa_faults[i] =0 ; + } }/*
Greg Kroah-Hartman
maintainerPATCH 222/223 drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
In reply to Greg Kroah-HartmanFrom: Miroslav Lichvar <[email protected]>
commit 5515e9a6273b8c02034466bcbd717ac9f53dab99 upstream.
The PPS assert/clear offset corrections are set by the PPS_SETPARAMS ioctl in the pps_ktime structs, which also contain flags. The flags are not initialized by applications (using the timepps.h header) and they are not used by the kernel for anything except returning them back in the PPS_GETPARAMS ioctl.
Set the flags to zero to make it clear they are unused and avoid leaking uninitialized data of the PPS_SETPARAMS caller to other applications that have a read access to the PPS device.
--- drivers/pps/pps.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pps/pps.c +8 -0
@@ -129,6 +129,14 @@ static long pps_cdev_ioctl(struct file * pps->params.mode |=PPS_CANWAIT ; pps->params.api_version =PPS_API_VERS ; +/* +* Clear unused fields of pps_kparams to avoid leaking +* uninitialized data of the PPS_SETPARAMS caller via +* PPS_GETPARAMS +*/ + pps->params.assert_off_tu.flags =0 ; + pps->params.clear_off_tu.flags =0 ; +spin_unlock_irq (&pps->lock);break ;
Greg Kroah-Hartman
maintainerPATCH 223/223 ceph: hold i_ceph_lock when removing caps for freeing inode
In reply to Greg Kroah-HartmanFrom: Yan, Zheng <[email protected]>
commit d6e47819721ae2d9d090058ad5570a66f3c42e39 upstream.
ceph_d_revalidate(, LOOKUP_RCU) may call __ceph_caps_issued_mask() on a freeing inode.
--- fs/ceph/caps.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/ceph/caps.c +5 -2
@@ -1081,20 +1081,23 @@ static int send_cap_msg(struct ceph_mds_ }/* -* Queue cap releases when an inode is dropped from our cache. Since -* inode is about to be destroyed, there is no need for i_ceph_lock. +* Queue cap releases when an inode is dropped from our cache. */ void ceph_queue_caps_release (struct inode *inode) {struct ceph_inode_info *ci =ceph_inode (inode);struct rb_node *p; +/* lock i_ceph_lock, because ceph_d_revalidate(..., LOOKUP_RCU) +* may call __ceph_caps_issued_mask() on a freeing inode. */ +spin_lock (&ci->i_ceph_lock); p =rb_first (&ci->i_caps);while (p) { struct ceph_cap *cap = rb_entry(p, struct ceph_cap, ci_node); p =rb_next (p);__ceph_remove_cap (cap, true); } +spin_unlock (&ci->i_ceph_lock); }/*
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.187 release. There are 223 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun 04 Aug 2019 09:19:34 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.187-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra...
Test results for stable-v4.9:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
24 tests: 24 pass, 0 failLinux version: 4.9.187-rc1-g5380ded2525d
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Thierry
stable-rc/linux-4.9.y boot: 101 boots: 0 failed, 66 passed with 35 offline (v4.9.186-224-g5380ded2525d)
stable-rc/linux-4.9.y boot: 101 boots: 0 failed, 66 passed with 35 offline (v4.9.186-224-g5380ded2525d)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.9.y/kernel/v4.9.186-224-g5380ded2525d/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.9.y/kernel/v4.9.186-224-g5380ded2525d/
Tree: stable-rc
Branch: linux-4.9.y
Git Describe: v4.9.186-224-g5380ded2525d
Git Commit: 5380ded2525da1be5103e3f0f33129dcbffa3add
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 50 unique boards, 23 SoC families, 15 builds out of 197
Offline Platforms:
arm64:
defconfig:
gcc-8
meson-gxbb-odroidc2: 1 offline lab
arm:
tegra_defconfig:
gcc-8
tegra20-iris-512: 1 offline lab
exynos_defconfig:
gcc-8
exynos5250-arndale: 1 offline lab
exynos5420-arndale-octa: 1 offline lab
exynos5800-peach-pi: 1 offline lab
multi_v7_defconfig:
gcc-8
bcm72521-bcm97252sffe: 1 offline lab
bcm7445-bcm97445c: 1 offline lab
exynos5250-arndale: 1 offline lab
exynos5420-arndale-octa: 1 offline lab
exynos5800-peach-pi: 1 offline lab
imx6dl-wandboard_dual: 1 offline lab
imx6dl-wandboard_solo: 1 offline lab
imx6q-wandboard: 1 offline lab
imx7s-warp: 1 offline lab
meson8b-odroidc1: 1 offline lab
omap3-beagle: 1 offline lab
omap4-panda: 1 offline lab
qcom-apq8064-ifc6410: 1 offline lab
stih410-b2120: 1 offline lab
sun4i-a10-cubieboard: 1 offline lab
sun7i-a20-bananapi: 1 offline lab
tegra20-iris-512: 1 offline lab
vf610-colibri-eval-v3: 1 offline lab
omap2plus_defconfig:
gcc-8
omap3-beagle: 1 offline lab
omap4-panda: 1 offline lab
qcom_defconfig:
gcc-8
qcom-apq8064-ifc6410: 1 offline lab
davinci_all_defconfig:
gcc-8
da850-evm: 1 offline lab
dm365evm,legacy: 1 offline lab
imx_v6_v7_defconfig:
gcc-8
imx6dl-wandboard_dual: 1 offline lab
imx6dl-wandboard_solo: 1 offline lab
imx6q-wandboard: 1 offline lab
imx7s-warp: 1 offline lab
vf610-colibri-eval-v3: 1 offline lab
sunxi_defconfig:
gcc-8
sun4i-a10-cubieboard: 1 offline lab
sun7i-a20-bananapi: 1 offline lab
---
For more info write to <[email protected]>
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.187 release. There are 223 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun 04 Aug 2019 09:19:34 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.187-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.9.187-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.9.y
git commit: 5380ded2525da1be5103e3f0f33129dcbffa3add
git describe: v4.9.186-224-g5380ded2525d
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.9-oe/build/v4.9.186-224-g5380ded2525d
No regressions (compared to build v4.9.186)
No fixes (compared to build v4.9.186)
Ran 23662 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* network-basic-tests
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.187 release. There are 223 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun 04 Aug 2019 09:19:34 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.187-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.187 release. There are 223 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun 04 Aug 2019 09:19:34 AM UTC. Anything received after that time might be too late.
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 333 pass: 333 fail: 0
Guenter