4.9.206-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 1/125 ASoC: compress: fix unsigned integer overflow check
In reply to Greg Kroah-HartmanFrom: Xiaojun Sang <[email protected]>
[ Upstream commit d3645b055399538415586ebaacaedebc1e5899b0 ]
Parameter fragments and fragment_size are type of u32. U32_MAX is the correct check.
--- sound/core/compress_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/compress_offload.c +1 -1
@@ -529,7 +529,7 @@ static int snd_compress_check_input(struct snd_compr_params *params) {/* first let's check the buffer parameter's */ if (params->buffer.fragment_size ==0 || - params->buffer.fragments >INT_MAX / params->buffer.fragment_size || + params->buffer.fragments >U32_MAX / params->buffer.fragment_size || params->buffer.fragments ==0 )return -EINVAL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/125 mac80211: fix station inactive_time shortly after boot
In reply to Greg Kroah-HartmanFrom: Ahmed Zaki <[email protected]>
[ Upstream commit 285531f9e6774e3be71da6673d475ff1a088d675 ]
In the first 5 minutes after boot (time of INITIAL_JIFFIES), ieee80211_sta_last_active() returns zero if last_ack is zero. This leads to "inactive time" showing jiffies_to_msecs(jiffies).
# iw wlan0 station get fc:ec:da:64:a6:dd Station fc:ec:da:64:a6:dd (on wlan0) inactive time: 4294894049 ms . . connected time: 70 seconds
Fix by returning last_rx if last_ack == 0.
--- net/mac80211/sta_info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/sta_info.c +2 -1
@@ -2305,7 +2305,8 @@ unsigned long ieee80211_sta_last_active(struct sta_info *sta) {struct ieee80211_sta_rx_stats *stats =sta_get_last_rx_stats (sta); -if (time_after (stats->last_rx, sta->status_stats.last_ack)) +if (!sta->status_stats.last_ack || +time_after (stats->last_rx, sta->status_stats.last_ack))return stats->last_rx;return sta->status_stats.last_ack; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/125 scsi: lpfc: Fix dif and first burst use in write commands
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 7c4042a4d0b7532cfbc90478fd3084b2dab5849e ]
When dif and first burst is used in a write command wqe, the driver was not properly setting fields in the io command request. This resulted in no dif bytes being sent and invalid xfer_rdy's, resulting in the io being aborted by the hardware.
Correct the wqe initializaton when both dif and first burst are used.
--- drivers/scsi/lpfc/lpfc_scsi.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/scsi/lpfc/lpfc_scsi.c +18 -0
@@ -2707,6 +2707,7 @@ lpfc_bg_scsi_prep_dma_buf_s3(struct lpfc_hba *phba,int datasegcnt, protsegcnt, datadir = scsi_cmnd->sc_data_direction;int prot_group_type =0 ;int fcpdl; +struct lpfc_vport *vport = phba->pport;/* * Start the lpfc command prep by bumping the bpl beyond fcp_cmnd
@@ -2812,6 +2813,14 @@ lpfc_bg_scsi_prep_dma_buf_s3(struct lpfc_hba *phba,*/ iocb_cmd->un.fcpi.fcpi_parm = fcpdl; +/* +* For First burst, we may need to adjust the initial transfer +* length for DIF +*/ +if (iocb_cmd->un.fcpi.fcpi_XRdy && + (fcpdl < vport->cfg_first_burst_size)) + iocb_cmd->un.fcpi.fcpi_XRdy = fcpdl; +return 0 ; err:if (lpfc_cmd->seg_cnt)
@@ -3364,6 +3373,7 @@ lpfc_bg_scsi_prep_dma_buf_s4(struct lpfc_hba *phba,int datasegcnt, protsegcnt, datadir = scsi_cmnd->sc_data_direction;int prot_group_type =0 ;int fcpdl; +struct lpfc_vport *vport = phba->pport;/* * Start the lpfc command prep by bumping the sgl beyond fcp_cmnd
@@ -3479,6 +3489,14 @@ lpfc_bg_scsi_prep_dma_buf_s4(struct lpfc_hba *phba,*/ iocb_cmd->un.fcpi.fcpi_parm = fcpdl; +/* +* For First burst, we may need to adjust the initial transfer +* length for DIF +*/ +if (iocb_cmd->un.fcpi.fcpi_XRdy && + (fcpdl < vport->cfg_first_burst_size)) + iocb_cmd->un.fcpi.fcpi_XRdy = fcpdl; +/* * If the OAS driver feature is enabled and the lun is enabled for * OAS, set the oas iocb related flags.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/125 pwm: bcm-iproc: Prevent unloading the driver module while in use
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 24906a41eecb73d51974ade0847c21e429beec60 ]
The owner member of struct pwm_ops must be set to THIS_MODULE to increase the reference count of the module such that the module cannot be removed while its code is in use.
--- drivers/pwm/pwm-bcm-iproc.c | 1 + 1 file changed, 1 insertion(+)
drivers/pwm/pwm-bcm-iproc.c +1 -0
@@ -187,6 +187,7 @@ static int iproc_pwmc_apply(struct pwm_chip *chip, struct pwm_device *pwm,static const struct pwm_ops iproc_pwm_ops = { .apply = iproc_pwmc_apply, .get_state = iproc_pwmc_get_state, + .owner =THIS_MODULE , };static int iproc_pwmc_probe (struct platform_device *pdev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/125 ARM: debug-imx: only define DEBUG_IMX_UART_PORT if needed
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 7c41ea57beb2aee96fa63091a457b1a2826f3c42 ]
If debugging on i.MX is enabled DEBUG_IMX_UART_PORT defines which UART is used for the debug output. If however debugging is off don't only hide the then unused config item but drop it completely by using a dependency instead of a conditional prompt.
This fixes DEBUG_IMX_UART_PORT being present in the kernel config even if DEBUG_LL is disabled.
--- arch/arm/Kconfig.debug | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/arm/Kconfig.debug +14 -14
@@ -1340,21 +1340,21 @@ config DEBUG_OMAP2PLUS_UART depends on ARCH_OMAP2PLUS config DEBUG_IMX_UART_PORT - int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \ - DEBUG_IMX25_UART || \ - DEBUG_IMX21_IMX27_UART || \ - DEBUG_IMX31_UART || \ - DEBUG_IMX35_UART || \ - DEBUG_IMX50_UART || \ - DEBUG_IMX51_UART || \ - DEBUG_IMX53_UART || \ - DEBUG_IMX6Q_UART || \ - DEBUG_IMX6SL_UART || \ - DEBUG_IMX6SX_UART || \ - DEBUG_IMX6UL_UART || \ - DEBUG_IMX7D_UART + int "i.MX Debug UART Port Selection" + depends on DEBUG_IMX1_UART || \ + DEBUG_IMX25_UART || \ + DEBUG_IMX21_IMX27_UART || \ + DEBUG_IMX31_UART || \ + DEBUG_IMX35_UART || \ + DEBUG_IMX50_UART || \ + DEBUG_IMX51_UART || \ + DEBUG_IMX53_UART || \ + DEBUG_IMX6Q_UART || \ + DEBUG_IMX6SL_UART || \ + DEBUG_IMX6SX_UART || \ + DEBUG_IMX6UL_UART || \ + DEBUG_IMX7D_UART default 1 - depends on ARCH_MXC help Choose UART port on which kernel low-level debug messages should be output.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/125 parisc: Fix serio address output
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit 785145171d17af2554128becd6a7c8f89e101141 ]
We want the hpa addresses printed in the serio modules, not some virtual ioremap()ed address, e.g.:
serio: gsc-ps2-keyboard port at 0xf0108000 irq 22 @ 2:0:11
serio: gsc-ps2-mouse port at 0xf0108100 irq 22 @ 2:0:12
--- drivers/input/serio/gscps2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/serio/gscps2.c +2 -2
@@ -382,9 +382,9 @@ static int gscps2_probe(struct parisc_device *dev) goto fail;#endif -printk (KERN_INFO "serio: %s port at 0x%p irq %d @ %s\n" , +pr_info ("serio: %s port at 0x%08lx irq %d @ %s\n" , ps2port->port->name, - ps2port->addr, + hpa, ps2port->padev->irq, ps2port->port->phys);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/125 arm64: mm: Prevent mismatched 52-bit VA support
In reply to Greg Kroah-HartmanFrom: Steve Capper <[email protected]>
[ Upstream commit a96a33b1ca57dbea4285893dedf290aeb8eb090b ]
For cases where there is a mismatch in ARMv8.2-LVA support between CPUs we have to be careful in allowing secondary CPUs to boot if 52-bit virtual addresses have already been enabled on the boot CPU.
This patch adds code to the secondary startup path. If the boot CPU has enabled 52-bit VAs then ID_AA64MMFR2_EL1 is checked to see if the secondary can also enable 52-bit support. If not, the secondary is prevented from booting and an error message is displayed indicating why.
Technically this patch could be implemented using the cpufeature code when considering 52-bit userspace support. However, we employ low level checks here as the cpufeature code won't be able to run if we have mismatched 52-bit kernel va support.
--- arch/arm64/kernel/head.S | 26 ++++++++++++++++++++++++++ arch/arm64/kernel/smp.c | 5 +++++ 2 files changed, 31 insertions(+)
arch/arm64/kernel/head.S +26 -0
@@ -686,6 +686,7 @@ secondary_startup: /* * Common entry point for secondary CPUs. */ + bl __cpu_secondary_check52bitva bl __cpu_setup // initialise processor bl __enable_mmu ldr x8, =__secondary_switched
@@ -759,6 +760,31 @@ ENTRY(__enable_mmu) ret ENDPROC(__enable_mmu) +ENTRY(__cpu_secondary_check52bitva) +#ifdef CONFIG_ARM64_52BIT_VA + ldr_l x0, vabits_user + cmp x0, #52 + b.ne 2f + + mrs_s x0, SYS_ID_AA64MMFR2_EL1 + and x0, x0, #(0xf << ID_AA64MMFR2_LVA_SHIFT) + cbnz x0, 2f + + adr_l x0, va52mismatch + mov w1, #1 + strb w1, [x0] + dmb sy + dc ivac, x0 // Invalidate potentially stale cache line + + update_early_cpu_boot_status CPU_STUCK_IN_KERNEL, x0, x1 +1: wfe + wfi + b 1b + +#endif +2: ret +ENDPROC(__cpu_secondary_check52bitva) + __no_granule_support: /* Indicate that this CPU can't boot and is stuck in the kernel */ update_early_cpu_boot_status CPU_STUCK_IN_KERNEL, x1, x2
arch/arm64/kernel/smp.c +5 -0
@@ -136,6 +136,7 @@ static int boot_secondary(unsigned int cpu, struct task_struct *idle) }static DECLARE_COMPLETION (cpu_running); +bool va52mismatch__ro_after_init ;int __cpu_up (unsigned int cpu,struct task_struct *idle) {
@@ -164,6 +165,10 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)if (!cpu_online (cpu)) {pr_crit ("CPU%u: failed to come online\n" , cpu); + +if (IS_ENABLED (CONFIG_ARM64_52BIT_VA ) && va52mismatch) +pr_crit ("CPU%u: does not support 52-bit VAs\n" , cpu); + ret = -EIO ; } }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/125 ASoC: kirkwood: fix external clock probe defer
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 4523817d51bc3b2ef38da768d004fda2c8bc41de ]
When our call to get the external clock fails, we forget to clean up the enabled internal clock correctly. Enable the clock after we have obtained all our resources.
--- sound/soc/kirkwood/kirkwood-i2s.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/kirkwood/kirkwood-i2s.c +4 -4
@@ -570,10 +570,6 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)return PTR_ERR (priv->clk); } - err =clk_prepare_enable (priv->clk); -if (err <0 ) -return err; - priv->extclk =devm_clk_get (&pdev->dev,"extclk" );if (IS_ERR (priv->extclk)) {if (PTR_ERR (priv->extclk) == -EPROBE_DEFER )
@@ -589,6 +585,10 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) } } + err =clk_prepare_enable (priv->clk); +if (err <0 ) +return err; +/* Some sensible defaults - this reflects the powerup values */ priv->ctl_play =KIRKWOOD_PLAYCTL_SIZE_24 ; priv->ctl_rec =KIRKWOOD_RECCTL_SIZE_24 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/125 arm64: smp: Handle errors reported by the firmware
In reply to Greg Kroah-HartmanFrom: Suzuki K Poulose <[email protected]>
[ Upstream commit f357b3a7e17af7736d67d8267edc1ed3d1dd9391 ]
The __cpu_up() routine ignores the errors reported by the firmware for a CPU bringup operation and looks for the error status set by the booting CPU. If the CPU never entered the kernel, we could end up in assuming stale error status, which otherwise would have been set/cleared appropriately by the booting CPU.
--- arch/arm64/kernel/smp.c | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kernel/smp.c +1 -0
@@ -173,6 +173,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) } }else {pr_err ("CPU%u: failed to boot: %d\n" , cpu, ret); +return ret; } secondary_data.stack =NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/125 PM / AVS: SmartReflex: NULL check before some freeing functions is not needed
In reply to Greg Kroah-HartmanFrom: Thomas Meyer <[email protected]>
[ Upstream commit 14d338a857f05f894ba3badd9e6d3039c68b8180 ]
NULL check before some freeing functions is not needed.
--- drivers/power/avs/smartreflex.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/power/avs/smartreflex.c +1 -2
@@ -994,8 +994,7 @@ static int omap_sr_remove(struct platform_device *pdev)if (sr_info->autocomp_active)sr_stop_vddautocomp (sr_info); -if (sr_info->dbg_dir) -debugfs_remove_recursive (sr_info->dbg_dir); +debugfs_remove_recursive (sr_info->dbg_dir);pm_runtime_disable (&pdev->dev);list_del (&sr_info->node);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/125 ARM: ks8695: fix section mismatch warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 4aa64677330beeeed721b4b122884dabad845d66 ]
WARNING: vmlinux.o(.text+0x13250): Section mismatch in reference from the function acs5k_i2c_init() to the (unknown reference) .init.data:(unknown) The function acs5k_i2c_init() references
the (unknown reference) __initdata (unknown).
This is often because acs5k_i2c_init lacks a __initdata
annotation or the annotation of (unknown) is wrong.
--- arch/arm/mach-ks8695/board-acs5k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-ks8695/board-acs5k.c +1 -1
@@ -92,7 +92,7 @@ static struct i2c_board_info acs5k_i2c_devs[] __initdata = { }, }; -static void acs5k_i2c_init (void ) +static void __init acs5k_i2c_init (void ) {/* The gpio interface */ platform_device_register (&acs5k_i2c_device);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/125 ACPI / LPSS: Ignore acpi_device_fix_up_power() return value
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 1a2fa02f7489dc4d746f2a15fb77b3ce1affade8 ]
Ignore acpi_device_fix_up_power() return value. If we return an error we end up with acpi_default_enumeration() still creating a platform- device for the device and we end up with the device still being used but without the special LPSS related handling which is not useful.
Specicifically ignoring the error fixes the touchscreen no longer working after a suspend/resume on a Prowise PT301 tablet.
This tablet has a broken _PS0 method on the touchscreen's I2C controller, causing acpi_device_fix_up_power() to fail, causing fallback to standard platform-dev handling and specifically causing acpi_lpss_save/restore_ctx to not run.
The I2C controllers _PS0 method does actually turn on the device, but then does some more nonsense which fails when run during early boot trying to use I2C opregion handling on another not-yet registered I2C controller.
--- drivers/acpi/acpi_lpss.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/acpi/acpi_lpss.c +1 -6
@@ -448,12 +448,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,* have _PS0 and _PS3 without _PSC (and no power resources), so * acpi_bus_init_power() will assume that the BIOS has put them into D0. */ - ret =acpi_device_fix_up_power (adev); -if (ret) { -/* Skip the device, but continue the namespace scan. */ - ret =0 ; - goto err_out; - } +acpi_device_fix_up_power (adev); adev->driver_data = pdata; pdev =acpi_create_platform_device (adev, dev_desc->properties);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/125 mwifiex: fix potential NULL dereference and use after free
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit 1dcd9429212b98bea87fc6ec92fb50bf5953eb47 ]
There are two defects: (1) passing a NULL bss to mwifiex_save_hidden_ssid_channels will result in NULL dereference,
(2) using bss after dropping the reference to it via cfg80211_put_bss. To fix them, the patch moves the buggy code to the branch that bss is not NULL and puts it before cfg80211_put_bss.
--- drivers/net/wireless/marvell/mwifiex/scan.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/net/wireless/marvell/mwifiex/scan.c +10 -8
@@ -1890,15 +1890,17 @@ mwifiex_parse_single_response_buf(struct mwifiex_private *priv, u8 **bss_info, ETH_ALEN))mwifiex_update_curr_bss_params (priv ,bss ); -cfg80211_put_bss (priv->wdev.wiphy, bss); - } -if ((chan->flags &IEEE80211_CHAN_RADAR ) || - (chan->flags &IEEE80211_CHAN_NO_IR )) { -mwifiex_dbg (adapter,INFO , -"radar or passive channel %d\n" , - channel); -mwifiex_save_hidden_ssid_channels (priv, bss); +if ((chan->flags &IEEE80211_CHAN_RADAR ) || + (chan->flags &IEEE80211_CHAN_NO_IR )) { +mwifiex_dbg (adapter,INFO , +"radar or passive channel %d\n" , + channel); +mwifiex_save_hidden_ssid_channels (priv, + bss); + } + +cfg80211_put_bss (priv->wdev.wiphy, bss); } } }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/125 mwifiex: debugfs: correct histogram spacing, formatting
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
[ Upstream commit 4cb777c64e030778c569f605398d7604d8aabc0f ]
Currently, snippets of this file look like:
rx rates (in Mbps): 0=1M 1=2M2=5.5M 3=11M 4=6M 5=9M 6=12M
7=18M 8=24M 9=36M 10=48M 11=54M12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40) 44-53=MCS0-9(VHT:BW20)54-63=MCS0-9(VHT:BW40)64-73=MCS0-9(VHT:BW80)
...
noise_flr[--96dBm] = 22
noise_flr[--95dBm] = 149
noise_flr[--94dBm] = 9
noise_flr[--93dBm] = 2
We're missing some spaces, and we're adding a minus sign ('-') on values that are already negative signed integers.
--- drivers/net/wireless/marvell/mwifiex/debugfs.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/net/wireless/marvell/mwifiex/debugfs.c +6 -8
@@ -296,15 +296,13 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf,"total samples = %d\n" , atomic_read(&phist_data->num_samples)); - p +=sprintf (p,"rx rates (in Mbps): 0=1M 1=2M" ); - p +=sprintf (p,"2=5.5M 3=11M 4=6M 5=9M 6=12M\n" ); - p +=sprintf (p,"7=18M 8=24M 9=36M 10=48M 11=54M" ); - p +=sprintf (p,"12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40)\n" ); + p +=sprintf (p, +"rx rates (in Mbps): 0=1M 1=2M 2=5.5M 3=11M 4=6M 5=9M 6=12M\n" +"7=18M 8=24M 9=36M 10=48M 11=54M 12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40)\n" );if (ISSUPP_11ACENABLED (priv->adapter->fw_cap_info)) { - p +=sprintf (p,"44-53=MCS0-9(VHT:BW20)" ); - p +=sprintf (p,"54-63=MCS0-9(VHT:BW40)" ); - p +=sprintf (p,"64-73=MCS0-9(VHT:BW80)\n\n" ); + p +=sprintf (p, +"44-53=MCS0-9(VHT:BW20) 54-63=MCS0-9(VHT:BW40) 64-73=MCS0-9(VHT:BW80)\n\n" ); }else { p +=sprintf (p,"\n" ); }
@@ -333,7 +331,7 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf,for (i =0 ; i <MWIFIEX_MAX_NOISE_FLR ; i++) { value =atomic_read (&phist_data->noise_flr[i]);if (value) - p +=sprintf (p,"noise_flr[-%02ddBm] = %d\n" , + p +=sprintf (p,"noise_flr[%02ddBm] = %d\n" , (int )(i-128 ), value); }for (i =0 ; i <MWIFIEX_MAX_SIG_STRENGTH ; i++) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/125 rtl818x: fix potential use after free
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit afbb1947db94eacc5a13302eee88a9772fb78935 ]
entry is released via usb_put_urb just after calling usb_submit_urb. However, entry is used if the submission fails, resulting in a use after free bug. The patch fixes this.
--- drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c +2 -1
@@ -446,12 +446,13 @@ static int rtl8187_init_urbs(struct ieee80211_hw *dev)skb_queue_tail (&priv->rx_queue, skb);usb_anchor_urb (entry, &priv->anchored); ret =usb_submit_urb (entry,GFP_KERNEL ); -usb_put_urb (entry);if (ret) {skb_unlink (skb, &priv->rx_queue);usb_unanchor_urb (entry); +usb_put_urb (entry); goto err; } +usb_put_urb (entry); }return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/125 xfs: require both realtime inodes to mount
In reply to Greg Kroah-HartmanFrom: Darrick J. Wong <[email protected]>
[ Upstream commit 64bafd2f1e484e27071e7584642005d56516cb77 ]
Since mkfs always formats the filesystem with the realtime bitmap and summary inodes immediately after the root directory, we should expect that both of them are present and loadable, even if there isn't a realtime volume attached. There's no reason to skip this if rbmino == NULLFSINO; in fact, this causes an immediate crash if the there /is/ a realtime volume and someone writes to it.
--- fs/xfs/xfs_rtalloc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/xfs/xfs_rtalloc.c +1 -3
@@ -1222,13 +1222,11 @@ xfs_rtmount_inodes(xfs_sb_t *sbp; sbp = &mp->m_sb; -if (sbp->sb_rbmino ==NULLFSINO ) -return 0 ; error =xfs_iget (mp,NULL , sbp->sb_rbmino,0 ,0 , &mp->m_rbmip);if (error)return error;ASSERT (mp->m_rbmip !=NULL ); -ASSERT (sbp->sb_rsumino !=NULLFSINO ); + error =xfs_iget (mp,NULL , sbp->sb_rsumino,0 ,0 , &mp->m_rsumip);if (error) {IRELE (mp->m_rbmip);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/125 ubi: Put MTD device after it is not used
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit b95f83ab762dd6211351b9140f99f43644076ca8 ]
The MTD device reference is dropped via put_mtd_device, however its field ->index is read and passed to ubi_msg. To fix this, the patch moves the reference dropping after calling ubi_msg.
--- drivers/mtd/ubi/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/ubi/build.c +1 -1
@@ -1146,10 +1146,10 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)ubi_wl_close (ubi);ubi_free_internal_volumes (ubi);vfree (ubi->vtbl); -put_mtd_device (ubi->mtd);vfree (ubi->peb_buf);vfree (ubi->fm_buf);ubi_msg (ubi,"mtd%d is detached" , ubi->mtd->index); +put_mtd_device (ubi->mtd);put_device (&ubi->dev);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/125 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit e9323b664ce29547d996195e8a6129a351c39108 ]
Properly save and restore all top PLL related configuration registers during suspend/resume cycle. So far driver only handled EPLL and RPLL clocks, all other were reset to default values after suspend/resume cycle. This caused for example lower G3D (MALI Panfrost) performance after system resume, even if performance governor has been selected.
--- drivers/clk/samsung/clk-exynos5420.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clk/samsung/clk-exynos5420.c +6 -0
@@ -170,12 +170,18 @@ static const unsigned long exynos5x_clk_regs[] __initconst = {GATE_BUS_CPU ,GATE_SCLK_CPU ,CLKOUT_CMU_CPU , +CPLL_CON0 , +DPLL_CON0 ,EPLL_CON0 ,EPLL_CON1 ,EPLL_CON2 ,RPLL_CON0 ,RPLL_CON1 ,RPLL_CON2 , +IPLL_CON0 , +SPLL_CON0 , +VPLL_CON0 , +MPLL_CON0 ,SRC_TOP0 ,SRC_TOP1 , SRC_TOP2,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/125 microblaze: adjust the help to the real behavior
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit bafcc61d998c1ca18f556d92a0e95335ac68c7da ]
"make ARCH=microblaze help" mentions simpleImage.<dt>.unstrip, but it is not a real Make target. It does not work because Makefile assumes "system.unstrip" is the name of DT.
$ make ARCH=microblaze CROSS_COMPILE=microblaze-linux- simpleImage.system.unstrip [ snip ] make[1]: *** No rule to make target 'arch/microblaze/boot/dts/system.unstrip.dtb', needed by 'arch/microblaze/boot/dts/system.dtb'. Stop. make: *** [Makefile;1060: arch/microblaze/boot/dts] Error 2 make: *** Waiting for unfinished jobs....
simpleImage.<dt> works like a phony target that generates multiple images. Reflect the real behavior. I removed the DT directory path information because it is already explained a few lines below.
While I am here, I deleted the redundant *_defconfig explanation.
The top-level Makefile caters to list available defconfig files:
mmu_defconfig - Build for mmu
nommu_defconfig - Build for nommu
--- arch/microblaze/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/microblaze/Makefile +5 -5
@@ -83,11 +83,11 @@ define archhelp echo '* linux.bin - Create raw binary' echo ' linux.bin.gz - Create compressed raw binary' echo ' linux.bin.ub - Create U-Boot wrapped raw binary' - echo ' simpleImage.<dt> - ELF image with $(arch)/boot/dts/<dt>.dts linked in' - echo ' - stripped elf with fdt blob' - echo ' simpleImage.<dt>.unstrip - full ELF image with fdt blob' - echo ' *_defconfig - Select default config from arch/microblaze/configs' - echo '' + echo ' simpleImage.<dt> - Create the following images with <dt>.dtb linked in' + echo ' simpleImage.<dt> : raw image' + echo ' simpleImage.<dt>.ub : raw image with U-Boot header' + echo ' simpleImage.<dt>.unstrip: ELF (identical to vmlinux)' + echo ' simpleImage.<dt>.strip : stripped ELF' echo ' Targets with <dt> embed a device tree blob inside the image' echo ' These targets support board with firmware that does not' echo ' support passing a device tree directly. Replace <dt> with the'
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/125 gpiolib: Fix return value of gpio_to_desc() stub if !GPIOLIB
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit c5510b8dafce5f3f5a039c9b262ebcae0092c462 ]
If CONFIG_GPOILIB is not set, the stub of gpio_to_desc() should return the same type of error as regular version: NULL. All the callers compare the return value of gpio_to_desc() against NULL, so returned ERR_PTR would be treated as non-error case leading to dereferencing of error value.
--- include/linux/gpio/consumer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/gpio/consumer.h +1 -1
@@ -398,7 +398,7 @@ static inline int gpiod_to_irq(const struct gpio_desc *desc)static inline struct gpio_desc *gpio_to_desc (unsigned gpio) { -return ERR_PTR (-EINVAL ); +return NULL ; }static inline int desc_to_gpio (const struct gpio_desc *desc)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/125 microblaze: move "... is ready" messages to arch/microblaze/Makefile
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 2e14f94cf4bc2f15ca5362e81ca3a987c79e3062 ]
To prepare for more fixes, move this to arch/microblaze/Makefile. Otherwise, the same "... is ready" would be printed multiple times.
--- arch/microblaze/Makefile | 2 ++ arch/microblaze/boot/Makefile | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-)
arch/microblaze/Makefile +2 -0
@@ -75,9 +75,11 @@ archclean: linux.bin linux.bin.gz linux.bin.ub: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' simpleImage.%: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' define archhelp echo '* linux.bin - Create raw binary'
arch/microblaze/boot/Makefile +0 -4
@@ -8,15 +8,12 @@ OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary $(obj)/linux.bin: vmlinux FORCE $(call if_changed,objcopy) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' $(obj)/linux.bin.ub: $(obj)/linux.bin FORCE $(call if_changed,uimage) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE $(call if_changed,gzip) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' quiet_cmd_cp = CP $< $@$2 cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)
@@ -34,6 +31,5 @@ $(obj)/simpleImage.%: vmlinux FORCE $(call if_changed,objcopy) $(call if_changed,uimage) $(call if_changed,strip,.strip) - @echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')' clean-files += simpleImage.*.unstrip linux.bin.ub dts/*.dtb
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/125 reset: fix reset_control_ops kerneldoc comment
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit f430c7ed8bc22992ed528b518da465b060b9223f ]
Add a missing short description to the reset_control_ops documentation.
--- include/linux/reset-controller.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/reset-controller.h +1 -1
@@ -6,7 +6,7 @@struct reset_controller_dev ;/** -* struct reset_control_ops +* struct reset_control_ops - reset controller driver callbacks * * @reset: for self-deasserting resets, does all necessary * things to reset the device
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/125 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open
In reply to Greg Kroah-HartmanFrom: Jeroen Hofstee <[email protected]>
[ Upstream commit 23c5a9488f076bab336177cd1d1a366bd8ddf087 ]
When the CAN interface is closed it the hardwre is put in power down mode, but does not reset the error counters / state. Reset the D_CAN on open, so the reported state and the actual state match.
According to [1], the C_CAN module doesn't have the software reset.
--- drivers/net/can/c_can/c_can.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/net/can/c_can/c_can.c +26 -0
@@ -52,6 +52,7 @@#define CONTROL_EX_PDR BIT(8)/* control register */ +#define CONTROL_SWR BIT(15)#define CONTROL_TEST BIT(7)#define CONTROL_CCE BIT(6)#define CONTROL_DISABLE_AR BIT(5)
@@ -572,6 +573,26 @@ static void c_can_configure_msg_objects(struct net_device *dev) IF_MCONT_RCV_EOB); } +static int c_can_software_reset (struct net_device *dev) +{ +struct c_can_priv *priv =netdev_priv (dev); +int retry =0 ; + +if (priv->type !=BOSCH_D_CAN ) +return 0 ; + + priv->write_reg (priv,C_CAN_CTRL_REG ,CONTROL_SWR |CONTROL_INIT ); +while (priv->read_reg (priv,C_CAN_CTRL_REG ) &CONTROL_SWR ) { +msleep (20 ); +if (retry++ >100 ) { +netdev_err (dev,"CCTRL: software reset failed\n" ); +return -EIO ; + } + } + +return 0 ; +} +/* * Configure C_CAN chip: * - enable/disable auto-retransmission
@@ -581,6 +602,11 @@ static void c_can_configure_msg_objects(struct net_device *dev)static int c_can_chip_config (struct net_device *dev) {struct c_can_priv *priv =netdev_priv (dev); +int err; + + err =c_can_software_reset (dev); +if (err) +return err;/* enable automatic retransmission */ priv->write_reg (priv,C_CAN_CTRL_REG ,CONTROL_ENABLE_AR );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 7/125 can: peak_usb: report bus recovery as well
In reply to Greg Kroah-HartmanFrom: Jeroen Hofstee <[email protected]>
[ Upstream commit 128a1b87d3ceb2ba449d5aadb222fe22395adeb0 ]
While the state changes are reported when the error counters increase and decrease, there is no event when the bus recovers and the error counters decrease again. So add those as well.
Change the state going downward to be ERROR_PASSIVE -> ERROR_WARNING -> ERROR_ACTIVE instead of directly to ERROR_ACTIVE again.
--- drivers/net/can/usb/peak_usb/pcan_usb.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/net/can/usb/peak_usb/pcan_usb.c +10 -5
@@ -441,8 +441,8 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n, }if ((n &PCAN_USB_ERROR_BUS_LIGHT ) ==0 ) {/* no error (back to active state) */ - mc->pdev->dev.can.state =CAN_STATE_ERROR_ACTIVE ; -return 0 ; + new_state =CAN_STATE_ERROR_ACTIVE ; +break ; }break ;
@@ -465,9 +465,9 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n, }if ((n &PCAN_USB_ERROR_BUS_HEAVY ) ==0 ) { -/* no error (back to active state) */ - mc->pdev->dev.can.state =CAN_STATE_ERROR_ACTIVE ; -return 0 ; +/* no error (back to warning state) */ + new_state =CAN_STATE_ERROR_WARNING ; +break ; }break ;
@@ -506,6 +506,11 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n, mc->pdev->dev.can.can_stats.error_warning++;break ; +case CAN_STATE_ERROR_ACTIVE : + cf->can_id |=CAN_ERR_CRTL ; + cf->data[1 ] =CAN_ERR_CRTL_ACTIVE ; +break ; +default :/* CAN_STATE_MAX (trick to handle other errors) */ cf->can_id |=CAN_ERR_CRTL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/125 watchdog: meson: Fix the wrong value of left time
In reply to Greg Kroah-HartmanFrom: Xingyu Chen <[email protected]>
[ Upstream commit 2c77734642d52448aca673e889b39f981110828b ]
The left time value is wrong when we get it by sysfs. The left time value should be equal to preset timeout value minus elapsed time value. According to the Meson-GXB/GXL datasheets which can be found at [0], the timeout value is saved to BIT[0-15] of the WATCHDOG_TCNT, and elapsed time value is saved to BIT[16-31] of the WATCHDOG_TCNT.
--- drivers/watchdog/meson_gxbb_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/meson_gxbb_wdt.c +2 -2
@@ -137,8 +137,8 @@ static unsigned int meson_gxbb_wdt_get_timeleft(struct watchdog_device *wdt_dev) reg =readl (data->reg_base +GXBB_WDT_TCNT_REG ); -return ((reg >>GXBB_WDT_TCNT_CNT_SHIFT ) - - (reg &GXBB_WDT_TCNT_SETUP_MASK )) /1000 ; +return ((reg &GXBB_WDT_TCNT_SETUP_MASK ) - + (reg >>GXBB_WDT_TCNT_CNT_SHIFT )) /1000 ; }static const struct watchdog_ops meson_gxbb_wdt_ops = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 4.9.206-stable review
This is the start of the stable review cycle for the 4.9.206 release. There are 125 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 Fri, 06 Dec 2019 17:50:36 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.206-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.206-rc1
Chuhong Yuan <[email protected]>
net: fec: fix clock count mis-match
Hans de Goede <[email protected]>
platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer
Lionel Debieve <[email protected]>
hwrng: stm32 - fix unbalanced pm_runtime_enable
Candle Sun <[email protected]>
HID: core: check whether Usage Page item is after Usage ID items
Dust Li <[email protected]>
net: sched: fix tc -s class show no bstats on class with nolock subqueues
Xin Long <[email protected]>
sctp: cache netns in sctp_ep_common
John Rutherford <[email protected]>
tipc: fix link name length check
Paolo Abeni <[email protected]>
openvswitch: remove another BUG_ON()
Paolo Abeni <[email protected]>
openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info()
Jouni Hogander <[email protected]>
slip: Fix use-after-free Read in slip_open
Paolo Abeni <[email protected]>
openvswitch: fix flow command message size
Menglong Dong <[email protected]>
macvlan: schedule bc_work even if error
Eugen Hristev <[email protected]>
media: atmel: atmel-isc: fix asd memory allocation
Uwe Kleine-König <[email protected]>
pwm: Clear chip_data in pwm_put()
Luca Ceresoli <[email protected]>
net: macb: fix error format in dev_err()
Eugen Hristev <[email protected]>
media: v4l2-ctrl: fix flags for DO_WHITE_BALANCE
Alexander Usyskin <[email protected]>
mei: bus: prefix device names on bus with the bus name
Fabio D'Urso <[email protected]>
USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P
Pan Bian <[email protected]>
staging: rtl8192e: fix potential use after free
Eugen Hristev <[email protected]>
clk: at91: fix update bit maps on CFG_MOR write
Vlastimil Babka <[email protected]>
mm, gup: add missing refcount overflow checks on x86 and s390
Boris Brezillon <[email protected]>
mtd: Remove a debug trace in mtdpart.c
Gen Zhang <[email protected]>
powerpc/pseries/dlpar: Fix a missing check in dlpar_parse_cc_property()
John Garry <[email protected]>
scsi: libsas: Check SMP PHY control function result
James Morse <[email protected]>
ACPI / APEI: Switch estatus pool to use vmalloc memory
John Garry <[email protected]>
scsi: libsas: Support SATA PHY connection rate unmatch fixing during discovery
Aaron Ma <[email protected]>
iommu/amd: Fix NULL dereference bug in match_hid_uid
Andy Shevchenko <[email protected]>
net: dev: Use unsigned integer as an argument to left-shift
Maciej Kwiecien <[email protected]>
sctp: don't compare hb_timer expire date before starting it
Eric Dumazet <[email protected]>
net: fix possible overflow in __sk_mem_raise_allocated()
Bert Kenward <[email protected]>
sfc: initialise found bitmap in efx_ef10_mtd_probe
Hoang Le <[email protected]>
tipc: fix skb may be leaky in tipc_link_input
Johannes Berg <[email protected]>
decnet: fix DN_IFREQ_SIZE
wenxu <[email protected]>
ip_tunnel: Make none-tunnel-dst tunnel port work with lwtunnel
Edward Cree <[email protected]>
sfc: suppress duplicate nvmem partition types in efx_ef10_mtd_probe
Konstantin Khlebnikov <[email protected]>
net/core/neighbour: fix kmemleak minimal reference count for hash tables
Konstantin Khlebnikov <[email protected]>
net/core/neighbour: tell kmemleak about hash tables
Gustavo A. R. Silva <[email protected]>
tipc: fix memory leak in tipc_nl_compat_publ_dump
Boris Brezillon <[email protected]>
mtd: Check add_mtd_device() ret code
Olof Johansson <[email protected]>
lib/genalloc.c: include vmalloc.h
Qian Cai <[email protected]>
drivers/base/platform.c: kmemleak ignore a known leak
Huang Shijie <[email protected]>
lib/genalloc.c: use vzalloc_node() to allocate the bitmap
Alexey Skidanov <[email protected]>
lib/genalloc.c: fix allocation of aligned buffer from non-aligned chunk
Wei Yang <[email protected]>
vmscan: return NODE_RECLAIM_NOSCAN in node_reclaim() when CONFIG_NUMA is n
Junxiao Bi <[email protected]>
ocfs2: clear journal dirty flag after shutdown journal
Wen Yang <[email protected]>
net/wan/fsl_ucc_hdlc: Avoid double free in ucc_hdlc_probe()
Kangjie Lu <[email protected]>
tipc: fix a missing check of genlmsg_put
Kangjie Lu <[email protected]>
atl1e: checking the status of atl1e_write_phy_reg
Kangjie Lu <[email protected]>
net: dsa: bcm_sf2: Propagate error value from mdio_write
Kangjie Lu <[email protected]>
net: stmicro: fix a missing check of clk_prepare
Richard Weinberger <[email protected]>
um: Make GCOV depend on !KCOV
Aditya Pakki <[email protected]>
net/net_namespace: Check the return value of register_pernet_subsys()
Alexander Shiyan <[email protected]>
pwm: clps711x: Fix period calculation
Fabio Estevam <[email protected]>
crypto: mxc-scc - fix build warnings on ARM64
Michael Ellerman <[email protected]>
powerpc/pseries: Fix node leak in update_lmb_associativity_index()
Christophe Leroy <[email protected]>
powerpc/83xx: handle machine check caused by watchdog timer
Kangjie Lu <[email protected]>
regulator: tps65910: fix a missing check of return value
Luc Van Oostenryck <[email protected]>
drbd: fix print_st_err()'s prototype to match the definition
Lars Ellenberg <[email protected]>
drbd: do not block when adjusting "disk-options" while IO is frozen
Lars Ellenberg <[email protected]>
drbd: reject attach of unsuitable uuids even if connected
Lars Ellenberg <[email protected]>
drbd: ignore "all zero" peer volume sizes in handshake
Alexey Kardashevskiy <[email protected]>
powerpc/powernv/eeh/npu: Fix uninitialized variables in opal_pci_eeh_freeze_status
Alexey Kardashevskiy <[email protected]>
vfio/spapr_tce: Get rid of possible infinite loop
Benjamin Herrenschmidt <[email protected]>
powerpc/44x/bamboo: Fix PCI range
Christophe Leroy <[email protected]>
powerpc/mm: Make NULL pointer deferences explicit on bad page faults.
Christophe Leroy <[email protected]>
powerpc/prom: fix early DEBUG messages
Kyle Roeschley <[email protected]>
ath6kl: Fix off by one error in scan completion
Kyle Roeschley <[email protected]>
ath6kl: Only use match sets when firmware supports it
Varun Prakash <[email protected]>
scsi: csiostor: fix incorrect dma device in case of vport
Anatoliy Glagolev <[email protected]>
scsi: qla2xxx: deadlock by configfs_depend_item
Bart Van Assche <[email protected]>
RDMA/srp: Propagate ib_post_send() failures to the SCSI mid-layer
Geert Uytterhoeven <[email protected]>
openrisc: Fix broken paths to arch/or32
Alexander Shiyan <[email protected]>
serial: max310x: Fix tx_empty() callback
Kangjie Lu <[email protected]>
drivers/regulator: fix a missing check of return value
Christophe Leroy <[email protected]>
powerpc/xmon: fix dump_segments()
Christophe Leroy <[email protected]>
powerpc/book3s/32: fix number of bats in p/v_block_mapped()
Dan Carpenter <[email protected]>
IB/qib: Fix an error code in qib_sdma_verbs_send()
Nick Bowler <[email protected]>
xfs: Fix bulkstat compat ioctls on x32 userspace.
Nick Bowler <[email protected]>
xfs: Align compat attrlist_by_handle with native implementation.
Bob Peterson <[email protected]>
gfs2: take jdata unstuff into account in do_grow
Sweet Tea <[email protected]>
dm flakey: Properly corrupt multi-page bios.
Peter Hutterer <[email protected]>
HID: doc: fix wrong data structure reference for UHID_OUTPUT
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7734: Fix shifted values in IPSR10
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7264: Fix PFCR3 and PFCR0 register configuration
Michael Mueller <[email protected]>
KVM: s390: unregister debug feature on failing arch init
Leon Romanovsky <[email protected]>
net/mlx5: Continue driver initialization despite debugfs failure
Martin Schiller <[email protected]>
pinctrl: xway: fix gpio-hog related boot issues
Ross Lagerwall <[email protected]>
xen/pciback: Check dev_data before using it
Pan Bian <[email protected]>
HID: intel-ish-hid: fixes incorrect error handling
Josef Bacik <[email protected]>
btrfs: only track ref_heads in delayed_ref_updates
Boris Brezillon <[email protected]>
mtd: rawnand: sunxi: Write pageprog related opcodes to WCMD_SET
Lepton Wu <[email protected]>
VSOCK: bind to random port for VMADDR_PORT_ANY
Krzysztof Kozlowski <[email protected]>
gpiolib: Fix return value of gpio_to_desc() stub if !GPIOLIB
Masahiro Yamada <[email protected]>
microblaze: move "... is ready" messages to arch/microblaze/Makefile
Masahiro Yamada <[email protected]>
microblaze: adjust the help to the real behavior
Pan Bian <[email protected]>
ubi: Do not drop UBI device reference before using
Pan Bian <[email protected]>
ubi: Put MTD device after it is not used
Darrick J. Wong <[email protected]>
xfs: require both realtime inodes to mount
Pan Bian <[email protected]>
rtl818x: fix potential use after free
Brian Norris <[email protected]>
mwifiex: debugfs: correct histogram spacing, formatting
Pan Bian <[email protected]>
mwifiex: fix potential NULL dereference and use after free
Eric Biggers <[email protected]>
crypto: user - support incremental algorithm dumps
Hans de Goede <[email protected]>
ACPI / LPSS: Ignore acpi_device_fix_up_power() return value
Arnd Bergmann <[email protected]>
ARM: ks8695: fix section mismatch warning
Thomas Meyer <[email protected]>
PM / AVS: SmartReflex: NULL check before some freeing functions is not needed
Suzuki K Poulose <[email protected]>
arm64: smp: Handle errors reported by the firmware
Steve Capper <[email protected]>
arm64: mm: Prevent mismatched 52-bit VA support
Helge Deller <[email protected]>
parisc: Fix HP SDC hpa address output
Helge Deller <[email protected]>
parisc: Fix serio address output
Fabio Estevam <[email protected]>
ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
Uwe Kleine-König <[email protected]>
ARM: debug-imx: only define DEBUG_IMX_UART_PORT if needed
James Smart <[email protected]>
scsi: lpfc: Fix dif and first burst use in write commands
Uwe Kleine-König <[email protected]>
pwm: bcm-iproc: Prevent unloading the driver module while in use
Dan Carpenter <[email protected]>
block: drbd: remove a stray unlock in __drbd_send_protocol()
Ahmed Zaki <[email protected]>
mac80211: fix station inactive_time shortly after boot
Ilya Leoshkevich <[email protected]>
scripts/gdb: fix debugging modules compiled with hot/cold partitioning
Xingyu Chen <[email protected]>
watchdog: meson: Fix the wrong value of left time
Jeroen Hofstee <[email protected]>
can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open
Jeroen Hofstee <[email protected]>
can: peak_usb: report bus recovery as well
Chuhong Yuan <[email protected]>
net: fec: add missed clk_disable_unprepare in remove
Alexandre Belloni <[email protected]>
clk: at91: avoid sleeping early
Randy Dunlap <[email protected]>
reset: fix reset_control_ops kerneldoc comment
Marek Szyprowski <[email protected]>
clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume
Russell King <[email protected]>
ASoC: kirkwood: fix external clock probe defer
Xiaojun Sang <[email protected]>
ASoC: compress: fix unsigned integer overflow check
-------------
Diffstat:
Documentation/hid/uhid.txt | 2 +- Makefile | 4 +- arch/arm/Kconfig.debug | 28 ++++++------ arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 8 +--- arch/arm/mach-ks8695/board-acs5k.c | 2 +- arch/arm64/kernel/head.S | 26 +++++++++++ arch/arm64/kernel/smp.c | 6 +++ arch/microblaze/Makefile | 12 ++--- arch/microblaze/boot/Makefile | 4 -- arch/openrisc/kernel/entry.S | 2 +- arch/openrisc/kernel/head.S | 2 +- arch/powerpc/boot/dts/bamboo.dts | 4 +- arch/powerpc/include/asm/cputable.h | 1 + arch/powerpc/include/asm/reg.h | 2 + arch/powerpc/kernel/cputable.c | 10 +++-- arch/powerpc/kernel/prom.c | 6 +-- arch/powerpc/mm/fault.c | 17 +++---- arch/powerpc/mm/ppc_mmu_32.c | 4 +- arch/powerpc/platforms/83xx/misc.c | 17 +++++++ arch/powerpc/platforms/powernv/eeh-powernv.c | 8 ++-- arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- arch/powerpc/platforms/powernv/pci.c | 4 +- arch/powerpc/platforms/pseries/dlpar.c | 4 ++ arch/powerpc/platforms/pseries/hotplug-memory.c | 1 + arch/powerpc/xmon/xmon.c | 2 +- arch/s390/kvm/kvm-s390.c | 17 +++++-- arch/s390/mm/gup.c | 9 ++-- arch/um/Kconfig.debug | 1 + arch/x86/mm/gup.c | 10 ++++- crypto/crypto_user.c | 37 ++++++++------- drivers/acpi/acpi_lpss.c | 7 +-- drivers/acpi/apei/ghes.c | 30 ++++++------- drivers/base/platform.c | 3 ++ drivers/block/drbd/drbd_main.c | 1 - drivers/block/drbd/drbd_nl.c | 43 +++++++++++++----- drivers/block/drbd/drbd_receiver.c | 52 ++++++++++++++++++++-- drivers/block/drbd/drbd_state.h | 2 +- drivers/char/hw_random/stm32-rng.c | 8 ++++ drivers/clk/at91/clk-main.c | 7 ++- drivers/clk/at91/sckc.c | 20 +++++++-- drivers/clk/samsung/clk-exynos5420.c | 6 +++ drivers/crypto/mxc-scc.c | 12 ++--- drivers/hid/hid-core.c | 51 ++++++++++++++++++--- drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- drivers/infiniband/hw/qib/qib_sdma.c | 4 +- drivers/infiniband/ulp/srp/ib_srp.c | 1 + drivers/input/serio/gscps2.c | 4 +- drivers/input/serio/hp_sdc.c | 4 +- drivers/iommu/amd_iommu.c | 8 +++- drivers/md/dm-flakey.c | 33 +++++++++----- drivers/media/platform/atmel/atmel-isc.c | 8 +++- drivers/media/v4l2-core/v4l2-ctrls.c | 1 + drivers/misc/mei/bus.c | 9 ++-- drivers/mtd/mtdcore.h | 2 +- drivers/mtd/mtdpart.c | 35 ++++++++++++--- drivers/mtd/nand/sunxi_nand.c | 2 +- drivers/mtd/ubi/build.c | 2 +- drivers/mtd/ubi/kapi.c | 2 +- drivers/net/can/c_can/c_can.c | 26 +++++++++++ drivers/net/can/usb/peak_usb/pcan_usb.c | 15 ++++--- drivers/net/dsa/bcm_sf2.c | 7 ++- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +- drivers/net/ethernet/cadence/macb.c | 14 +++--- drivers/net/ethernet/freescale/fec_main.c | 13 +++++- drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 ++-- drivers/net/ethernet/sfc/ef10.c | 29 ++++++++---- drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 4 +- drivers/net/macvlan.c | 3 +- drivers/net/slip/slip.c | 1 + drivers/net/wan/fsl_ucc_hdlc.c | 1 - drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +- drivers/net/wireless/marvell/mwifiex/debugfs.c | 14 +++--- drivers/net/wireless/marvell/mwifiex/scan.c | 18 ++++---- drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 3 +- drivers/pinctrl/pinctrl-xway.c | 39 +++++++++++----- drivers/pinctrl/sh-pfc/pfc-sh7264.c | 9 +++- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 16 +++---- drivers/platform/x86/hp-wmi.c | 6 +-- drivers/power/avs/smartreflex.c | 3 +- drivers/pwm/core.c | 1 + drivers/pwm/pwm-bcm-iproc.c | 1 + drivers/pwm/pwm-berlin.c | 1 - drivers/pwm/pwm-clps711x.c | 4 +- drivers/pwm/pwm-samsung.c | 1 - drivers/regulator/palmas-regulator.c | 5 ++- drivers/regulator/tps65910-regulator.c | 4 +- drivers/scsi/csiostor/csio_init.c | 2 +- drivers/scsi/libsas/sas_expander.c | 29 +++++++++++- drivers/scsi/lpfc/lpfc_scsi.c | 18 ++++++++ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 48 ++++---------------- drivers/scsi/qla2xxx/tcm_qla2xxx.h | 3 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 ++- drivers/tty/serial/max310x.c | 7 +-- drivers/usb/serial/ftdi_sio.c | 3 ++ drivers/usb/serial/ftdi_sio_ids.h | 7 +++ drivers/vfio/vfio_iommu_spapr_tce.c | 10 ++--- drivers/watchdog/meson_gxbb_wdt.c | 4 +- drivers/xen/xen-pciback/pci_stub.c | 3 +- fs/btrfs/delayed-ref.c | 3 -- fs/gfs2/bmap.c | 2 + fs/ocfs2/journal.c | 6 +-- fs/xfs/xfs_ioctl32.c | 40 +++++++++++++++-- fs/xfs/xfs_rtalloc.c | 4 +- include/linux/genalloc.h | 13 +++--- include/linux/gpio/consumer.h | 2 +- include/linux/netdevice.h | 2 +- include/linux/reset-controller.h | 2 +- include/linux/swap.h | 6 --- include/net/sctp/structs.h | 3 ++ include/net/sock.h | 2 +- lib/genalloc.c | 25 ++++++----- mm/internal.h | 10 +++++ net/core/neighbour.c | 13 ++++-- net/core/net_namespace.c | 3 +- net/core/sock.c | 2 +- net/decnet/dn_dev.c | 2 +- net/ipv4/ip_tunnel.c | 8 +++- net/mac80211/sta_info.c | 3 +- net/openvswitch/datapath.c | 17 +++++-- net/sched/sch_mq.c | 3 +- net/sched/sch_mqprio.c | 4 +- net/sched/sch_multiq.c | 2 +- net/sched/sch_prio.c | 2 +- net/sctp/associola.c | 1 + net/sctp/endpointola.c | 1 + net/sctp/input.c | 4 +- net/sctp/transport.c | 3 +- net/tipc/link.c | 2 +- net/tipc/netlink_compat.c | 8 +++- net/vmw_vsock/af_vsock.c | 7 ++- scripts/gdb/linux/symbols.py | 3 +- sound/core/compress_offload.c | 2 +- sound/soc/kirkwood/kirkwood-i2s.c | 8 ++-- 133 files changed, 829 insertions(+), 395 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 35/125 mtd: rawnand: sunxi: Write pageprog related opcodes to WCMD_SET
From: Boris Brezillon <[email protected]>
[ Upstream commit 732774437ae01d9882e60314e303898e63c7f038 ]
The opcodes used by the controller when doing batched page prog should be written in NFC_REG_WCMD_SET not FC_REG_RCMD_SET. Luckily, the default NFC_REG_WCMD_SET value matches the one we set in the driver which explains why we didn't notice the problem.
--- drivers/mtd/nand/sunxi_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/sunxi_nand.c +1 -1
@@ -1420,7 +1420,7 @@ static int sunxi_nfc_hw_ecc_write_page_dma(struct mtd_info *mtd,sunxi_nfc_randomizer_enable (mtd);writel ((NAND_CMD_RNDIN <<8 ) |NAND_CMD_PAGEPROG , - nfc->regs +NFC_REG_RCMD_SET ); + nfc->regs +NFC_REG_WCMD_SET );dma_async_issue_pending (nfc->dmac);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/125 HID: doc: fix wrong data structure reference for UHID_OUTPUT
In reply to Greg Kroah-HartmanFrom: Peter Hutterer <[email protected]>
[ Upstream commit 46b14eef59a8157138dc02f916a7f97c73b3ec53 ]
--- Documentation/hid/uhid.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/hid/uhid.txt +1 -1
@@ -160,7 +160,7 @@ them but you should handle them according to your needs. UHID_OUTPUT: This is sent if the HID device driver wants to send raw data to the I/O device on the interrupt channel. You should read the payload and forward it to - the device. The payload is of type "struct uhid_data_req". + the device. The payload is of type "struct uhid_output_req". This may be received even though you haven't received UHID_OPEN, yet. UHID_GET_REPORT:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/125 dm flakey: Properly corrupt multi-page bios.
In reply to Greg Kroah-HartmanFrom: Sweet Tea <[email protected]>
[ Upstream commit a00f5276e26636cbf72f24f79831026d2e2868e7 ]
The flakey target is documented to be able to corrupt the Nth byte in a bio, but does not corrupt byte indices after the first biovec in the bio. Change the corrupting function to actually corrupt the Nth byte no matter in which biovec that index falls.
A test device generating two-page bios, atop a flakey device configured to corrupt a byte index on the second page, verified both the failure to corrupt before this patch and the expected corruption after this change.
--- drivers/md/dm-flakey.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)
drivers/md/dm-flakey.c +22 -11
@@ -258,20 +258,31 @@ static void flakey_map_bio(struct dm_target *ti, struct bio *bio)static void corrupt_bio_data (struct bio *bio,struct flakey_c *fc) { -unsigned bio_bytes =bio_cur_bytes (bio); -char *data =bio_data (bio); +unsigned int corrupt_bio_byte = fc->corrupt_bio_byte -1 ; + +struct bvec_iter iter; +struct bio_vec bvec; + +if (!bio_has_data (bio)) +return ;/* -* Overwrite the Nth byte of the data returned. +* Overwrite the Nth byte of the bio's data, on whichever page +* it falls. */ -if (data && bio_bytes >= fc->corrupt_bio_byte) { - data[fc->corrupt_bio_byte -1 ] = fc->corrupt_bio_value; - -DMDEBUG ("Corrupting data bio=%p by writing %u to byte %u " -"(rw=%c bi_opf=%u bi_sector=%llu cur_bytes=%u)\n" , - bio, fc->corrupt_bio_value, fc->corrupt_bio_byte, - (bio_data_dir (bio) ==WRITE ) ?'w' :'r' , bio->bi_opf, - (unsigned long long )bio->bi_iter.bi_sector, bio_bytes); +bio_for_each_segment (bvec, bio, iter) { +if (bio_iter_len (bio, iter) > corrupt_bio_byte) { +char *segment = (page_address (bio_iter_page (bio, iter)) + +bio_iter_offset (bio, iter)); + segment[corrupt_bio_byte] = fc->corrupt_bio_value; +DMDEBUG ("Corrupting data bio=%p by writing %u to byte %u " +"(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n" , + bio, fc->corrupt_bio_value, fc->corrupt_bio_byte, + (bio_data_dir (bio) ==WRITE ) ?'w' :'r' , bio->bi_opf, + (unsigned long long )bio->bi_iter.bi_sector, bio->bi_iter.bi_size); +break ; + } + corrupt_bio_byte -=bio_iter_len (bio, iter); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/125 xfs: Align compat attrlist_by_handle with native implementation.
In reply to Greg Kroah-HartmanFrom: Nick Bowler <[email protected]>
[ Upstream commit c456d64449efe37da50832b63d91652a85ea1d20 ]
While inspecting the ioctl implementations, I noticed that the compat implementation of XFS_IOC_ATTRLIST_BY_HANDLE does not do exactly the same thing as the native implementation. Specifically, the "cursor" does not appear to be written out to userspace on the compat path, like it is on the native path.
This adjusts the compat implementation to copy out the cursor just like the native implementation does. The attrlist cursor does not require any special compat handling. This fixes xfstests xfs/269 on both IA-32 and x32 userspace, when running on an amd64 kernel.
--- fs/xfs/xfs_ioctl32.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/xfs/xfs_ioctl32.c +6 -0
@@ -346,6 +346,7 @@ xfs_compat_attrlist_by_handle( {int error;attrlist_cursor_kern_t *cursor; +compat_xfs_fsop_attrlist_handlereq_t __user *p = arg;compat_xfs_fsop_attrlist_handlereq_t al_hreq;struct dentry *dentry;char *kbuf;
@@ -380,6 +381,11 @@ xfs_compat_attrlist_by_handle(if (error) goto out_kfree; +if (copy_to_user (&p->pos, cursor,sizeof (attrlist_cursor_kern_t))) { + error = -EFAULT ; + goto out_kfree; + } +if (copy_to_user (compat_ptr (al_hreq.buffer), kbuf, al_hreq.buflen)) error = -EFAULT ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/125 xfs: Fix bulkstat compat ioctls on x32 userspace.
In reply to Greg Kroah-HartmanFrom: Nick Bowler <[email protected]>
[ Upstream commit 7ca860e3c1a74ad6bd8949364073ef1044cad758 ]
The bulkstat family of ioctls are problematic on x32, because there is a mixup of native 32-bit and 64-bit conventions. The xfs_fsop_bulkreq struct contains pointers and 32-bit integers so that matches the native 32-bit layout, and that means the ioctl implementation goes into the regular compat path on x32.
However, the 'ubuffer' member of that struct in turn refers to either struct xfs_inogrp or xfs_bstat (or an array of these). On x32, those structures match the native 64-bit layout. The compat implementation writes out the 32-bit version of these structures. This is not the expected format for x32 userspace, causing problems.
Fortunately the functions which actually output these xfs_inogrp and xfs_bstat structures have an easy way to select which output format is required, so we just need a little tweak to select the right format on x32.
--- fs/xfs/xfs_ioctl32.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)
fs/xfs/xfs_ioctl32.c +30 -4
@@ -251,6 +251,32 @@ xfs_compat_ioc_bulkstat(int done;int error; +/* +* Output structure handling functions. Depending on the command, +* either the xfs_bstat and xfs_inogrp structures are written out +* to userpace memory via bulkreq.ubuffer. Normally the compat +* functions and structure size are the correct ones to use ... +*/ +inumbers_fmt_pf inumbers_func = xfs_inumbers_fmt_compat; +bulkstat_one_pf bs_one_func = xfs_bulkstat_one_compat; +size_t bs_one_size =sizeof (struct compat_xfs_bstat ); + +#ifdef CONFIG_X86_X32 +if (in_x32_syscall ()) { +/* +* ... but on x32 the input xfs_fsop_bulkreq has pointers +* which must be handled in the "compat" (32-bit) way, while +* the xfs_bstat and xfs_inogrp structures follow native 64- +* bit layout convention. So adjust accordingly, otherwise +* the data written out in compat layout will not match what +* x32 userspace expects. +*/ + inumbers_func = xfs_inumbers_fmt; + bs_one_func = xfs_bulkstat_one; + bs_one_size =sizeof (struct xfs_bstat ); + } +#endif +/* done = 1 if there are more stats to get and if bulkstat */ /* should be called again (unused here, but used in dmapi) */
@@ -282,15 +308,15 @@ xfs_compat_ioc_bulkstat(if (cmd ==XFS_IOC_FSINUMBERS_32 ) { error =xfs_inumbers (mp, &inlast, &count, - bulkreq.ubuffer, xfs_inumbers_fmt_compat); + bulkreq.ubuffer, inumbers_func); }else if (cmd ==XFS_IOC_FSBULKSTAT_SINGLE_32 ) {int res; - error =xfs_bulkstat_one_compat (mp, inlast, bulkreq.ubuffer, -sizeof (compat_xfs_bstat_t),NULL , &res); + error =bs_one_func (mp, inlast, bulkreq.ubuffer, + bs_one_size,NULL , &res); }else if (cmd ==XFS_IOC_FSBULKSTAT_32 ) { error =xfs_bulkstat (mp, &inlast, &count, - xfs_bulkstat_one_compat,sizeof (compat_xfs_bstat_t), + bs_one_func, bs_one_size, bulkreq.ubuffer, &done); }else error = -EINVAL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/125 powerpc/xmon: fix dump_segments()
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 32c8c4c621897199e690760c2d57054f8b84b6e6 ]
mfsrin() takes segment num from bits 31-28 (IBM bits 0-3).
--- arch/powerpc/xmon/xmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/xmon/xmon.c +1 -1
@@ -3043,7 +3043,7 @@ void dump_segments(void)printf ("sr0-15 =" );for (i =0 ; i <16 ; ++i) -printf (" %x" ,mfsrin (i)); +printf (" %x" ,mfsrin (i <<28 )); printf("\n"); }#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/125 drivers/regulator: fix a missing check of return value
In reply to Greg Kroah-HartmanFrom: Kangjie Lu <[email protected]>
[ Upstream commit 966e927bf8cc6a44f8b72582a1d6d3ffc73b12ad ]
If palmas_smps_read() fails, we should not use the read data in "reg" which may contain random value. The fix inserts a check for the return value of palmas_smps_read(): If it fails, we return the error code upstream and stop using "reg".
--- drivers/regulator/palmas-regulator.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/regulator/palmas-regulator.c +4 -1
@@ -435,13 +435,16 @@ static int palmas_ldo_write(struct palmas *palmas, unsigned int reg,static int palmas_set_mode_smps (struct regulator_dev *dev,unsigned int mode) {int id =rdev_get_id (dev); +int ret;struct palmas_pmic *pmic =rdev_get_drvdata (dev);struct palmas_pmic_driver_data *ddata = pmic->palmas->pmic_ddata;struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id];unsigned int reg;bool rail_enable = true; -palmas_smps_read (pmic->palmas, rinfo->ctrl_addr, ®); + ret =palmas_smps_read (pmic->palmas, rinfo->ctrl_addr, ®); +if (ret) +return ret; reg &= ~PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/125 serial: max310x: Fix tx_empty() callback
In reply to Greg Kroah-HartmanFrom: Alexander Shiyan <[email protected]>
[ Upstream commit a8da3c7873ea57acb8f9cea58c0af477522965aa ]
Function max310x_tx_empty() accesses the IRQSTS register, which is cleared by IC when reading, so if there is an interrupt status, we will lose it. This patch implement the transmitter check only by the current FIFO level.
--- drivers/tty/serial/max310x.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/tty/serial/max310x.c +2 -5
@@ -769,12 +769,9 @@ static void max310x_start_tx(struct uart_port *port)static unsigned int max310x_tx_empty (struct uart_port *port) { -unsigned int lvl, sts; +u8 lvl =max310x_port_read (port,MAX310X_TXFIFOLVL_REG ); - lvl =max310x_port_read (port,MAX310X_TXFIFOLVL_REG ); - sts =max310x_port_read (port,MAX310X_IRQSTS_REG ); - -return ((sts &MAX310X_IRQ_TXEMPTY_BIT ) && !lvl) ?TIOCSER_TEMT :0 ; +return lvl ?0 :TIOCSER_TEMT ; }static unsigned int max310x_get_mctrl (struct uart_port *port)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/125 btrfs: only track ref_heads in delayed_ref_updates
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 158ffa364bf723fa1ef128060646d23dc3942994 ]
We use this number to figure out how many delayed refs to run, but __btrfs_run_delayed_refs really only checks every time we need a new delayed ref head, so we always run at least one ref head completely no matter what the number of items on it. Fix the accounting to only be adjusted when we add/remove a ref head.
In addition to using this number to limit the number of delayed refs run, a future patch is also going to use it to calculate the amount of space required for delayed refs space reservation.
--- fs/btrfs/delayed-ref.c | 3 --- 1 file changed, 3 deletions(-)
fs/btrfs/delayed-ref.c +0 -3
@@ -193,8 +193,6 @@ static inline void drop_delayed_ref(struct btrfs_trans_handle *trans, ref->in_tree =0 ;btrfs_put_delayed_ref (ref);atomic_dec (&delayed_refs->num_entries); -if (trans->delayed_ref_updates) - trans->delayed_ref_updates--; } static bool merge_ref(struct btrfs_trans_handle *trans,
@@ -445,7 +443,6 @@ add_delayed_ref_tail_merge(struct btrfs_trans_handle *trans, add_tail:list_add_tail (&ref->list, &href->ref_list);atomic_inc (&root->num_entries); - trans->delayed_ref_updates++;spin_unlock (&href->lock);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/125 openrisc: Fix broken paths to arch/or32
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff ]
OpenRISC was mainlined as "openrisc", not "or32". vmlinux.lds is generated from vmlinux.lds.S.
--- arch/openrisc/kernel/entry.S | 2 +- arch/openrisc/kernel/head.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/openrisc/kernel/entry.S +1 -1
@@ -179,7 +179,7 @@ handler: ;\ * occured. in fact they never do. if you need them use * values saved on stack (for SPR_EPC, SPR_ESR) or content * of r4 (for SPR_EEAR). for details look at EXCEPTION_HANDLE() - * in 'arch/or32/kernel/head.S' + * in 'arch/openrisc/kernel/head.S' */ /* =====================================================[ exceptions] === */
arch/openrisc/kernel/head.S +1 -1
@@ -1596,7 +1596,7 @@ _string_esr_irq_bug: /* * .data section should be page aligned - * (look into arch/or32/kernel/vmlinux.lds) + * (look into arch/openrisc/kernel/vmlinux.lds.S) */ .section .data,"aw" .align 8192
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/125 RDMA/srp: Propagate ib_post_send() failures to the SCSI mid-layer
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 2ee00f6a98c36f7e4ba07cc33f24cc5a69060cc9 ]
This patch avoids that the SCSI mid-layer keeps retrying forever if ib_post_send() fails. This was discovered while testing immediate data support and passing a too large num_sge value to ib_post_send().
--- drivers/infiniband/ulp/srp/ib_srp.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/ulp/srp/ib_srp.c +1 -0
@@ -2180,6 +2180,7 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd)if (srp_post_send (ch, iu, len)) {shost_printk (KERN_ERR , target->scsi_host,PFX "Send failed\n" ); + scmnd->result =DID_ERROR <<16 ; goto err_unmap; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/125 scsi: qla2xxx: deadlock by configfs_depend_item
In reply to Greg Kroah-HartmanFrom: Anatoliy Glagolev <[email protected]>
[ Upstream commit 17b18eaa6f59044a5172db7d07149e31ede0f920 ]
The intent of invoking configfs_depend_item in commit 7474f52a82d51 ("tcm_qla2xxx: Perform configfs depend/undepend for base_tpg") was to prevent a physical Fibre Channel port removal when virtual (NPIV) ports announced through that physical port are active. The change does not work as expected: it makes enabled physical port dependent on target configfs subsystem (the port's parent), something the configfs guarantees anyway.
Besides, scheduling work in a worker thread and waiting for the work's completion is not really a valid workaround for the requirement not to call configfs_depend_item from a configfs callback: the call occasionally deadlocks.
Thus, removing configfs_depend_item calls does not break anything and fixes the deadlock problem.
--- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 48 +++++------------------------- drivers/scsi/qla2xxx/tcm_qla2xxx.h | 3 -- 2 files changed, 8 insertions(+), 43 deletions(-)
drivers/scsi/qla2xxx/tcm_qla2xxx.c +8 -40
@@ -821,38 +821,14 @@ static ssize_t tcm_qla2xxx_tpg_enable_show(struct config_item *item, atomic_read(&tpg->lport_tpg_enabled)); } -static void tcm_qla2xxx_depend_tpg (struct work_struct *work) -{ -struct tcm_qla2xxx_tpg *base_tpg =container_of (work, - struct tcm_qla2xxx_tpg, tpg_base_work); -struct se_portal_group *se_tpg = &base_tpg->se_tpg; -struct scsi_qla_host *base_vha = base_tpg->lport->qla_vha; - -if (!target_depend_item (&se_tpg->tpg_group.cg_item)) { -atomic_set (&base_tpg->lport_tpg_enabled,1 ); -qlt_enable_vha (base_vha); - } -complete (&base_tpg->tpg_base_comp); -} - -static void tcm_qla2xxx_undepend_tpg (struct work_struct *work) -{ -struct tcm_qla2xxx_tpg *base_tpg =container_of (work, - struct tcm_qla2xxx_tpg, tpg_base_work); -struct se_portal_group *se_tpg = &base_tpg->se_tpg; -struct scsi_qla_host *base_vha = base_tpg->lport->qla_vha; - -if (!qlt_stop_phase1 (base_vha->vha_tgt.qla_tgt)) { -atomic_set (&base_tpg->lport_tpg_enabled,0 ); -target_undepend_item (&se_tpg->tpg_group.cg_item); - } -complete (&base_tpg->tpg_base_comp); -} -static ssize_t tcm_qla2xxx_tpg_enable_store (struct config_item *item,const char *page,size_t count) {struct se_portal_group *se_tpg =to_tpg (item); +struct se_wwn *se_wwn = se_tpg->se_tpg_wwn; +struct tcm_qla2xxx_lport *lport =container_of (se_wwn, + struct tcm_qla2xxx_lport, lport_wwn); +struct scsi_qla_host *vha = lport->qla_vha;struct tcm_qla2xxx_tpg *tpg =container_of (se_tpg, struct tcm_qla2xxx_tpg, se_tpg);unsigned long op;
@@ -871,24 +847,16 @@ static ssize_t tcm_qla2xxx_tpg_enable_store(struct config_item *item,if (atomic_read (&tpg->lport_tpg_enabled))return -EEXIST ; -INIT_WORK (&tpg->tpg_base_work, tcm_qla2xxx_depend_tpg); +atomic_set (&tpg->lport_tpg_enabled,1 ); +qlt_enable_vha (vha); }else {if (!atomic_read (&tpg->lport_tpg_enabled))return count; -INIT_WORK (&tpg->tpg_base_work, tcm_qla2xxx_undepend_tpg); +atomic_set (&tpg->lport_tpg_enabled,0 ); +qlt_stop_phase1 (vha->vha_tgt.qla_tgt); } -init_completion (&tpg->tpg_base_comp); -schedule_work (&tpg->tpg_base_work); -wait_for_completion (&tpg->tpg_base_comp); -if (op) { -if (!atomic_read (&tpg->lport_tpg_enabled)) -return -ENODEV ; - }else { -if (atomic_read (&tpg->lport_tpg_enabled)) -return -EPERM ; - }return count; }
drivers/scsi/qla2xxx/tcm_qla2xxx.h +0 -3
@@ -48,9 +48,6 @@ struct tcm_qla2xxx_tpg {struct tcm_qla2xxx_tpg_attrib tpg_attrib;/* Returned by tcm_qla2xxx_make_tpg() */ struct se_portal_group se_tpg; -/* Items for dealing with configfs_depend_item */ -struct completion tpg_base_comp; -struct work_struct tpg_base_work; };struct tcm_qla2xxx_fc_loopid {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/125 ath6kl: Only use match sets when firmware supports it
In reply to Greg Kroah-HartmanFrom: Kyle Roeschley <[email protected]>
[ Upstream commit fb376a495fbdb886f38cfaf5a3805401b9e46f13 ]
Commit dd45b7598f1c ("ath6kl: Include match ssid list in scheduled scan") merged the probed and matched SSID lists before sending them to the firmware. In the process, it assumed match set support is always available in ath6kl_set_probed_ssids, which breaks scans for hidden SSIDs. Now, check that the firmware supports matching SSIDs in scheduled scans before setting MATCH_SSID_FLAG.
--- drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/cfg80211.c +1 -1
@@ -934,7 +934,7 @@ static int ath6kl_set_probed_ssids(struct ath6kl *ar,else ssid_list[i].flag =ANY_SSID_FLAG ; -if (n_match_ssid ==0 ) +if (ar->wiphy->max_match_sets !=0 && n_match_ssid ==0 ) ssid_list[i].flag |=MATCH_SSID_FLAG ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/125 ath6kl: Fix off by one error in scan completion
In reply to Greg Kroah-HartmanFrom: Kyle Roeschley <[email protected]>
[ Upstream commit 5803c12816c43bd09e5f4247dd9313c2d9a2c41b ]
When ath6kl was reworked to share code between regular and scheduled scans in commit 3b8ffc6a22ba ("ath6kl: Configure probed SSID list consistently"), probed SSID entry changed from 1-index to 0-indexed. However, ath6kl_cfg80211_scan_complete_event() was missed in that change. Fix its indexing so that we correctly clear out the probed SSID list.
--- drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/cfg80211.c +1 -1
@@ -1088,7 +1088,7 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted)if (vif->scan_req->n_ssids && vif->scan_req->ssids[0 ].ssid_len) {for (i =0 ; i < vif->scan_req->n_ssids; i++) {ath6kl_wmi_probedssid_cmd (ar->wmi, vif->fw_vif_idx, - i +1 ,DISABLE_SSID_FLAG , + i,DISABLE_SSID_FLAG ,0 ,NULL ); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/125 powerpc/prom: fix early DEBUG messages
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit b18f0ae92b0a1db565c3e505fa87b6971ad3b641 ]
This patch fixes early DEBUG messages in prom.c:
- Use %px instead of %p to see the addresses
- Cast memblock_phys_mem_size() with (unsigned long long) to avoid build failure when phys_addr_t is not 64 bits.
--- arch/powerpc/kernel/prom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/kernel/prom.c +3 -3
@@ -128,7 +128,7 @@ static void __init move_device_tree(void) p =__va (memblock_alloc (size,PAGE_SIZE ));memcpy (p, initial_boot_params, size); initial_boot_params = p; -DBG ("Moved device tree to 0x%p\n" , p); +DBG ("Moved device tree to 0x%px\n" , p); }DBG ("<- move_device_tree\n" );
@@ -651,7 +651,7 @@ void __init early_init_devtree(void *params) {phys_addr_t limit; -DBG (" -> early_init_devtree(%p)\n" , params); +DBG (" -> early_init_devtree(%px)\n" , params);/* Too early to BUG_ON(), do it by hand */ if (!early_init_dt_verify (params))
@@ -711,7 +711,7 @@ void __init early_init_devtree(void *params)memblock_allow_resize ();memblock_dump_all (); -DBG ("Phys. mem: %llx\n" ,memblock_phys_mem_size ()); +DBG ("Phys. mem: %llx\n" , (unsigned long long )memblock_phys_mem_size ());/* We may need to relocate the flat tree, do it now. * FIXME .. and the initrd too? */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/125 powerpc/44x/bamboo: Fix PCI range
In reply to Greg Kroah-HartmanFrom: Benjamin Herrenschmidt <[email protected]>
[ Upstream commit 3cfb9ebe906b51f2942b1e251009bb251efd2ba6 ]
The bamboo dts has a bug: it uses a non-naturally aligned range for PCI memory space. This isnt' supported by the code, thus causing PCI to break on this system.
This is due to the fact that while the chip memory map has 1G reserved for PCI memory, it's only 512M aligned. The code doesn't know how to split that into 2 different PMMs and fails, so limit the region to 512M.
--- arch/powerpc/boot/dts/bamboo.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/boot/dts/bamboo.dts +3 -1
@@ -268,8 +268,10 @@ /* Outbound ranges, one memory and one IO, * later cannot be changed. Chip supports a second * IO range but we don't use it for now + * The chip also supports a larger memory range but + * it's not naturally aligned, so our code will break */ - ranges = <0x02000000 0x00000000 0xa0000000 0x00000000 0xa0000000 0x00000000 0x40000000 + ranges = <0x02000000 0x00000000 0xa0000000 0x00000000 0xa0000000 0x00000000 0x20000000 0x02000000 0x00000000 0x00000000 0x00000000 0xe0000000 0x00000000 0x00100000 0x01000000 0x00000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/125 vfio/spapr_tce: Get rid of possible infinite loop
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit 517ad4ae8aa93dccdb9a88c27257ecb421c9e848 ]
As a part of cleanup, the SPAPR TCE IOMMU subdriver releases preregistered memory. If there is a bug in memory release, the loop in tce_iommu_release() becomes infinite; this actually happened to me.
This makes the loop finite and prints a warning on every failure to make the code more bug prone.
--- drivers/vfio/vfio_iommu_spapr_tce.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/vfio/vfio_iommu_spapr_tce.c +3 -7
@@ -406,6 +406,7 @@ static void tce_iommu_release(void *iommu_data) {struct tce_container *container = iommu_data;struct tce_iommu_group *tcegrp; +struct tce_iommu_prereg *tcemem, *tmtmp;long i;while (tce_groups_attached (container)) {
@@ -428,13 +429,8 @@ static void tce_iommu_release(void *iommu_data)tce_iommu_free_table (container, tbl); } -while (!list_empty (&container->prereg_list)) { -struct tce_iommu_prereg *tcemem; - - tcemem =list_first_entry (&container->prereg_list, - struct tce_iommu_prereg, next); -WARN_ON_ONCE (tce_iommu_prereg_free (container, tcemem)); - } +list_for_each_entry_safe (tcemem, tmtmp, &container->prereg_list, next) +WARN_ON (tce_iommu_prereg_free (container, tcemem));tce_iommu_disable (container);if (container->mm)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/125 powerpc/powernv/eeh/npu: Fix uninitialized variables in opal_pci_eeh_freeze_status
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit c20577014f85f36d4e137d3d52a1f61225b4a3d2 ]
The current implementation of the OPAL_PCI_EEH_FREEZE_STATUS call in skiboot's NPU driver does not touch the pci_error_type parameter so it might have garbage but the powernv code analyzes it nevertheless.
This initializes pcierr and fstate to zero in all call sites.
--- arch/powerpc/platforms/powernv/eeh-powernv.c | 8 ++++---- arch/powerpc/platforms/powernv/pci-ioda.c | 4 ++-- arch/powerpc/platforms/powernv/pci.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/platforms/powernv/eeh-powernv.c +4 -4
@@ -546,8 +546,8 @@ static void pnv_eeh_get_phb_diag(struct eeh_pe *pe)static int pnv_eeh_get_phb_state (struct eeh_pe *pe) {struct pnv_phb *phb = pe->phb->private_data; -u8 fstate; -__be16 pcierr; +u8 fstate =0 ; +__be16 pcierr =0 ;s64 rc;int result =0 ;
@@ -585,8 +585,8 @@ static int pnv_eeh_get_phb_state(struct eeh_pe *pe)static int pnv_eeh_get_pe_state (struct eeh_pe *pe) {struct pnv_phb *phb = pe->phb->private_data; -u8 fstate; -__be16 pcierr; +u8 fstate =0 ; +__be16 pcierr =0 ;s64 rc;int result;
arch/powerpc/platforms/powernv/pci-ioda.c +2 -2
@@ -599,8 +599,8 @@ static int pnv_ioda_unfreeze_pe(struct pnv_phb *phb, int pe_no, int opt)static int pnv_ioda_get_pe_state (struct pnv_phb *phb,int pe_no) {struct pnv_ioda_pe *slave, *pe; -u8 fstate, state; -__be16 pcierr; +u8 fstate =0 , state; +__be16 pcierr =0 ;s64 rc;/* Sanity check on PE number */
arch/powerpc/platforms/powernv/pci.c +2 -2
@@ -482,8 +482,8 @@ static void pnv_pci_handle_eeh_config(struct pnv_phb *phb, u32 pe_no)static void pnv_pci_config_check_eeh (struct pci_dn *pdn) {struct pnv_phb *phb = pdn->phb->private_data; -u8 fstate; -__be16 pcierr; +u8 fstate =0 ; +__be16 pcierr =0 ;unsigned int pe_no;s64 rc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/125 drbd: ignore "all zero" peer volume sizes in handshake
In reply to Greg Kroah-HartmanFrom: Lars Ellenberg <[email protected]>
[ Upstream commit 94c43a13b8d6e3e0dd77b3536b5e04a84936b762 ]
During handshake, if we are diskless ourselves, we used to accept any size presented by the peer.
Which could be zero if that peer was just brought up and connected to us without having a disk attached first, in which case both peers would just "flip" their volume sizes.
Now, even a diskless node will ignore "zero" sizes presented by a diskless peer.
Also a currently Diskless Primary will refuse to shrink during handshake:
it may be frozen, and waiting for a "suitable" local disk or peer to re-appear (on-no-data-accessible suspend-io). If the peer is smaller than what we used to be, it is not suitable.
The logic for a diskless node during handshake is now supposed to be:
believe the peer, if
- I don't have a current size myself
- we agree on the size anyways
- I do have a current size, am Secondary, and he has the only disk
- I do have a current size, am Primary, and he has the only disk, which is larger than my current size
--- drivers/block/drbd/drbd_receiver.c | 33 +++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)
drivers/block/drbd/drbd_receiver.c +30 -3
@@ -4037,6 +4037,7 @@ static int receive_sizes(struct drbd_connection *connection, struct packet_infostruct o_qlim *o = (connection->agreed_features &DRBD_FF_WSAME ) ? p->qlim :NULL ;enum determine_dev_size dd =DS_UNCHANGED ;sector_t p_size, p_usize, p_csize, my_usize; +sector_t new_size, cur_size;int ldsc =0 ;/* local disk size changed */ enum dds_flags ddsf;
@@ -4044,6 +4045,7 @@ static int receive_sizes(struct drbd_connection *connection, struct packet_infoif (!peer_device)return config_unknown_volume (connection, pi); device = peer_device->device; + cur_size =drbd_get_capacity (device->this_bdev); p_size =be64_to_cpu (p->d_size); p_usize =be64_to_cpu (p->u_size);
@@ -4054,7 +4056,6 @@ static int receive_sizes(struct drbd_connection *connection, struct packet_info device->p_size = p_size;if (get_ldev (device)) { -sector_t new_size, cur_size;rcu_read_lock (); my_usize =rcu_dereference (device->ldev->disk_conf)->disk_size;rcu_read_unlock ();
@@ -4072,7 +4073,6 @@ static int receive_sizes(struct drbd_connection *connection, struct packet_info/* Never shrink a device with usable data during connect. But allow online shrinking if we are connected. */ new_size =drbd_new_dev_size (device, device->ldev, p_usize,0 ); - cur_size =drbd_get_capacity (device->this_bdev);if (new_size < cur_size && device->state.disk >=D_OUTDATED && device->state.conn <C_CONNECTED ) {
@@ -4137,9 +4137,36 @@ static int receive_sizes(struct drbd_connection *connection, struct packet_info* * However, if he sends a zero current size, * take his (user-capped or) backing disk size anyways. +* +* Unless of course he does not have a disk himself. +* In which case we ignore this completely. */ +sector_t new_size = p_csize ?: p_usize ?: p_size;drbd_reconsider_queue_parameters (device,NULL , o); -drbd_set_my_capacity (device, p_csize ?: p_usize ?: p_size); +if (new_size ==0 ) { +/* Ignore, peer does not know nothing. */ + }else if (new_size == cur_size) { +/* nothing to do */ + }else if (cur_size !=0 && p_size ==0 ) { +drbd_warn (device,"Ignored diskless peer device size (peer:%llu != me:%llu sectors)!\n" , + (unsigned long long )new_size, (unsigned long long )cur_size); + }else if (new_size < cur_size && device->state.role ==R_PRIMARY ) { +drbd_err (device,"The peer's device size is too small! (%llu < %llu sectors); demote me first!\n" , + (unsigned long long )new_size, (unsigned long long )cur_size); +conn_request_state (peer_device->connection,NS (conn,C_DISCONNECTING ),CS_HARD ); +return -EIO ; + }else { +/* I believe the peer, if +* - I don't have a current size myself +* - we agree on the size anyways +* - I do have a current size, am Secondary, +* and he has the only disk +* - I do have a current size, am Primary, +* and he has the only disk, +* which is larger than my current size +*/ +drbd_set_my_capacity (device, new_size); + } }if (get_ldev (device)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/125 drbd: do not block when adjusting "disk-options" while IO is frozen
In reply to Greg Kroah-HartmanFrom: Lars Ellenberg <[email protected]>
[ Upstream commit f708bd08ecbdc23d03aaedf5b3311ebe44cfdb50 ]
"suspending" IO is overloaded.
It can mean "do not allow new requests" (obviously), but it also may mean "must not complete pending IO", for example while the fencing handlers do their arbitration.
When adjusting disk options, we suspend io (disallow new requests), then wait for the activity-log to become unused (drain all IO completions), and possibly replace it with a new activity log of different size.
If the other "suspend IO" aspect is active, pending IO completions won't happen, and we would block forever (unkillable drbdsetup process).
Fix this by skipping the activity log adjustment if the "al-extents" setting did not change. Also, in case it did change, fail early without blocking if it looks like we would block forever.
--- drivers/block/drbd/drbd_nl.c | 37 ++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-)
drivers/block/drbd/drbd_nl.c +29 -8
@@ -1508,6 +1508,30 @@ static void sanitize_disk_conf(struct drbd_device *device, struct disk_conf *dis } } +static int disk_opts_check_al_size (struct drbd_device *device,struct disk_conf *dc) +{ +int err = -EBUSY ; + +if (device->act_log && + device->act_log->nr_elements == dc->al_extents) +return 0 ; + +drbd_suspend_io (device); +/* If IO completion is currently blocked, we would likely wait +* "forever" for the activity log to become unused. So we don't. */ +if (atomic_read (&device->ap_bio_cnt)) + goto out; + +wait_event (device->al_wait,lc_try_lock (device->act_log)); +drbd_al_shrink (device); + err =drbd_check_al_size (device, dc); +lc_unlock (device->act_log); +wake_up (&device->al_wait); +out: +drbd_resume_io (device); +return err; +} +int drbd_adm_disk_opts (struct sk_buff *skb,struct genl_info *info) {struct drbd_config_context adm_ctx;
@@ -1570,15 +1594,12 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info) } } -drbd_suspend_io (device); -wait_event (device->al_wait,lc_try_lock (device->act_log)); -drbd_al_shrink (device); - err =drbd_check_al_size (device, new_disk_conf); -lc_unlock (device->act_log); -wake_up (&device->al_wait); -drbd_resume_io (device); - + err =disk_opts_check_al_size (device, new_disk_conf);if (err) { +/* Could be just "busy". Ignore? +* Introduce dedicated error code? */ +drbd_msg_put_info (adm_ctx.reply_skb, +"Try again without changing current al-extents setting" ); retcode =ERR_NOMEM ; goto fail_unlock; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/125 drbd: fix print_st_err()s prototype to match the definition
In reply to Greg Kroah-HartmanFrom: Luc Van Oostenryck <[email protected]>
[ Upstream commit 2c38f035117331eb78d0504843c79ea7c7fabf37 ]
print_st_err() is defined with its 4th argument taking an 'enum drbd_state_rv' but its prototype use an int for it.
Fix this by using 'enum drbd_state_rv' in the prototype too.
--- drivers/block/drbd/drbd_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/drbd/drbd_state.h +1 -1
@@ -126,7 +126,7 @@ extern enum drbd_state_rv _drbd_set_state(struct drbd_device *, union drbd_state enum chg_state_flags, struct completion *done);extern void print_st_err (struct drbd_device *,union drbd_state , -union drbd_state ,int ); +union drbd_state ,enum drbd_state_rv ); enum drbd_state_rv _conn_request_state(struct drbd_connection *connection, union drbd_state mask, union drbd_state val,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/125 regulator: tps65910: fix a missing check of return value
In reply to Greg Kroah-HartmanFrom: Kangjie Lu <[email protected]>
[ Upstream commit cd07e3701fa6a4c68f8493ee1d12caa18d46ec6a ]
tps65910_reg_set_bits() may fail. The fix checks if it fails, and if so, returns with its error code.
--- drivers/regulator/tps65910-regulator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/regulator/tps65910-regulator.c +3 -1
@@ -1102,8 +1102,10 @@ static int tps65910_probe(struct platform_device *pdev)platform_set_drvdata (pdev, pmic);/* Give control of all register to control port */ -tps65910_reg_set_bits (pmic->mfd,TPS65910_DEVCTRL , + err =tps65910_reg_set_bits (pmic->mfd,TPS65910_DEVCTRL ,DEVCTRL_SR_CTL_I2C_SEL_MASK ); +if (err <0 ) +return err;switch (tps65910_chip_id (tps65910)) {case TPS65910 :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/125 powerpc/pseries: Fix node leak in update_lmb_associativity_index()
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 47918bc68b7427e961035949cc1501a864578a69 ]
In update_lmb_associativity_index() we lookup dr_node using of_find_node_by_path() which takes a reference for us. In the non-error case we forget to drop the reference. Note that find_aa_index() does modify properties of the node, but doesn't need an extra reference held once it's returned.
--- arch/powerpc/platforms/pseries/hotplug-memory.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/pseries/hotplug-memory.c +1 -0
@@ -294,6 +294,7 @@ static u32 lookup_lmb_associativity_index(struct of_drconf_cell *lmb) aa_index =find_aa_index (dr_node, ala_prop, lmb_assoc); +of_node_put (dr_node);dlpar_free_cc_nodes (lmb_node);return aa_index; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/125 xen/pciback: Check dev_data before using it
In reply to Greg Kroah-HartmanFrom: Ross Lagerwall <[email protected]>
[ Upstream commit 1669907e3d1abfa3f7586e2d55dbbc117b5adba2 ]
If pcistub_init_device fails, the release function will be called with dev_data set to NULL. Check it before using it to avoid a NULL pointer dereference.
--- drivers/xen/xen-pciback/pci_stub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/xen/xen-pciback/pci_stub.c +2 -1
@@ -106,7 +106,8 @@ static void pcistub_device_release(struct kref *kref)* is called from "unbind" which takes a device_lock mutex. */ __pci_reset_function_locked (dev); -if (pci_load_and_free_saved_state (dev, &dev_data->pci_saved_state)) +if (dev_data && +pci_load_and_free_saved_state (dev, &dev_data->pci_saved_state))dev_info (&dev->dev,"Could not reload PCI state\n" );else pci_restore_state (dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/125 pwm: clps711x: Fix period calculation
In reply to Greg Kroah-HartmanFrom: Alexander Shiyan <[email protected]>
[ Upstream commit b0f17570b8203c22f139459c86cfbaa0311313ed ]
Commit e39c0df1be5a ("pwm: Introduce the pwm_args concept") has changed the variable for the period for clps711x-pwm driver, so now pwm_get/set_period() works with pwm->state.period variable instead of pwm->args.period.
This patch changes the period variable in other places where it is used.
--- drivers/pwm/pwm-clps711x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pwm/pwm-clps711x.c +2 -2
@@ -48,7 +48,7 @@ static void clps711x_pwm_update_val(struct clps711x_chip *priv, u32 n, u32 v)static unsigned int clps711x_get_duty (struct pwm_device *pwm,unsigned int v) {/* Duty cycle 0..15 max */ -return DIV_ROUND_CLOSEST (v *0xf ,pwm_get_period (pwm)); +return DIV_ROUND_CLOSEST (v *0xf , pwm->args.period); }static int clps711x_pwm_request (struct pwm_chip *chip,struct pwm_device *pwm)
@@ -71,7 +71,7 @@ static int clps711x_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,struct clps711x_chip *priv =to_clps711x_chip (chip);unsigned int duty; -if (period_ns !=pwm_get_period (pwm)) +if (period_ns != pwm->args.period)return -EINVAL ; duty =clps711x_get_duty (pwm, duty_ns);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/125 net/net_namespace: Check the return value of register_pernet_subsys()
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit 0eb987c874dc93f9c9d85a6465dbde20fdd3884c ]
In net_ns_init(), register_pernet_subsys() could fail while registering network namespace subsystems. The fix checks the return value and sends a panic() on failure.
--- net/core/net_namespace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/net_namespace.c +2 -1
@@ -802,7 +802,8 @@ static int __init net_ns_init(void)mutex_unlock (&net_mutex); -register_pernet_subsys (&net_ns_ops); +if (register_pernet_subsys (&net_ns_ops)) +panic ("Could not register network namespace subsystems" );rtnl_register (PF_UNSPEC ,RTM_NEWNSID , rtnl_net_newid,NULL ,NULL ); rtnl_register(PF_UNSPEC, RTM_GETNSID, rtnl_net_getid, rtnl_net_dumpid,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/125 um: Make GCOV depend on !KCOV
In reply to Greg Kroah-HartmanFrom: Richard Weinberger <[email protected]>
[ Upstream commit 550ed0e2036663b35cec12374b835444f9c60454 ]
Both do more or less the same thing and are mutually exclusive. If both are enabled the build will fail.
Sooner or later we can kill UML's GCOV.
--- arch/um/Kconfig.debug | 1 + 1 file changed, 1 insertion(+)
arch/um/Kconfig.debug +1 -0
@@ -18,6 +18,7 @@ config GPROF config GCOV bool "Enable gcov support" depends on DEBUG_INFO + depends on !KCOV help This option allows developers to retrieve coverage data from a UML session.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/125 net: stmicro: fix a missing check of clk_prepare
In reply to Greg Kroah-HartmanFrom: Kangjie Lu <[email protected]>
[ Upstream commit f86a3b83833e7cfe558ca4d70b64ebc48903efec ]
clk_prepare() could fail, so let's check its status, and if it fails, return its error code upstream.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c +3 -1
@@ -59,7 +59,9 @@ static int sun7i_gmac_init(struct platform_device *pdev, void *priv) gmac->clk_enabled =1 ; }else {clk_set_rate (gmac->tx_clk,SUN7I_GMAC_MII_RATE ); -clk_prepare (gmac->tx_clk); + ret =clk_prepare (gmac->tx_clk); +if (ret) +return ret; }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/125 net: dsa: bcm_sf2: Propagate error value from mdio_write
In reply to Greg Kroah-HartmanFrom: Kangjie Lu <[email protected]>
[ Upstream commit e49505f7255be8ced695919c08a29bf2c3d79616 ]
Both bcm_sf2_sw_indir_rw and mdiobus_write_nested could fail, so let's return their error codes upstream.
--- drivers/net/dsa/bcm_sf2.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/dsa/bcm_sf2.c +3 -4
@@ -405,11 +405,10 @@ static int bcm_sf2_sw_mdio_write(struct mii_bus *bus, int addr, int regnum,* send them to our master MDIO bus controller */ if (addr ==BRCM_PSEUDO_PHY_ADDR && priv->indir_phy_mask &BIT (addr)) -bcm_sf2_sw_indir_rw (priv,0 , addr, regnum, val); +return bcm_sf2_sw_indir_rw (priv,0 , addr, regnum, val);else -mdiobus_write_nested (priv->master_mii_bus, addr, regnum, val); - -return 0 ; +return mdiobus_write_nested (priv->master_mii_bus, addr, + regnum, val); }static irqreturn_t bcm_sf2_switch_0_isr (int irq,void *dev_id)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/125 tipc: fix a missing check of genlmsg_put
In reply to Greg Kroah-HartmanFrom: Kangjie Lu <[email protected]>
[ Upstream commit 46273cf7e009231d2b6bc10a926e82b8928a9fb2 ]
genlmsg_put could fail. The fix inserts a check of its return value, and if it fails, returns -EMSGSIZE.
--- net/tipc/netlink_compat.c | 2 ++ 1 file changed, 2 insertions(+)
net/tipc/netlink_compat.c +2 -0
@@ -974,6 +974,8 @@ static int tipc_nl_compat_publ_dump(struct tipc_nl_compat_msg *msg, u32 sock) hdr =genlmsg_put (args,0 ,0 , &tipc_genl_family,NLM_F_MULTI ,TIPC_NL_PUBL_GET ); +if (!hdr) +return -EMSGSIZE ; nest =nla_nest_start (args,TIPC_NLA_SOCK );if (!nest) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/125 net/wan/fsl_ucc_hdlc: Avoid double free in ucc_hdlc_probe()
In reply to Greg Kroah-HartmanFrom: Wen Yang <[email protected]>
[ Upstream commit 40752b3eae29f8ca2378e978a02bd6dbeeb06d16 ]
This patch fixes potential double frees if register_hdlc_device() fails.
--- drivers/net/wan/fsl_ucc_hdlc.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wan/fsl_ucc_hdlc.c +0 -1
@@ -1117,7 +1117,6 @@ static int ucc_hdlc_probe(struct platform_device *pdev)if (register_hdlc_device (dev)) { ret = -ENOBUFS ;pr_err ("ucc_hdlc: unable to register hdlc device\n" ); -free_netdev (dev); goto free_dev; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/125 pinctrl: xway: fix gpio-hog related boot issues
In reply to Greg Kroah-HartmanFrom: Martin Schiller <[email protected]>
[ Upstream commit 9b4924da4711674e62d97d4f5360446cc78337af ]
This patch is based on commit a86caa9ba5d7 ("pinctrl: msm: fix gpio-hog related boot issues").
It fixes the issue that the gpio ranges needs to be defined before gpiochip_add().
Therefore, we also have to swap the order of registering the pinctrl driver and registering the gpio chip.
You also have to add the "gpio-ranges" property to the pinctrl device node to get it finally working.
--- drivers/pinctrl/pinctrl-xway.c | 39 +++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 12 deletions(-)
drivers/pinctrl/pinctrl-xway.c +27 -12
@@ -1748,14 +1748,6 @@ static int pinmux_xway_probe(struct platform_device *pdev) } xway_pctrl_desc.pins = xway_info.pads; -/* register the gpio chip */ - xway_chip.parent = &pdev->dev; - ret =devm_gpiochip_add_data (&pdev->dev, &xway_chip,NULL ); -if (ret) { -dev_err (&pdev->dev,"Failed to register gpio chip\n" ); -return ret; - } -/* setup the data needed by pinctrl */ xway_pctrl_desc.name =dev_name (&pdev->dev); xway_pctrl_desc.npins = xway_chip.ngpio;
@@ -1777,10 +1769,33 @@ static int pinmux_xway_probe(struct platform_device *pdev)return ret; } -/* finish with registering the gpio range in pinctrl */ - xway_gpio_range.npins = xway_chip.ngpio; - xway_gpio_range.base = xway_chip.base; -pinctrl_add_gpio_range (xway_info.pctrl, &xway_gpio_range); +/* register the gpio chip */ + xway_chip.parent = &pdev->dev; + xway_chip.owner =THIS_MODULE ; + xway_chip.of_node = pdev->dev.of_node; + ret =devm_gpiochip_add_data (&pdev->dev, &xway_chip,NULL ); +if (ret) { +dev_err (&pdev->dev,"Failed to register gpio chip\n" ); +return ret; + } + +/* +* For DeviceTree-supported systems, the gpio core checks the +* pinctrl's device node for the "gpio-ranges" property. +* If it is present, it takes care of adding the pin ranges +* for the driver. In this case the driver can skip ahead. +* +* In order to remain compatible with older, existing DeviceTree +* files which don't set the "gpio-ranges" property or systems that +* utilize ACPI the driver has to call gpiochip_add_pin_range(). +*/ +if (!of_property_read_bool (pdev->dev.of_node,"gpio-ranges" )) { +/* finish with registering the gpio range in pinctrl */ + xway_gpio_range.npins = xway_chip.ngpio; + xway_gpio_range.base = xway_chip.base; +pinctrl_add_gpio_range (xway_info.pctrl, &xway_gpio_range); + } +dev_info (&pdev->dev,"Init done\n" );return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/125 KVM: s390: unregister debug feature on failing arch init
In reply to Greg Kroah-HartmanFrom: Michael Mueller <[email protected]>
[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ]
Make sure the debug feature and its allocated resources get released upon unsuccessful architecture initialization.
A related indication of the issue will be reported as kernel message.
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/s390/kvm/kvm-s390.c +14 -3
@@ -319,19 +319,30 @@ static void kvm_s390_cpu_feat_init(void)int kvm_arch_init (void *opaque) { +int rc; + kvm_s390_dbf =debug_register ("kvm-trace" ,32 ,1 ,7 *sizeof (long ));if (!kvm_s390_dbf)return -ENOMEM ;if (debug_register_view (kvm_s390_dbf, &debug_sprintf_view)) { -debug_unregister (kvm_s390_dbf); -return -ENOMEM ; + rc = -ENOMEM ; + goto out_debug_unreg; }kvm_s390_cpu_feat_init ();/* Register floating interrupt controller interface. */ -return kvm_register_device_ops (&kvm_flic_ops,KVM_DEV_TYPE_FLIC ); + rc =kvm_register_device_ops (&kvm_flic_ops,KVM_DEV_TYPE_FLIC ); +if (rc) { +pr_err ("Failed to register FLIC rc=%d\n" , rc); + goto out_debug_unreg; + } +return 0 ; + +out_debug_unreg: +debug_unregister (kvm_s390_dbf); +return rc; }void kvm_arch_exit (void )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/125 net/mlx5: Continue driver initialization despite debugfs failure
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 199fa087dc6b503baad06712716fac645a983e8a ]
The failure to create debugfs entry is unpleasant event, but not enough to abort drier initialization. Align the mlx5_core code to debugfs design and continue execution whenever debugfs_create_dir() successes or not.
--- drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +3 -5
@@ -786,11 +786,9 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct mlx5_priv *priv) priv->numa_node =dev_to_node (&dev->pdev->dev); - priv->dbg_root =debugfs_create_dir (dev_name (&pdev->dev), mlx5_debugfs_root); -if (!priv->dbg_root) { -dev_err (&pdev->dev,"Cannot create debugfs dir, aborting\n" ); -return -ENOMEM ; - } +if (mlx5_debugfs_root) + priv->dbg_root = +debugfs_create_dir (pci_name (pdev), mlx5_debugfs_root); err =mlx5_pci_enable_device (dev);if (err) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/125 pinctrl: sh-pfc: sh7264: Fix PFCR3 and PFCR0 register configuration
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 1b99d0c80bbe1810572c2cb77b90f67886adfa8d ]
The Port F Control Register 3 (PFCR3) contains only a single field. However, counting from left to right, it is the fourth field, not the first field.
Insert the missing dummy configuration values (3 fields of 16 values) to fix this.
The descriptor for the Port F Control Register 0 (PFCR0) lacks the description for the 4th field (PF0 Mode, PF0MD[2:0]). Add the missing configuration values to fix this.
--- drivers/pinctrl/sh-pfc/pfc-sh7264.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pinctrl/sh-pfc/pfc-sh7264.c +7 -2
@@ -1716,6 +1716,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { }, { PINMUX_CFG_REG("PFCR3", 0xfffe38a8, 16, 4) { +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,PF12MD_000 ,PF12MD_001 ,0 ,PF12MD_011 ,PF12MD_100 ,PF12MD_101 ,0 ,0 , 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -1759,8 +1762,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,PF1MD_000 ,PF1MD_001 ,PF1MD_010 ,PF1MD_011 ,PF1MD_100 ,PF1MD_101 ,0 ,0 , -0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 - } +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +PF0MD_000 ,PF0MD_001 ,PF0MD_010 ,PF0MD_011 , +PF0MD_100 ,PF0MD_101 ,0 ,0 , + 0, 0, 0, 0, 0, 0, 0, 0 } }, { PINMUX_CFG_REG("PFIOR0", 0xfffe38b2, 16, 1) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/125 VSOCK: bind to random port for VMADDR_PORT_ANY
In reply to Greg Kroah-HartmanFrom: Lepton Wu <[email protected]>
[ Upstream commit 8236b08cf50f85bbfaf48910a0b3ee68318b7c4b ]
The old code always starts from fixed port for VMADDR_PORT_ANY. Sometimes when VMM crashed, there is still orphaned vsock which is waiting for close timer, then it could cause connection time out for new started VM if they are trying to connect to same port with same guest cid since the new packets could hit that orphaned vsock. We could also fix this by doing more in vhost_vsock_reset_orphans, but any way, it should be better to start from a random local port instead of a fixed one.
--- net/vmw_vsock/af_vsock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/vmw_vsock/af_vsock.c +6 -1
@@ -97,6 +97,7 @@#include <linux/mutex.h> #include <linux/net.h> #include <linux/poll.h> +#include <linux/random.h> #include <linux/skbuff.h> #include <linux/smp.h> #include <linux/socket.h>
@@ -501,9 +502,13 @@ out:static int __vsock_bind_stream (struct vsock_sock *vsk,struct sockaddr_vm *addr) { -static u32 port =LAST_RESERVED_PORT +1 ; +static u32 port =0 ;struct sockaddr_vm new_addr; +if (!port) + port =LAST_RESERVED_PORT +1 + +prandom_u32_max (U32_MAX -LAST_RESERVED_PORT ); +vsock_addr_init (&new_addr, addr->svm_cid, addr->svm_port);if (addr->svm_port ==VMADDR_PORT_ANY ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/125 lib/genalloc.c: fix allocation of aligned buffer from non-aligned chunk
In reply to Greg Kroah-HartmanFrom: Alexey Skidanov <[email protected]>
[ Upstream commit 52fbf1134d479234d7e64ba9dcbaea23405f229e ]
gen_pool_alloc_algo() uses different allocation functions implementing different allocation algorithms. With gen_pool_first_fit_align() allocation function, the returned address should be aligned on the requested boundary.
If chunk start address isn't aligned on the requested boundary, the returned address isn't aligned too. The only way to get properly aligned address is to initialize the pool with chunks aligned on the requested boundary. If want to have an ability to allocate buffers aligned on different boundaries (for example, 4K, 1MB, ...), the chunk start address should be aligned on the max possible alignment.
This happens because gen_pool_first_fit_align() looks for properly aligned memory block without taking into account the chunk start address alignment.
To fix this, we provide chunk start address to gen_pool_first_fit_align() and change its implementation such that it starts looking for properly aligned block with appropriate offset (exactly as is done in CMA).
--- include/linux/genalloc.h | 13 +++++++------ lib/genalloc.c | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-)
include/linux/genalloc.h +7 -6
@@ -50,7 +50,8 @@ typedef unsigned long (*genpool_algo_t)(unsigned long *map,unsigned long size, unsigned long start, unsigned int nr, - void *data, struct gen_pool *pool); + void *data, struct gen_pool *pool, + unsigned long start_addr);/* * General purpose special memory pool descriptor.
@@ -130,24 +131,24 @@ extern void gen_pool_set_algo(struct gen_pool *pool, genpool_algo_t algo,extern unsigned long gen_pool_first_fit (unsigned long *map,unsigned long size,unsigned long start,unsigned int nr,void *data, -struct gen_pool *pool); +struct gen_pool *pool,unsigned long start_addr);extern unsigned long gen_pool_fixed_alloc (unsigned long *map,unsigned long size,unsigned long start,unsigned int nr, -void *data,struct gen_pool *pool); +void *data,struct gen_pool *pool,unsigned long start_addr);extern unsigned long gen_pool_first_fit_align (unsigned long *map,unsigned long size,unsigned long start,unsigned int nr, -void *data,struct gen_pool *pool); +void *data,struct gen_pool *pool,unsigned long start_addr);extern unsigned long gen_pool_first_fit_order_align (unsigned long *map,unsigned long size,unsigned long start,unsigned int nr, -void *data,struct gen_pool *pool); +void *data,struct gen_pool *pool,unsigned long start_addr);extern unsigned long gen_pool_best_fit (unsigned long *map,unsigned long size,unsigned long start,unsigned int nr,void *data, -struct gen_pool *pool); +struct gen_pool *pool,unsigned long start_addr); extern struct gen_pool *devm_gen_pool_create(struct device *dev,
lib/genalloc.c +12 -8
@@ -311,7 +311,7 @@ unsigned long gen_pool_alloc_algo(struct gen_pool *pool, size_t size, end_bit =chunk_size (chunk) >> order; retry: start_bit =algo (chunk->bits, end_bit, start_bit, - nbits, data, pool); + nbits, data, pool, chunk->start_addr);if (start_bit >= end_bit)continue ; remain =bitmap_set_ll (chunk->bits, start_bit, nbits);
@@ -525,7 +525,7 @@ EXPORT_SYMBOL(gen_pool_set_algo);*/ unsigned long gen_pool_first_fit (unsigned long *map,unsigned long size,unsigned long start,unsigned int nr,void *data, -struct gen_pool *pool) +struct gen_pool *pool,unsigned long start_addr) {return bitmap_find_next_zero_area (map, size, start, nr,0 ); }
@@ -543,16 +543,19 @@ EXPORT_SYMBOL(gen_pool_first_fit);*/ unsigned long gen_pool_first_fit_align (unsigned long *map,unsigned long size,unsigned long start,unsigned int nr,void *data, -struct gen_pool *pool) +struct gen_pool *pool,unsigned long start_addr) {struct genpool_data_align *alignment; -unsigned long align_mask; +unsigned long align_mask, align_off;int order; alignment = data; order = pool->min_alloc_order; align_mask = ((alignment->align + (1UL << order) -1 ) >> order) -1 ; -return bitmap_find_next_zero_area (map, size, start, nr, align_mask); + align_off = (start_addr & (alignment->align -1 )) >> order; + +return bitmap_find_next_zero_area_off (map, size, start, nr, + align_mask, align_off); }EXPORT_SYMBOL (gen_pool_first_fit_align);
@@ -567,7 +570,7 @@ EXPORT_SYMBOL(gen_pool_first_fit_align);*/ unsigned long gen_pool_fixed_alloc (unsigned long *map,unsigned long size,unsigned long start,unsigned int nr,void *data, -struct gen_pool *pool) +struct gen_pool *pool,unsigned long start_addr) {struct genpool_data_fixed *fixed_data;int order;
@@ -601,7 +604,8 @@ EXPORT_SYMBOL(gen_pool_fixed_alloc);*/ unsigned long gen_pool_first_fit_order_align (unsigned long *map,unsigned long size,unsigned long start, -unsigned int nr,void *data,struct gen_pool *pool) +unsigned int nr,void *data,struct gen_pool *pool, +unsigned long start_addr) {unsigned long align_mask =roundup_pow_of_two (nr) -1 ;
@@ -624,7 +628,7 @@ EXPORT_SYMBOL(gen_pool_first_fit_order_align);*/ unsigned long gen_pool_best_fit (unsigned long *map,unsigned long size,unsigned long start,unsigned int nr,void *data, -struct gen_pool *pool) +struct gen_pool *pool,unsigned long start_addr) {unsigned long start_bit = size;unsigned long len = size +1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/125 ip_tunnel: Make none-tunnel-dst tunnel port work with lwtunnel
In reply to Greg Kroah-HartmanFrom: wenxu <[email protected]>
[ Upstream commit d71b57532d70c03f4671dd04e84157ac6bf021b0 ]
ip l add dev tun type gretap key 1000
ip a a dev tun 10.0.0.1/24
Packets with tun-id 1000 can be recived by tun dev. But packet can't be sent through dev tun for non-tunnel-dst
With this patch: tunnel-dst can be get through lwtunnel like beflow:
ip r a 10.0.0.7 encap ip dst 172.168.0.11 dev tun
--- net/ipv4/ip_tunnel.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/ipv4/ip_tunnel.c +7 -1
@@ -653,13 +653,19 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, dst = tnl_params->daddr;if (dst ==0 ) {/* NBMA tunnel */ +struct ip_tunnel_info *tun_info;if (!skb_dst (skb)) { dev->stats.tx_fifo_errors++; goto tx_error; } -if (skb->protocol ==htons (ETH_P_IP )) { + tun_info =skb_tunnel_info (skb); +if (tun_info && (tun_info->mode &IP_TUNNEL_INFO_TX ) && +ip_tunnel_info_af (tun_info) ==AF_INET && + tun_info->key.u.ipv4.dst) + dst = tun_info->key.u.ipv4.dst; +else if (skb->protocol ==htons (ETH_P_IP )) { rt =skb_rtable (skb); dst =rt_nexthop (rt, inner_iph->daddr); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/125 tipc: fix skb may be leaky in tipc_link_input
In reply to Greg Kroah-HartmanFrom: Hoang Le <[email protected]>
[ Upstream commit 7384b538d3aed2ed49d3575483d17aeee790fb06 ]
When we free skb at tipc_data_input, we return a 'false' boolean. Then, skb passed to subcalling tipc_link_input in tipc_link_rcv,
<snip>
1303 int tipc_link_rcv:
...
1354 if (!tipc_data_input(l, skb, l->inputq))
1355 rc |= tipc_link_input(l, skb, l->inputq);
</snip>
Fix it by simple changing to a 'true' boolean when skb is being free-ed. Then, tipc_link_rcv will bypassed to subcalling tipc_link_input as above condition.
--- net/tipc/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/link.c +1 -1
@@ -1063,7 +1063,7 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,default :pr_warn ("Dropping received illegal msg type\n" );kfree_skb (skb); -return false; +return true; }; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/125 sfc: initialise found bitmap in efx_ef10_mtd_probe
In reply to Greg Kroah-HartmanFrom: Bert Kenward <[email protected]>
[ Upstream commit c65285428b6e7797f1bb063f33b0ae7e93397b7b ]
The bitmap of found partitions in efx_ef10_mtd_probe was not initialised, causing partitions to be suppressed based off whatever value was in the bitmap at the start.
--- drivers/net/ethernet/sfc/ef10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/sfc/ef10.c +1 -1
@@ -5159,7 +5159,7 @@ static int efx_ef10_mtd_probe_partition(struct efx_nic *efx,static int efx_ef10_mtd_probe (struct efx_nic *efx) {MCDI_DECLARE_BUF (outbuf,MC_CMD_NVRAM_PARTITIONS_OUT_LENMAX ); -DECLARE_BITMAP (found,EF10_NVRAM_PARTITION_COUNT ); + DECLARE_BITMAP(found, EF10_NVRAM_PARTITION_COUNT) = { 0 };struct efx_mcdi_mtd_partition *parts;size_t outlen, n_parts_total, i, n_parts;unsigned int type;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/125 sctp: dont compare hb_timer expire date before starting it
In reply to Greg Kroah-HartmanFrom: Maciej Kwiecien <[email protected]>
[ Upstream commit d1f20c03f48102e52eb98b8651d129b83134cae4 ]
hb_timer might not start at all for a particular transport because its start is conditional. In a result a node is not sending heartbeats.
Function sctp_transport_reset_hb_timer has two roles:
- initial start of hb_timer for a given transport,
- update expire date of hb_timer for a given transport.
The function is optimized to update timer's expire only if it is before a new calculated one but this comparison is invalid for a timer which has not yet started. Such a timer has expire == 0 and if a new expire value is bigger than (MAX_JIFFIES / 2 + 2) then "time_before" macro will fail and timer will not start resulting in no heartbeat packets send by the node.
This was found when association was initialized within first 5 mins after system boot due to jiffies init value which is near to MAX_JIFFIES.
Test kernel version: 4.9.154 (ARCH=arm)
hb_timer.expire = 0; //initialized, not started timernew_expire = MAX_JIFFIES / 2 + 2; //or moretime_before(hb_timer.expire, new_expire) == false
--- net/sctp/transport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sctp/transport.c +2 -1
@@ -205,7 +205,8 @@ void sctp_transport_reset_hb_timer(struct sctp_transport *transport)/* When a data chunk is sent, reset the heartbeat interval. */ expires = jiffies +sctp_transport_timeout (transport); -if (time_before (transport->hb_timer.expires, expires) && +if ((time_before (transport->hb_timer.expires, expires) || + !timer_pending (&transport->hb_timer)) && !mod_timer (&transport->hb_timer, expires +prandom_u32_max (transport->rto)))sctp_transport_hold (transport);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/125 iommu/amd: Fix NULL dereference bug in match_hid_uid
In reply to Greg Kroah-HartmanFrom: Aaron Ma <[email protected]>
[ Upstream commit bb6bccba390c7d743c1e4427de4ef284c8cc6869 ]
Add a non-NULL check to fix potential NULL pointer dereference Cleanup code to call function once.
--- drivers/iommu/amd_iommu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/iommu/amd_iommu.c +6 -2
@@ -176,10 +176,14 @@ static struct lock_class_key reserved_rbtree_key;static inline int match_hid_uid (struct device *dev,struct acpihid_map_entry *entry) { +struct acpi_device *adev =ACPI_COMPANION (dev);const char *hid, *uid; - hid =acpi_device_hid (ACPI_COMPANION (dev)); - uid =acpi_device_uid (ACPI_COMPANION (dev)); +if (!adev) +return -ENODEV ; + + hid =acpi_device_hid (adev); + uid =acpi_device_uid (adev);if (!hid || !(*hid))return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/125 ACPI / APEI: Switch estatus pool to use vmalloc memory
In reply to Greg Kroah-HartmanFrom: James Morse <[email protected]>
[ Upstream commit 0ac234be1a9497498e57d958f4251f5257b116b4 ]
The ghes code is careful to parse and round firmware's advertised memory requirements for CPER records, up to a maximum of 64K. However when ghes_estatus_pool_expand() does its work, it splits the requested size into PAGE_SIZE granules.
This means if firmware generates 5K of CPER records, and correctly describes this in the table, __process_error() will silently fail as it is unable to allocate more than PAGE_SIZE.
Switch the estatus pool to vmalloc() memory. On x86 vmalloc() memory may fault and be fixed up by vmalloc_fault(). To prevent this call vmalloc_sync_all() before an NMI handler could discover the memory.
--- drivers/acpi/apei/ghes.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/acpi/apei/ghes.c +15 -15
@@ -203,40 +203,40 @@ static int ghes_estatus_pool_init(void)return 0 ; } -static void ghes_estatus_pool_free_chunk_page (struct gen_pool *pool, +static void ghes_estatus_pool_free_chunk (struct gen_pool *pool,struct gen_pool_chunk *chunk,void *data) { -free_page (chunk->start_addr); +vfree ((void *)chunk->start_addr); }static void ghes_estatus_pool_exit (void ) {gen_pool_for_each_chunk (ghes_estatus_pool, - ghes_estatus_pool_free_chunk_page,NULL ); + ghes_estatus_pool_free_chunk,NULL );gen_pool_destroy (ghes_estatus_pool); }static int ghes_estatus_pool_expand (unsigned long len) { -unsigned long i, pages, size, addr; -int ret; +unsigned long size, addr; ghes_estatus_pool_size_request +=PAGE_ALIGN (len); size =gen_pool_size (ghes_estatus_pool);if (size >= ghes_estatus_pool_size_request)return 0 ; - pages = (ghes_estatus_pool_size_request - size) /PAGE_SIZE ; -for (i =0 ; i < pages; i++) { - addr =__get_free_page (GFP_KERNEL ); -if (!addr) -return -ENOMEM ; - ret =gen_pool_add (ghes_estatus_pool, addr,PAGE_SIZE ,-1 ); -if (ret) -return ret; - } -return 0 ; + addr = (unsigned long )vmalloc (PAGE_ALIGN (len)); +if (!addr) +return -ENOMEM ; + +/* +* New allocation must be visible in all pgd before it can be found by +* an NMI allocating from the pool. +*/ +vmalloc_sync_all (); + +return gen_pool_add (ghes_estatus_pool, addr,PAGE_ALIGN (len),-1 ); }static struct ghes *ghes_new (struct acpi_hest_generic *generic)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/125 scsi: libsas: Check SMP PHY control function result
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
[ Upstream commit 01929a65dfa13e18d89264ab1378854a91857e59 ]
Currently the SMP PHY control execution result is checked, however the function result for the command is not.
As such, we may be missing all potential errors, like SMP FUNCTION FAILED, INVALID REQUEST FRAME LENGTH, etc., meaning the PHY control request has failed.
In some scenarios we need to ensure the function result is accepted, so add a check for this.
--- drivers/scsi/libsas/sas_expander.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/scsi/libsas/sas_expander.c +8 -1
@@ -603,7 +603,14 @@ int sas_smp_phy_control(struct domain_device *dev, int phy_id, } res =smp_execute_task (dev, pc_req,PC_REQ_SIZE , pc_resp,PC_RESP_SIZE ); - +if (res) { +pr_err ("ex %016llx phy%02d PHY control failed: %d\n" , +SAS_ADDR (dev->sas_addr), phy_id, res); + }else if (pc_resp[2 ] !=SMP_RESP_FUNC_ACC ) { +pr_err ("ex %016llx phy%02d PHY control failed: function result 0x%x\n" , +SAS_ADDR (dev->sas_addr), phy_id, pc_resp[2 ]); + res = pc_resp[2 ]; + }kfree (pc_resp);kfree (pc_req);return res;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/125 mtd: Remove a debug trace in mtdpart.c
In reply to Greg Kroah-HartmanFrom: Boris Brezillon <[email protected]>
[ Upstream commit bda2ab56356b9acdfab150f31c4bac9846253092 ]
Commit 2b6f0090a333 ("mtd: Check add_mtd_device() ret code") contained a leftover of the debug session that led to this bug fix. Remove this pr_info().
--- drivers/mtd/mtdpart.c | 1 - 1 file changed, 1 deletion(-)
drivers/mtd/mtdpart.c +0 -1
@@ -662,7 +662,6 @@ err_remove_part:mutex_unlock (&mtd_partitions_mutex);free_partition (new); -pr_info ("%s:%i\n" , __func__, __LINE__);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/125 mm, gup: add missing refcount overflow checks on x86 and s390
In reply to Greg Kroah-HartmanFrom: Vlastimil Babka <[email protected]>
The mainline commit 8fde12ca79af ("mm: prevent get_user_pages() from overflowing page refcount") was backported to 4.9.y stable as commit 2ed768cfd895. The backport however missed that in 4.9, there are several arch-specific gup.c versions with fast gup implementations, so these do not prevent refcount overflow.
This is partially fixed for x86 in stable-only commit d73af79742e7 ("x86, mm,
gup: prevent get_page() race with munmap in paravirt guest"). This stable-only commit adds missing parts to x86 version, as well as s390 version, both taken from the SUSE SLES/openSUSE 4.12-based kernels.
The remaining architectures with own gup.c are sparc, mips, sh. It's unlikely the known overflow scenario based on FUSE, which needs 140GB of RAM, is a problem for those architectures, and I don't feel confident enough to patch them.
--- arch/s390/mm/gup.c | 9 ++++++--- arch/x86/mm/gup.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-)
arch/s390/mm/gup.c +6 -3
@@ -38,7 +38,8 @@ static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,VM_BUG_ON (!pfn_valid (pte_pfn (pte))); page =pte_page (pte); head =compound_head (page); -if (!page_cache_get_speculative (head)) +if (unlikely (WARN_ON_ONCE (page_ref_count (head) <0 ) + || !page_cache_get_speculative (head)))return 0 ;if (unlikely (pte_val (pte) !=pte_val (*ptep))) {put_page (head);
@@ -76,7 +77,8 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, refs++; }while (addr +=PAGE_SIZE , addr != end); -if (!page_cache_add_speculative (head, refs)) { +if (unlikely (WARN_ON_ONCE (page_ref_count (head) <0 ) + || !page_cache_add_speculative (head, refs))) { *nr -= refs;return 0 ; }
@@ -150,7 +152,8 @@ static int gup_huge_pud(pud_t *pudp, pud_t pud, unsigned long addr, refs++; }while (addr +=PAGE_SIZE , addr != end); -if (!page_cache_add_speculative (head, refs)) { +if (unlikely (WARN_ON_ONCE (page_ref_count (head) <0 ) + || !page_cache_add_speculative (head, refs))) { *nr -= refs;return 0 ; }
arch/x86/mm/gup.c +8 -2
@@ -202,10 +202,12 @@ static int __gup_device_huge_pmd(pmd_t pmd, unsigned long addr,undo_dev_pagemap (nr, nr_start, pages);return 0 ; } +if (unlikely (!try_get_page (page))) { +put_dev_pagemap (pgmap); +return 0 ; + }SetPageReferenced (page); pages[*nr] = page; -get_page (page); -put_dev_pagemap (pgmap); (*nr)++; pfn++; }while (addr +=PAGE_SIZE , addr != end);
@@ -230,6 +232,8 @@ static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr, refs =0 ; head =pmd_page (pmd); +if (WARN_ON_ONCE (page_ref_count (head) <=0 )) +return 0 ; page = head + ((addr & ~PMD_MASK ) >>PAGE_SHIFT ); do { VM_BUG_ON_PAGE(compound_head(page) != head, page);
@@ -289,6 +293,8 @@ static noinline int gup_huge_pud(pud_t pud, unsigned long addr, refs =0 ; head =pud_page (pud); +if (WARN_ON_ONCE (page_ref_count (head) <=0 )) +return 0 ; page = head + ((addr & ~PUD_MASK ) >>PAGE_SHIFT ); do { VM_BUG_ON_PAGE(compound_head(page) != head, page);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/125 clk: at91: fix update bit maps on CFG_MOR write
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
commit 263eaf8f172d9f44e15d6aca85fe40ec18d2c477 upstream.
The regmap update bits call was not selecting the proper mask, considering the bits which was updating.
Update the mask from call to also include OSCBYPASS.
Removed MOSCEN which was not updated.
--- drivers/clk/at91/clk-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-main.c +1 -1
@@ -162,7 +162,7 @@ at91_clk_register_main_osc(struct regmapif (bypass)regmap_update_bits (regmap,AT91_CKGR_MOR ,MOR_KEY_MASK | -AT91_PMC_MOSCEN , +AT91_PMC_OSCBYPASS ,AT91_PMC_OSCBYPASS |AT91_PMC_KEY ); hw = &osc->hw;
Greg Kroah-Hartman
maintainerPATCH 107/125 staging: rtl8192e: fix potential use after free
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
commit b7aa39a2ed0112d07fc277ebd24a08a7b2368ab9 upstream.
The variable skb is released via kfree_skb() when the return value of _rtl92e_tx is not zero. However, after that, skb is accessed again to read its length, which may result in a use after free bug. This patch fixes the bug by moving the release operation to where skb is never used later.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +3 -2
@@ -1630,14 +1630,15 @@ static void _rtl92e_hard_data_xmit(strucmemcpy ((unsigned char *)(skb->cb), &dev,sizeof (dev));skb_push (skb, priv->rtllib->tx_headroom); ret =_rtl92e_tx (dev, skb); -if (ret !=0 ) -kfree_skb (skb);if (queue_index !=MGNT_QUEUE ) { priv->rtllib->stats.tx_bytes += (skb->len - priv->rtllib->tx_headroom); priv->rtllib->stats.tx_packets++; } + +if (ret !=0 ) +kfree_skb (skb); }static int _rtl92e_hard_start_xmit (struct sk_buff *skb,struct net_device *dev)
Greg Kroah-Hartman
maintainerPATCH 109/125 mei: bus: prefix device names on bus with the bus name
In reply to Greg Kroah-HartmanFrom: Alexander Usyskin <[email protected]>
commit 7a2b9e6ec84588b0be65cc0ae45a65bac431496b upstream.
Add parent device name to the name of devices on bus to avoid device names collisions for same client UUID available from different MEI heads. Namely this prevents sysfs collision under /sys/bus/mei/device/
In the device part leave just UUID other parameters that are required for device matching are not required here and are just bloating the name.
--- drivers/misc/mei/bus.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/misc/mei/bus.c +5 -4
@@ -765,15 +765,16 @@ static struct device_type mei_cl_device_/** * mei_cl_bus_set_name - set device name for me client device +* <controller>-<client device> +* Example: 0000:00:16.0-55213584-9a29-4916-badf-0fb7ed682aeb * * @cldev: me client device */ static inline void mei_cl_bus_set_name (struct mei_cl_device *cldev) { -dev_set_name (&cldev->dev,"mei:%s:%pUl:%02X" , - cldev->name, -mei_me_cl_uuid (cldev->me_cl), -mei_me_cl_ver (cldev->me_cl)); +dev_set_name (&cldev->dev,"%s-%pUl" , +dev_name (cldev->bus->dev), +mei_me_cl_uuid (cldev->me_cl)); }/**
Greg Kroah-Hartman
maintainerPATCH 110/125 media: v4l2-ctrl: fix flags for DO_WHITE_BALANCE
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
commit a0816e5088baab82aa738d61a55513114a673c8e upstream.
Control DO_WHITE_BALANCE is a button, with read only and execute-on-write flags. Adding this control in the proper list in the fill function.
After adding it here, we can see output of v4l2-ctl -L do_white_balance 0x0098090d (button) : flags=write-only, execute-on-write
--- drivers/media/v4l2-core/v4l2-ctrls.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -0
@@ -1007,6 +1007,7 @@ void v4l2_ctrl_fill(u32 id, const char *case V4L2_CID_FLASH_STROBE_STOP :case V4L2_CID_AUTO_FOCUS_START :case V4L2_CID_AUTO_FOCUS_STOP : +case V4L2_CID_DO_WHITE_BALANCE : *type =V4L2_CTRL_TYPE_BUTTON ; *flags |=V4L2_CTRL_FLAG_WRITE_ONLY |V4L2_CTRL_FLAG_EXECUTE_ON_WRITE ;
Greg Kroah-Hartman
maintainerPATCH 85/125 drivers/base/platform.c: kmemleak ignore a known leak
In reply to Greg Kroah-HartmanFrom: Qian Cai <[email protected]>
[ Upstream commit 967d3010df8b6f6f9aa95c198edc5fe3646ebf36 ]
unreferenced object 0xffff808ec6dc5a80 (size 128):
comm "swapper/0", pid 1, jiffies 4294938063 (age 2560.530s) hex dump (first 32 bytes):
ff ff ff ff 00 00 00 00 6b 6b 6b 6b 6b 6b 6b 6b ........kkkkkkkk 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
backtrace:
[<00000000476dcf8c>] kmem_cache_alloc_trace+0x430/0x500
[<000000004f708d37>] platform_device_register_full+0xbc/0x1e8
[<000000006c2a7ec7>] acpi_create_platform_device+0x370/0x450
[<00000000ef135642>] acpi_default_enumeration+0x34/0x78
[<000000003bd9a052>] acpi_bus_attach+0x2dc/0x3e0
[<000000003cf4f7f2>] acpi_bus_attach+0x108/0x3e0
[<000000003cf4f7f2>] acpi_bus_attach+0x108/0x3e0
[<000000002968643e>] acpi_bus_scan+0xb0/0x110
[<0000000010dd0bd7>] acpi_scan_init+0x1a8/0x410
[<00000000965b3c5a>] acpi_init+0x408/0x49c
[<00000000ed4b9fe2>] do_one_initcall+0x178/0x7f4
[<00000000a5ac5a74>] kernel_init_freeable+0x9d4/0xa9c
[<0000000070ea6c15>] kernel_init+0x18/0x138
[<00000000fb8fff06>] ret_from_fork+0x10/0x1c
[<0000000041273a0d>] 0xffffffffffffffffThen, faddr2line pointed out this line,
/*
* This memory isn't freed when the device is put,
* I don't have a nice idea for that though. Conceptually
* dma_mask in struct device should not be a pointer.
* See http://thread.gmane.org/gmane.linux.kernel.pci/9081
*/pdev->dev.dma_mask =
kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
Since this leak has existed for more than 8 years and it does not reference other parts of the memory, let kmemleak ignore it, so users don't need to waste time reporting this in the future.
--- drivers/base/platform.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/base/platform.c +3 -0
@@ -27,6 +27,7 @@#include <linux/clk/clk-conf.h> #include <linux/limits.h> #include <linux/property.h> +#include <linux/kmemleak.h> #include "base.h" #include "power/power.h"
@@ -516,6 +517,8 @@ struct platform_device *platform_device_register_full(if (!pdev->dev.dma_mask) goto err; +kmemleak_ignore (pdev->dev.dma_mask); + *pdev->dev.dma_mask = pdevinfo->dma_mask; pdev->dev.coherent_dma_mask = pdevinfo->dma_mask; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/125 net: macb: fix error format in dev_err()
In reply to Greg Kroah-HartmanFrom: Luca Ceresoli <[email protected]>
commit f413cbb332a0b5251a790f396d0eb4ebcade5dec upstream.
Errors are negative numbers. Using %u shows them as very large positive numbers such as 4294967277 that don't make sense. Use the %d format instead, and get a much nicer -19.
--- drivers/net/ethernet/cadence/macb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/cadence/macb.c +7 -7
@@ -2364,14 +2364,14 @@ static int macb_clk_init(struct platform *pclk =devm_clk_get (&pdev->dev,"pclk" );if (IS_ERR (*pclk)) { err =PTR_ERR (*pclk); -dev_err (&pdev->dev,"failed to get macb_clk (%u)\n" , err); +dev_err (&pdev->dev,"failed to get macb_clk (%d)\n" , err);return err; } *hclk =devm_clk_get (&pdev->dev,"hclk" );if (IS_ERR (*hclk)) { err =PTR_ERR (*hclk); -dev_err (&pdev->dev,"failed to get hclk (%u)\n" , err); +dev_err (&pdev->dev,"failed to get hclk (%d)\n" , err);return err; }
@@ -2385,25 +2385,25 @@ static int macb_clk_init(struct platform err =clk_prepare_enable (*pclk);if (err) { -dev_err (&pdev->dev,"failed to enable pclk (%u)\n" , err); +dev_err (&pdev->dev,"failed to enable pclk (%d)\n" , err);return err; } err =clk_prepare_enable (*hclk);if (err) { -dev_err (&pdev->dev,"failed to enable hclk (%u)\n" , err); +dev_err (&pdev->dev,"failed to enable hclk (%d)\n" , err); goto err_disable_pclk; } err =clk_prepare_enable (*tx_clk);if (err) { -dev_err (&pdev->dev,"failed to enable tx_clk (%u)\n" , err); +dev_err (&pdev->dev,"failed to enable tx_clk (%d)\n" , err); goto err_disable_hclk; } err =clk_prepare_enable (*rx_clk);if (err) { -dev_err (&pdev->dev,"failed to enable rx_clk (%u)\n" , err); +dev_err (&pdev->dev,"failed to enable rx_clk (%d)\n" , err); goto err_disable_txclk; }
@@ -2823,7 +2823,7 @@ static int at91ether_clk_init(struct pla err =clk_prepare_enable (*pclk);if (err) { -dev_err (&pdev->dev,"failed to enable pclk (%u)\n" , err); +dev_err (&pdev->dev,"failed to enable pclk (%d)\n" , err);return err; }
Greg Kroah-Hartman
maintainerPATCH 113/125 media: atmel: atmel-isc: fix asd memory allocation
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
commit 1e4e25c4959c10728fbfcc6a286f9503d32dfe02 upstream.
The subsystem will free the asd memory on notifier cleanup, if the asd is added to the notifier.
However the memory is freed using kfree.
Thus, we cannot allocate the asd using devm_*
This can lead to crashes and problems.
To test this issue, just return an error at probe, but cleanup the notifier beforehand.
--- drivers/media/platform/atmel/atmel-isc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/platform/atmel/atmel-isc.c +6 -2
@@ -1297,8 +1297,11 @@ static int isc_parse_dt(struct device *dbreak ; } - subdev_entity->asd =devm_kzalloc (dev, -sizeof (*subdev_entity->asd),GFP_KERNEL ); +/* asd will be freed by the subsystem once it's added to the +* notifier list +*/ + subdev_entity->asd =kzalloc (sizeof (*subdev_entity->asd), +GFP_KERNEL );if (subdev_entity->asd ==NULL ) {of_node_put (rem); ret = -ENOMEM ;
@@ -1432,6 +1435,7 @@ static int atmel_isc_probe(struct platfo &subdev_entity->notifier);if (ret) {dev_err (dev,"fail to register async notifier\n" ); +kfree (subdev_entity->asd); goto cleanup_subdev; }
Greg Kroah-Hartman
maintainerPATCH 117/125 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info()
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 8ffeb03fbba3b599690b361467bfd2373e8c450f ]
All the callers of ovs_flow_cmd_build_info() already deal with error return code correctly, so we can handle the error condition in a more gracefull way. Still dump a warning to preserve debuggability.
v1 -> v2:
- clarify the commit message
- clean the skb and report the error (DaveM)
--- net/openvswitch/datapath.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/openvswitch/datapath.c +4 -1
@@ -920,7 +920,10 @@ static struct sk_buff *ovs_flow_cmd_buil retval =ovs_flow_cmd_fill_info (flow, dp_ifindex, skb, info->snd_portid, info->snd_seq,0 , cmd, ufid_flags); -BUG_ON (retval <0 ); +if (WARN_ON_ONCE (retval <0 )) { +kfree_skb (skb); + skb =ERR_PTR (retval); + }return skb; }
Greg Kroah-Hartman
maintainerPATCH 119/125 tipc: fix link name length check
In reply to Greg Kroah-HartmanFrom: John Rutherford <[email protected]>
[ Upstream commit fd567ac20cb0377ff466d3337e6e9ac5d0cb15e4 ]
In commit 4f07b80c9733 ("tipc: check msg->req data len in tipc_nl_compat_bearer_disable") the same patch code was copied into
routines: tipc_nl_compat_bearer_disable(), tipc_nl_compat_link_stat_dump() and tipc_nl_compat_link_reset_stats(). The two link routine occurrences should have been modified to check the maximum link name length and not bearer name length.
--- net/tipc/netlink_compat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/tipc/netlink_compat.c +2 -2
@@ -539,7 +539,7 @@ static int tipc_nl_compat_link_stat_dumpif (len <=0 )return -EINVAL ; - len =min_t (int, len,TIPC_MAX_BEARER_NAME ); + len =min_t (int, len,TIPC_MAX_LINK_NAME );if (!string_is_valid (name, len))return -EINVAL ;
@@ -821,7 +821,7 @@ static int tipc_nl_compat_link_reset_staif (len <=0 )return -EINVAL ; - len =min_t (int, len,TIPC_MAX_BEARER_NAME ); + len =min_t (int, len,TIPC_MAX_LINK_NAME );if (!string_is_valid (name, len))return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 120/125 sctp: cache netns in sctp_ep_common
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit 312434617cb16be5166316cf9d08ba760b1042a1 ]
This patch is to fix a data-race reported by syzbot:
BUG: KCSAN: data-race in sctp_assoc_migrate / sctp_hash_obj
write to 0xffff8880b67c0020 of 8 bytes by task 18908 on cpu 1:
sctp_assoc_migrate+0x1a6/0x290 net/sctp/associola.c:1091
sctp_sock_migrate+0x8aa/0x9b0 net/sctp/socket.c:9465
sctp_accept+0x3c8/0x470 net/sctp/socket.c:4916
inet_accept+0x7f/0x360 net/ipv4/af_inet.c:734
__sys_accept4+0x224/0x430 net/socket.c:1754
__do_sys_accept net/socket.c:1795 [inline]
__se_sys_accept net/socket.c:1792 [inline]
__x64_sys_accept+0x4e/0x60 net/socket.c:1792
do_syscall_64+0xcc/0x370 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x44/0xa9 read to 0xffff8880b67c0020 of 8 bytes by task 12003 on cpu 0:
sctp_hash_obj+0x4f/0x2d0 net/sctp/input.c:894
rht_key_get_hash include/linux/rhashtable.h:133 [inline]
rht_key_hashfn include/linux/rhashtable.h:159 [inline]
rht_head_hashfn include/linux/rhashtable.h:174 [inline]
head_hashfn lib/rhashtable.c:41 [inline]
rhashtable_rehash_one lib/rhashtable.c:245 [inline]
rhashtable_rehash_chain lib/rhashtable.c:276 [inline]
rhashtable_rehash_table lib/rhashtable.c:316 [inline]
rht_deferred_worker+0x468/0xab0 lib/rhashtable.c:420
process_one_work+0x3d4/0x890 kernel/workqueue.c:2269
worker_thread+0xa0/0x800 kernel/workqueue.c:2415
kthread+0x1d4/0x200 drivers/block/aoe/aoecmd.c:1253
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:352It was caused by rhashtable access asoc->base.sk when sctp_assoc_migrate is changing its value. However, what rhashtable wants is netns from asoc base.sk, and for an asoc, its netns won't change once set. So we can simply fix it by caching netns since created.
--- include/net/sctp/structs.h | 3 +++ net/sctp/associola.c | 1 + net/sctp/endpointola.c | 1 + net/sctp/input.c | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-)
include/net/sctp/structs.h +3 -0
@@ -1202,6 +1202,9 @@ struct sctp_ep_common {/* What socket does this endpoint belong to? */ struct sock *sk; +/* Cache netns and it won't change once set */ +struct net *net; +/* This is where we receive inbound chunks. */ struct sctp_inq inqueue;
net/sctp/associola.c +1 -0
@@ -81,6 +81,7 @@ static struct sctp_association *sctp_ass/* Discarding const is appropriate here. */ asoc->ep = (struct sctp_endpoint *)ep; asoc->base.sk = (struct sock *)sk; + asoc->base.net =sock_net (sk);sctp_endpoint_hold (asoc->ep);sock_hold (asoc->base.sk);
net/sctp/endpointola.c +1 -0
@@ -163,6 +163,7 @@ static struct sctp_endpoint *sctp_endpoi/* Remember who we are attached to. */ ep->base.sk = sk; + ep->base.net =sock_net (sk);sock_hold (ep->base.sk);return ep;
net/sctp/input.c +2 -2
@@ -812,7 +812,7 @@ static inline int sctp_hash_cmp(struct rreturn err; asoc = t->asoc; -if (!net_eq (sock_net (asoc->base.sk), x->net)) +if (!net_eq (asoc->base.net, x->net)) goto out;if (x->ep) {if (x->ep != asoc->ep)
@@ -835,7 +835,7 @@ static inline u32 sctp_hash_obj(const vo {const struct sctp_transport *t = data;const union sctp_addr *paddr = &t->ipaddr; -const struct net *net =sock_net (t->asoc->base.sk); +const struct net *net = t->asoc->base.net;u16 lport =htons (t->asoc->base.bind_addr.port);u32 addr;
Greg Kroah-Hartman
maintainerPATCH 121/125 net: sched: fix `tc -s class show` no bstats on class with nolock subqueues
In reply to Greg Kroah-HartmanFrom: Dust Li <[email protected]>
[ Upstream commit 14e54ab9143fa60794d13ea0a66c792a2046a8f3 ]
When a classful qdisc's child qdisc has set the flag TCQ_F_CPUSTATS (pfifo_fast for example), the child qdisc's cpu_bstats should be passed to gnet_stats_copy_basic(), but many classful qdisc didn't do that. As a result, tc -s class show dev DEV always return 0 for bytes and packets in this case.
Pass the child qdisc's cpu_bstats to gnet_stats_copy_basic() to fix this issue.
The qstats also has this problem, but it has been fixed in 5dd431b6b9 ("net: sched: introduce and use qstats read...") and bstats still remains buggy.
--- net/sched/sch_mq.c | 3 ++- net/sched/sch_mqprio.c | 4 ++-- net/sched/sch_multiq.c | 2 +- net/sched/sch_prio.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-)
net/sched/sch_mq.c +2 -1
@@ -195,7 +195,8 @@ static int mq_dump_class_stats(struct Qdstruct netdev_queue *dev_queue =mq_queue_get (sch, cl); sch = dev_queue->qdisc_sleeping; -if (gnet_stats_copy_basic (&sch->running, d,NULL , &sch->bstats) <0 || +if (gnet_stats_copy_basic (&sch->running, d, sch->cpu_bstats, + &sch->bstats) <0 ||gnet_stats_copy_queue (d,NULL , &sch->qstats, sch->q.qlen) <0 )return -1 ;return 0 ;
net/sched/sch_mqprio.c +2 -2
@@ -362,8 +362,8 @@ static int mqprio_dump_class_stats(strucstruct netdev_queue *dev_queue =mqprio_queue_get (sch, cl); sch = dev_queue->qdisc_sleeping; -if (gnet_stats_copy_basic (qdisc_root_sleeping_running (sch), - d,NULL , &sch->bstats) <0 || +if (gnet_stats_copy_basic (qdisc_root_sleeping_running (sch), d, + sch->cpu_bstats, &sch->bstats) <0 ||gnet_stats_copy_queue (d,NULL , &sch->qstats, sch->q.qlen) <0 )return -1 ;
net/sched/sch_multiq.c +1 -1
@@ -332,7 +332,7 @@ static int multiq_dump_class_stats(struc cl_q = q->queues[cl -1 ];if (gnet_stats_copy_basic (qdisc_root_sleeping_running (sch), - d,NULL , &cl_q->bstats) <0 || + d, cl_q->cpu_bstats, &cl_q->bstats) <0 ||gnet_stats_copy_queue (d,NULL , &cl_q->qstats, cl_q->q.qlen) <0 )return -1 ;
net/sched/sch_prio.c +1 -1
@@ -286,7 +286,7 @@ static int prio_dump_class_stats(struct cl_q = q->queues[cl -1 ];if (gnet_stats_copy_basic (qdisc_root_sleeping_running (sch), - d,NULL , &cl_q->bstats) <0 || + d, cl_q->cpu_bstats, &cl_q->bstats) <0 ||gnet_stats_copy_queue (d,NULL , &cl_q->qstats, cl_q->q.qlen) <0 )return -1 ;
Greg Kroah-Hartman
maintainerPATCH 86/125 lib/genalloc.c: include vmalloc.h
In reply to Greg Kroah-HartmanFrom: Olof Johansson <[email protected]>
[ Upstream commit 35004f2e55807a1a1491db24ab512dd2f770a130 ]
Fixes build break on most ARM/ARM64 defconfigs:
lib/genalloc.c: In function 'gen_pool_add_virt':
lib/genalloc.c:190:10: error: implicit declaration of function 'vzalloc_node'; did you mean 'kzalloc_node'? lib/genalloc.c:190:8: warning: assignment to 'struct gen_pool_chunk *' from 'int' makes pointer from integer without a cast [-Wint-conversion] lib/genalloc.c: In function 'gen_pool_destroy':
lib/genalloc.c:254:3: error: implicit declaration of function 'vfree'; did you mean 'kfree'?
--- lib/genalloc.c | 1 + 1 file changed, 1 insertion(+)
lib/genalloc.c +1 -0
@@ -35,6 +35,7 @@#include <linux/interrupt.h> #include <linux/genalloc.h> #include <linux/of_device.h> +#include <linux/vmalloc.h> static inline size_t chunk_size (const struct gen_pool_chunk *chunk) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/125 HID: core: check whether Usage Page item is after Usage ID items
In reply to Greg Kroah-HartmanFrom: Candle Sun <[email protected]>
commit 1cb0d2aee26335d0bccf29100c7bed00ebece851 upstream.
Upstream commit 58e75155009c ("HID: core: move Usage Page concatenation to Main item") adds support for Usage Page item after Usage ID items (such as keyboards manufactured by Primax).
Usage Page concatenation in Main item works well for following report descriptor patterns:
USAGE_PAGE (Keyboard) 05 07
USAGE_MINIMUM (Keyboard LeftControl) 19 E0
USAGE_MAXIMUM (Keyboard Right GUI) 29 E7
LOGICAL_MINIMUM (0) 15 00
LOGICAL_MAXIMUM (1) 25 01
REPORT_SIZE (1) 75 01
REPORT_COUNT (8) 95 08
INPUT (Data,Var,Abs) 81 02-------------
USAGE_MINIMUM (Keyboard LeftControl) 19 E0
USAGE_MAXIMUM (Keyboard Right GUI) 29 E7
LOGICAL_MINIMUM (0) 15 00
LOGICAL_MAXIMUM (1) 25 01
REPORT_SIZE (1) 75 01
REPORT_COUNT (8) 95 08
USAGE_PAGE (Keyboard) 05 07
INPUT (Data,Var,Abs) 81 02But it makes the parser act wrong for the following report descriptor pattern(such as some Gamepads):
USAGE_PAGE (Button) 05 09
USAGE (Button 1) 09 01
USAGE (Button 2) 09 02
USAGE (Button 4) 09 04
USAGE (Button 5) 09 05
USAGE (Button 7) 09 07
USAGE (Button 8) 09 08
USAGE (Button 14) 09 0E
USAGE (Button 15) 09 0F
USAGE (Button 13) 09 0D
USAGE_PAGE (Consumer Devices) 05 0C
USAGE (Back) 0a 24 02
USAGE (HomePage) 0a 23 02
LOGICAL_MINIMUM (0) 15 00
LOGICAL_MAXIMUM (1) 25 01
REPORT_SIZE (1) 75 01
REPORT_COUNT (11) 95 0B
INPUT (Data,Var,Abs) 81 02With Usage Page concatenation in Main item, parser recognizes all the 11 Usages as consumer keys, it is not the HID device's real intention.
This patch checks whether Usage Page is really defined after Usage ID items by comparing usage page using status.
Usage Page concatenation on currently defined Usage Page will always do in local parsing when Usage ID items encountered.
When Main item is parsing, concatenation will do again with last defined Usage Page if this page has not been used in the previous usages concatenation.
--- drivers/hid/hid-core.c | 51 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-)
drivers/hid/hid-core.c +45 -6
@@ -197,6 +197,18 @@ static unsigned hid_lookup_collection(st }/* +* Concatenate usage which defines 16 bits or less with the +* currently defined usage page to form a 32 bit usage +*/ + +static void complete_usage (struct hid_parser *parser,unsigned int index) +{ + parser->local.usage[index] &=0xFFFF ; + parser->local.usage[index] |= + (parser->global.usage_page &0xFFFF ) <<16 ; +} + +/* * Add a usage to the temporary parser table. */
@@ -207,6 +219,14 @@ static int hid_add_usage(struct hid_parsreturn -1 ; } parser->local.usage[parser->local.usage_index] = usage; + +/* +* If Usage item only includes usage id, concatenate it with +* currently defined usage page +*/ +if (size <=2 ) +complete_usage (parser, parser->local.usage_index); + parser->local.usage_size[parser->local.usage_index] = size; parser->local.collection_index[parser->local.usage_index] = parser->collection_stack_ptr ?
@@ -523,13 +543,32 @@ static int hid_parser_local(struct hid_p* usage value." */ -static void hid_concatenate_usage_page (struct hid_parser *parser) +static void hid_concatenate_last_usage_page (struct hid_parser *parser) {int i; +unsigned int usage_page; +unsigned int current_page; + +if (!parser->local.usage_index) +return ; -for (i =0 ; i < parser->local.usage_index; i++) -if (parser->local.usage_size[i] <=2 ) - parser->local.usage[i] += parser->global.usage_page <<16 ; + usage_page = parser->global.usage_page; + +/* +* Concatenate usage page again only if last declared Usage Page +* has not been already used in previous usages concatenation +*/ +for (i = parser->local.usage_index -1 ; i >=0 ; i--) { +if (parser->local.usage_size[i] >2 ) +/* Ignore extended usages */ +continue ; + + current_page = parser->local.usage[i] >>16 ; +if (current_page == usage_page) +break ; + +complete_usage (parser, i); + } }/*
@@ -541,7 +580,7 @@ static int hid_parser_main(struct hid_pa__u32 data;int ret; -hid_concatenate_usage_page (parser); +hid_concatenate_last_usage_page (parser); data =item_udata (item);
@@ -756,7 +795,7 @@ static int hid_scan_main(struct hid_pars__u32 data;int i; -hid_concatenate_usage_page (parser); +hid_concatenate_last_usage_page (parser); data =item_udata (item);
Greg Kroah-Hartman
maintainerPATCH 124/125 platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 16245db1489cd9aa579506f64afeeeb13d825a93 upstream.
The HP WMI calls may take up to 128 bytes of data as input, and the AML methods implementing the WMI calls, declare a couple of fields for accessing input in different sizes, specifycally the HWMC method contains:
CreateField (Arg1, 0x80, 0x0400, D128)
Even though we do not use any of the WMI command-types which need a buffer of this size, the APCI interpreter still tries to create it as it is declared in generoc code at the top of the HWMC method which runs before the code looks at which command-type is requested.
This results in many of these errors on many different HP laptop models:
[ 14.459261] ACPI Error: Field [D128] at 1152 exceeds Buffer [NULL] size 160 (bits) (20170303/dsopcode-236) [ 14.459268] ACPI Error: Method parse/execution failed [\HWMC] (Node ffff8edcc61507f8), AE_AML_BUFFER_LIMIT (20170303/psparse-543) [ 14.459279] ACPI Error: Method parse/execution failed [\_SB.WMID.WMAA] (Node ffff8edcc61523c0), AE_AML_BUFFER_LIMIT (20170303/psparse-543)
This commit increases the size of the data element of the bios_args struct to 128 bytes fixing these errors.
--- drivers/platform/x86/hp-wmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/hp-wmi.c +3 -3
@@ -90,7 +90,7 @@ struct bios_args {u32 command;u32 commandtype;u32 datasize; -u32 data; +u8 data[128 ]; };struct bios_return {
@@ -198,7 +198,7 @@ static int hp_wmi_perform_query(int quer .command = write ? 0x2 : 0x1, .commandtype = query, .datasize = insize, - .data = 0, + .data = { 0 }, };struct acpi_buffer input = {sizeof (struct bios_args ), &args };struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER ,NULL };
@@ -206,7 +206,7 @@ static int hp_wmi_perform_query(int querif (WARN_ON (insize >sizeof (args.data)))return -EINVAL ; -memcpy (&args.data, buffer, insize); +memcpy (&args.data[0 ], buffer, insize);wmi_evaluate_method (HPWMI_BIOS_GUID ,0 ,0x3 , &input, &output);
Greg Kroah-Hartman
maintainerPATCH 123/125 hwrng: stm32 - fix unbalanced pm_runtime_enable
In reply to Greg Kroah-HartmanFrom: Lionel Debieve <[email protected]>
commit af0d4442dd6813de6e77309063beb064fa8e89ae upstream.
No remove function implemented yet in the driver. Without remove function, the pm_runtime implementation complains when removing and probing again the driver.
--- drivers/char/hw_random/stm32-rng.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/char/hw_random/stm32-rng.c +8 -0
@@ -166,6 +166,13 @@ static int stm32_rng_probe(struct platforeturn devm_hwrng_register (dev, &priv->rng); } +static int stm32_rng_remove (struct platform_device *ofdev) +{ +pm_runtime_disable (&ofdev->dev); + +return 0 ; +} +#ifdef CONFIG_PM static int stm32_rng_runtime_suspend (struct device *dev) {
@@ -202,6 +209,7 @@ static struct platform_driver stm32_rng_ .of_match_table = stm32_rng_match, }, .probe = stm32_rng_probe, + .remove = stm32_rng_remove, };module_platform_driver (stm32_rng_driver);
Greg Kroah-Hartman
maintainerPATCH 88/125 tipc: fix memory leak in tipc_nl_compat_publ_dump
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit f87d8ad9233f115db92c6c087d58403b0009ed36 ]
There is a memory leak in case genlmsg_put fails.
Fix this by freeing *args* before return.
Addresses-Coverity-ID: 1476406 ("Resource leak")
--- net/tipc/netlink_compat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/tipc/netlink_compat.c +3 -1
@@ -974,8 +974,10 @@ static int tipc_nl_compat_publ_dump(struct tipc_nl_compat_msg *msg, u32 sock) hdr =genlmsg_put (args,0 ,0 , &tipc_genl_family,NLM_F_MULTI ,TIPC_NL_PUBL_GET ); -if (!hdr) +if (!hdr) { +kfree_skb (args);return -EMSGSIZE ; + } nest =nla_nest_start (args,TIPC_NLA_SOCK );if (!nest) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/125 net/core/neighbour: tell kmemleak about hash tables
In reply to Greg Kroah-HartmanFrom: Konstantin Khlebnikov <[email protected]>
[ Upstream commit 85704cb8dcfd88d351bfc87faaeba1c8214f3177 ]
This fixes false-positive kmemleak reports about leaked neighbour entries:
unreferenced object 0xffff8885c6e4d0a8 (size 1024):
comm "softirq", pid 0, jiffies 4294922664 (age 167640.804s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 20 2c f3 83 ff ff ff ff ........ ,......
08 c0 ef 5f 84 88 ff ff 01 8c 7d 02 01 00 00 00 ..._......}.....
backtrace:
[<00000000748509fe>] ip6_finish_output2+0x887/0x1e40
[<0000000036d7a0d8>] ip6_output+0x1ba/0x600
[<0000000027ea7dba>] ip6_send_skb+0x92/0x2f0
[<00000000d6e2111d>] udp_v6_send_skb.isra.24+0x680/0x15e0
[<000000000668a8be>] udpv6_sendmsg+0x18c9/0x27a0
[<000000004bd5fa90>] sock_sendmsg+0xb3/0xf0
[<000000008227b29f>] ___sys_sendmsg+0x745/0x8f0
[<000000008698009d>] __sys_sendmsg+0xde/0x170
[<00000000889dacf1>] do_syscall_64+0x9b/0x400
[<0000000081cdb353>] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[<000000005767ed39>] 0xffffffffffffffff--- net/core/neighbour.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/core/neighbour.c +9 -4
@@ -18,6 +18,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/slab.h> +#include <linux/kmemleak.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/module.h>
@@ -325,12 +326,14 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int shift) ret =kmalloc (sizeof (*ret),GFP_ATOMIC );if (!ret)return NULL ; -if (size <=PAGE_SIZE ) +if (size <=PAGE_SIZE ) { buckets =kzalloc (size,GFP_ATOMIC ); -else + }else { buckets = (struct neighbour __rcu **)__get_free_pages (GFP_ATOMIC | __GFP_ZERO,get_order (size)); +kmemleak_alloc (buckets, size,0 ,GFP_ATOMIC ); + }if (!buckets) {kfree (ret);return NULL ;
@@ -350,10 +353,12 @@ static void neigh_hash_free_rcu(struct rcu_head *head)size_t size = (1 << nht->hash_shift) *sizeof (struct neighbour *);struct neighbour __rcu **buckets = nht->hash_buckets; -if (size <=PAGE_SIZE ) +if (size <=PAGE_SIZE ) {kfree (buckets); -else + }else { +kmemleak_free (buckets);free_pages ((unsigned long )buckets,get_order (size)); + }kfree (nht); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/125 net/core/neighbour: fix kmemleak minimal reference count for hash tables
In reply to Greg Kroah-HartmanFrom: Konstantin Khlebnikov <[email protected]>
[ Upstream commit 01b833ab44c9e484060aad72267fc7e71beb559b ]
This should be 1 for normal allocations, 0 disables leak reporting.
--- net/core/neighbour.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/neighbour.c +1 -1
@@ -332,7 +332,7 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int shift) buckets = (struct neighbour __rcu **)__get_free_pages (GFP_ATOMIC | __GFP_ZERO,get_order (size)); -kmemleak_alloc (buckets, size,0 ,GFP_ATOMIC ); +kmemleak_alloc (buckets, size,1 ,GFP_ATOMIC ); }if (!buckets) {kfree (ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/125 sfc: suppress duplicate nvmem partition types in efx_ef10_mtd_probe
In reply to Greg Kroah-HartmanFrom: Edward Cree <[email protected]>
[ Upstream commit 3366463513f544c12c6b88c13da4462ee9e7a1a1 ]
Use a bitmap to keep track of which partition types we've already seen;
for duplicates, return -EEXIST from efx_ef10_mtd_probe_partition() and thus skip adding that partition.
Duplicate partitions occur because of the A/B backup scheme used by newer
sfc NICs. Prior to this patch they cause sysfs_warn_dup errors because they have the same name, causing us not to expose any MTDs at all.
--- drivers/net/ethernet/sfc/ef10.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/net/ethernet/sfc/ef10.c +21 -8
@@ -5093,22 +5093,25 @@ static const struct efx_ef10_nvram_type_info efx_ef10_nvram_types[] = { { NVRAM_PARTITION_TYPE_LICENSE, 0, 0, "sfc_license" }, { NVRAM_PARTITION_TYPE_PHY_MIN, 0xff, 0, "sfc_phy_fw" }, }; +#define EF10_NVRAM_PARTITION_COUNT ARRAY_SIZE(efx_ef10_nvram_types)static int efx_ef10_mtd_probe_partition (struct efx_nic *efx,struct efx_mcdi_mtd_partition *part, -unsigned int type) +unsigned int type, +unsigned long *found) {MCDI_DECLARE_BUF (inbuf,MC_CMD_NVRAM_METADATA_IN_LEN );MCDI_DECLARE_BUF (outbuf,MC_CMD_NVRAM_METADATA_OUT_LENMAX );const struct efx_ef10_nvram_type_info *info;size_t size, erase_size, outlen; +int type_idx =0 ;bool protected;int rc; -for (info = efx_ef10_nvram_types; ; info++) { -if (info == - efx_ef10_nvram_types +ARRAY_SIZE (efx_ef10_nvram_types)) +for (type_idx =0 ; ; type_idx++) { +if (type_idx ==EF10_NVRAM_PARTITION_COUNT )return -ENODEV ; + info = efx_ef10_nvram_types + type_idx;if ((type & ~info->type_mask) == info->type)break ; }
@@ -5121,6 +5124,13 @@ static int efx_ef10_mtd_probe_partition(struct efx_nic *efx,if (protected)return -ENODEV ;/* hide it */ +/* If we've already exposed a partition of this type, hide this +* duplicate. All operations on MTDs are keyed by the type anyway, +* so we can't act on the duplicate. +*/ +if (__test_and_set_bit (type_idx, found)) +return -EEXIST ; + part->nvram_type = type;MCDI_SET_DWORD (inbuf,NVRAM_METADATA_IN_TYPE , type);
@@ -5149,6 +5159,7 @@ static int efx_ef10_mtd_probe_partition(struct efx_nic *efx,static int efx_ef10_mtd_probe (struct efx_nic *efx) {MCDI_DECLARE_BUF (outbuf,MC_CMD_NVRAM_PARTITIONS_OUT_LENMAX ); +DECLARE_BITMAP (found,EF10_NVRAM_PARTITION_COUNT );struct efx_mcdi_mtd_partition *parts;size_t outlen, n_parts_total, i, n_parts;unsigned int type;
@@ -5177,11 +5188,13 @@ static int efx_ef10_mtd_probe(struct efx_nic *efx)for (i =0 ; i < n_parts_total; i++) { type =MCDI_ARRAY_DWORD (outbuf,NVRAM_PARTITIONS_OUT_TYPE_ID , i); - rc =efx_ef10_mtd_probe_partition (efx, &parts[n_parts], type); -if (rc ==0 ) - n_parts++; -else if (rc != -ENODEV ) + rc =efx_ef10_mtd_probe_partition (efx, &parts[n_parts], type, + found); +if (rc == -EEXIST || rc == -ENODEV ) +continue ; +if (rc) goto fail; + n_parts++; } rc =efx_mtd_add (efx, &parts[0 ].common, n_parts,sizeof (*parts));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/125 vmscan: return NODE_RECLAIM_NOSCAN in node_reclaim() when CONFIG_NUMA is n
In reply to Greg Kroah-HartmanFrom: Wei Yang <[email protected]>
[ Upstream commit 8b09549c2bfd9f3f8f4cdad74107ef4f4ff9cdd7 ]
Commit fa5e084e43eb ("vmscan: do not unconditionally treat zones that fail zone_reclaim() as full") changed the return value of node_reclaim(). The original return value 0 means NODE_RECLAIM_SOME after this commit.
While the return value of node_reclaim() when CONFIG_NUMA is n is not changed. This will leads to call zone_watermark_ok() again.
This patch fixes the return value by adjusting to NODE_RECLAIM_NOSCAN. Since node_reclaim() is only called in page_alloc.c, move it to mm/internal.h.
--- include/linux/swap.h | 6 ------ mm/internal.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-)
include/linux/swap.h +0 -6
@@ -335,14 +335,8 @@ extern unsigned long vm_total_pages;extern int node_reclaim_mode;extern int sysctl_min_unmapped_ratio;extern int sysctl_min_slab_ratio; -extern int node_reclaim (struct pglist_data *,gfp_t ,unsigned int );#else #define node_reclaim_mode 0 -static inline int node_reclaim (struct pglist_data *pgdat,gfp_t mask, -unsigned int order) -{ -return 0 ; -}#endif extern int page_evictable (struct page *page);
mm/internal.h +10 -0
@@ -442,6 +442,16 @@ static inline void mminit_validate_memmodel_limits(unsigned long *start_pfn,#define NODE_RECLAIM_SOME 0#define NODE_RECLAIM_SUCCESS 1 +#ifdef CONFIG_NUMA +extern int node_reclaim (struct pglist_data *,gfp_t ,unsigned int ); +#else +static inline int node_reclaim (struct pglist_data *pgdat,gfp_t mask, +unsigned int order) +{ +return NODE_RECLAIM_NOSCAN ; +} +#endif +extern int hwpoison_filter (struct page *p);extern u32 hwpoison_filter_dev_major;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/125 mtd: Check add_mtd_device() ret code
In reply to Greg Kroah-HartmanFrom: Boris Brezillon <[email protected]>
[ Upstream commit 2b6f0090a3335b7bdd03ca520c35591159463041 ]
add_mtd_device() can fail. We should always check its return value and gracefully handle the failure case. Fix the call sites where this not done (in mtdpart.c) and add a __must_check attribute to the prototype to avoid this kind of mistakes.
--- drivers/mtd/mtdcore.h | 2 +- drivers/mtd/mtdpart.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-)
drivers/mtd/mtdcore.h +1 -1
@@ -6,7 +6,7 @@extern struct mutex mtd_table_mutex;struct mtd_info *__mtd_next_device (int i); -int add_mtd_device (struct mtd_info *mtd); +int __must_check add_mtd_device (struct mtd_info *mtd);int del_mtd_device (struct mtd_info *mtd);int add_mtd_partitions (struct mtd_info *,const struct mtd_partition *,int );int del_mtd_partitions (struct mtd_info *);
drivers/mtd/mtdpart.c +31 -5
@@ -648,10 +648,22 @@ int mtd_add_partition(struct mtd_info *master, const char *name,list_add (&new->list, &mtd_partitions);mutex_unlock (&mtd_partitions_mutex); -add_mtd_device (&new->mtd); + ret =add_mtd_device (&new->mtd); +if (ret) + goto err_remove_part;mtd_add_partition_attrs (new); +return 0 ; + +err_remove_part: +mutex_lock (&mtd_partitions_mutex); +list_del (&new->list); +mutex_unlock (&mtd_partitions_mutex); + +free_partition (new); +pr_info ("%s:%i\n" , __func__, __LINE__); +return ret; }EXPORT_SYMBOL_GPL (mtd_add_partition);
@@ -696,28 +708,42 @@ int add_mtd_partitions(struct mtd_info *master, {struct mtd_part *slave;uint64_t cur_offset =0 ; -int i; +int i, ret;printk (KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n" , nbparts, master->name);for (i =0 ; i < nbparts; i++) { slave =allocate_partition (master, parts + i, i, cur_offset);if (IS_ERR (slave)) { -del_mtd_partitions (master); -return PTR_ERR (slave); + ret =PTR_ERR (slave); + goto err_del_partitions; }mutex_lock (&mtd_partitions_mutex);list_add (&slave->list, &mtd_partitions);mutex_unlock (&mtd_partitions_mutex); -add_mtd_device (&slave->mtd); + ret =add_mtd_device (&slave->mtd); +if (ret) { +mutex_lock (&mtd_partitions_mutex); +list_del (&slave->list); +mutex_unlock (&mtd_partitions_mutex); + +free_partition (slave); + goto err_del_partitions; + } +mtd_add_partition_attrs (slave); cur_offset = slave->offset + slave->mtd.size; }return 0 ; + +err_del_partitions: +del_mtd_partitions (master); + +return ret; }static DEFINE_SPINLOCK (part_parser_lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/125 net: fec: fix clock count mis-match
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
commit a31eda65ba210741b598044d045480494d0ed52a upstream.
pm_runtime_put_autosuspend in probe will call runtime suspend to disable clks automatically if CONFIG_PM is defined. (If CONFIG_PM is not defined, its implementation will be empty, then runtime suspend will not be called.)
Therefore, we can call pm_runtime_get_sync to runtime resume it first to enable clks, which matches the runtime suspend. (Only when CONFIG_PM is defined, otherwise pm_runtime_get_sync will also be empty, then runtime resume will not be called.)
Then it is fine to disable clks without causing clock count mis-match.
--- drivers/net/ethernet/freescale/fec_main.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +11 -4
@@ -3530,6 +3530,11 @@ fec_drv_remove(struct platform_device *pstruct net_device *ndev =platform_get_drvdata (pdev);struct fec_enet_private *fep =netdev_priv (ndev);struct device_node *np = pdev->dev.of_node; +int ret; + + ret =pm_runtime_get_sync (&pdev->dev); +if (ret <0 ) +return ret;cancel_work_sync (&fep->tx_timeout_work);fec_ptp_stop (pdev);
@@ -3537,15 +3542,17 @@ fec_drv_remove(struct platform_device *pfec_enet_mii_remove (fep);if (fep->reg_phy)regulator_disable (fep->reg_phy); -pm_runtime_put (&pdev->dev); -pm_runtime_disable (&pdev->dev); -clk_disable_unprepare (fep->clk_ahb); -clk_disable_unprepare (fep->clk_ipg); +if (of_phy_is_fixed_link (np))of_phy_deregister_fixed_link (np);of_node_put (fep->phy_node);free_netdev (ndev); +clk_disable_unprepare (fep->clk_ahb); +clk_disable_unprepare (fep->clk_ipg); +pm_runtime_put_noidle (&pdev->dev); +pm_runtime_disable (&pdev->dev); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 118/125 openvswitch: remove another BUG_ON()
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 8a574f86652a4540a2433946ba826ccb87f398cc ]
If we can't build the flow del notification, we can simply delete the flow, no need to crash the kernel. Still keep a WARN_ON to preserve debuggability.
Note: the BUG_ON() predates the Fixes tag, but this change can be applied only after the mentioned commit.
v1 -> v2:
- do not leak an skb on error
--- net/openvswitch/datapath.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/openvswitch/datapath.c +5 -1
@@ -1350,7 +1350,10 @@ static int ovs_flow_cmd_del(struct sk_buOVS_FLOW_CMD_DEL , ufid_flags);rcu_read_unlock (); -BUG_ON (err <0 ); +if (WARN_ON_ONCE (err <0 )) { +kfree_skb (reply); + goto out_free; + }ovs_notify (&dp_flow_genl_family, reply, info); }else {
@@ -1358,6 +1361,7 @@ static int ovs_flow_cmd_del(struct sk_bu } } +out_free:ovs_flow_free (flow, true);return 0 ; unlock:
Greg Kroah-Hartman
maintainerPATCH 116/125 slip: Fix use-after-free Read in slip_open
In reply to Greg Kroah-HartmanFrom: Jouni Hogander <[email protected]>
[ Upstream commit e58c1912418980f57ba2060017583067f5f71e52 ]
Slip_open doesn't clean-up device which registration failed from the slip_devs device list. On next open after failure this list is iterated and freed device is accessed. Fix this by calling sl_free_netdev in error path.
Here is the trace from the Syzbot:
__dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x197/0x210 lib/dump_stack.c:118 print_address_description.constprop.0.cold+0xd4/0x30b mm/kasan/report.c:374 __kasan_report.cold+0x1b/0x41 mm/kasan/report.c:506 kasan_report+0x12/0x20 mm/kasan/common.c:634 __asan_report_load8_noabort+0x14/0x20 mm/kasan/generic_report.c:132 sl_sync drivers/net/slip/slip.c:725 [inline] slip_open+0xecd/0x11b7 drivers/net/slip/slip.c:801 tty_ldisc_open.isra.0+0xa3/0x110 drivers/tty/tty_ldisc.c:469 tty_set_ldisc+0x30e/0x6b0 drivers/tty/tty_ldisc.c:596 tiocsetd drivers/tty/tty_io.c:2334 [inline] tty_ioctl+0xe8d/0x14f0 drivers/tty/tty_io.c:2594 vfs_ioctl fs/ioctl.c:46 [inline] file_ioctl fs/ioctl.c:509 [inline] do_vfs_ioctl+0xdb6/0x13e0 fs/ioctl.c:696 ksys_ioctl+0xab/0xd0 fs/ioctl.c:713 __do_sys_ioctl fs/ioctl.c:720 [inline] __se_sys_ioctl fs/ioctl.c:718 [inline] __x64_sys_ioctl+0x73/0xb0 fs/ioctl.c:718 do_syscall_64+0xfa/0x760 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/net/slip/slip.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/slip/slip.c +1 -0
@@ -860,6 +860,7 @@ err_free_chan: sl->tty =NULL ; tty->disc_data =NULL ;clear_bit (SLF_INUSE , &sl->flags); +sl_free_netdev (sl->dev);free_netdev (sl->dev); err_exit:
Greg Kroah-Hartman
maintainerPATCH 112/125 pwm: Clear chip_data in pwm_put()
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
commit e926b12c611c2095c7976e2ed31753ad6eb5ff1a upstream.
After a PWM is disposed by its user the per chip data becomes invalid. Clear the data in common code instead of the device drivers to get consistent behaviour. Before this patch only three of nine drivers cleaned up here.
--- drivers/pwm/core.c | 1 + drivers/pwm/pwm-berlin.c | 1 - drivers/pwm/pwm-samsung.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-)
drivers/pwm/core.c +1 -0
@@ -858,6 +858,7 @@ void pwm_put(struct pwm_device *pwm)if (pwm->chip->ops->free) pwm->chip->ops->free (pwm->chip, pwm); +pwm_set_chip_data (pwm,NULL ); pwm->label =NULL ;module_put (pwm->chip->ops->owner);
drivers/pwm/pwm-berlin.c +0 -1
@@ -78,7 +78,6 @@ static void berlin_pwm_free(struct pwm_c {struct berlin_pwm_channel *channel =pwm_get_chip_data (pwm); -pwm_set_chip_data (pwm,NULL );kfree (channel); }
drivers/pwm/pwm-samsung.c +0 -1
@@ -235,7 +235,6 @@ static int pwm_samsung_request(struct pwstatic void pwm_samsung_free (struct pwm_chip *chip,struct pwm_device *pwm) {devm_kfree (chip->dev,pwm_get_chip_data (pwm)); -pwm_set_chip_data (pwm,NULL ); }static int pwm_samsung_enable (struct pwm_chip *chip,struct pwm_device *pwm)
Greg Kroah-Hartman
maintainerPATCH 115/125 openvswitch: fix flow command message size
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 4e81c0b3fa93d07653e2415fa71656b080a112fd ]
When user-space sets the OVS_UFID_F_OMIT_* flags, and the relevant flow has no UFID, we can exceed the computed size, as ovs_nla_put_identifier() will always dump an OVS_FLOW_ATTR_KEY attribute.
Take the above in account when computing the flow command message size.
--- net/openvswitch/datapath.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/openvswitch/datapath.c +5 -1
@@ -738,9 +738,13 @@ static size_t ovs_flow_cmd_msg_size(cons {size_t len =NLMSG_ALIGN (sizeof (struct ovs_header )); -/* OVS_FLOW_ATTR_UFID */ +/* OVS_FLOW_ATTR_UFID, or unmasked flow key as fallback +* see ovs_nla_put_identifier() +*/ if (sfid &&ovs_identifier_is_ufid (sfid)) len +=nla_total_size (sfid->ufid_len); +else + len +=nla_total_size (ovs_key_attr_size ());/* OVS_FLOW_ATTR_KEY */ if (!sfid ||should_fill_key (sfid, ufid_flags))
Greg Kroah-Hartman
maintainerPATCH 114/125 macvlan: schedule bc_work even if error
In reply to Greg Kroah-HartmanFrom: Menglong Dong <[email protected]>
[ Upstream commit 1d7ea55668878bb350979c377fc72509dd6f5b21 ]
While enqueueing a broadcast skb to port->bc_queue, schedule_work() is called to add port->bc_work, which processes the skbs in bc_queue, to "events" work queue. If port->bc_queue is full, the skb will be discarded and schedule_work(&port->bc_work) won't be called. However, if port->bc_queue is full and port->bc_work is not running or pending, port->bc_queue will keep full and schedule_work() won't be called any more, and all broadcast skbs to macvlan will be discarded. This case can happen:
macvlan_process_broadcast() is the pending function of port->bc_work, it moves all the skbs in port->bc_queue to the queue "list", and processes the skbs in "list". During this, new skbs will keep being added to port->bc_queue in macvlan_broadcast_enqueue(), and port->bc_queue may already full when macvlan_process_broadcast() return. This may happen, especially when there are a lot of real-time threads and the process is preempted.
Fix this by calling schedule_work(&port->bc_work) even if port->bc_work is full in macvlan_broadcast_enqueue().
--- drivers/net/macvlan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/macvlan.c +2 -1
@@ -334,10 +334,11 @@ static void macvlan_broadcast_enqueue(st }spin_unlock (&port->bc_queue.lock); +schedule_work (&port->bc_work); +if (err) goto free_nskb; -schedule_work (&port->bc_work);return ; free_nskb:
Greg Kroah-Hartman
maintainerPATCH 108/125 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P
In reply to Greg Kroah-HartmanFrom: Fabio D'Urso <[email protected]>
commit c1a1f273d0825774c80896b8deb1c9ea1d0b91e3 upstream.
This device presents itself as a USB hub with three attached devices:
- An ACM serial port connected to the GPS module (not affected by this commit)
- An FTDI serial port connected to the GPS module (1546:0502)
- Another FTDI serial port connected to the ODIN-W2 radio module (1546:0503)
This commit registers U-Blox's VID and the PIDs of the second and third devices.
--- drivers/usb/serial/ftdi_sio.c | 3 +++ drivers/usb/serial/ftdi_sio_ids.h | 7 +++++++ 2 files changed, 10 insertions(+)
drivers/usb/serial/ftdi_sio.c +3 -0
@@ -1028,6 +1028,9 @@ static const struct usb_device_id id_tab/* Sienna devices */ { USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) }, { USB_DEVICE(ECHELON_VID, ECHELON_U20_PID) }, +/* U-Blox devices */ + { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) }, + { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) }, { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +7 -0
@@ -1557,3 +1557,10 @@*/ #define UNJO_VID 0x22B7#define UNJO_ISODEBUG_V1_PID 0x150D + +/* +* U-Blox products (http://www.u-blox.com). +*/ +#define UBLOX_VID 0x1546 +#define UBLOX_C099F9P_ZED_PID 0x0502 +#define UBLOX_C099F9P_ODIN_PID 0x0503
Greg Kroah-Hartman
maintainerPATCH 103/125 powerpc/pseries/dlpar: Fix a missing check in dlpar_parse_cc_property()
In reply to Greg Kroah-HartmanFrom: Gen Zhang <[email protected]>
[ Upstream commit efa9ace68e487ddd29c2b4d6dd23242158f1f607 ]
In dlpar_parse_cc_property(), 'prop->name' is allocated by kstrdup(). kstrdup() may return NULL, so it should be checked and handle error. And prop should be freed if 'prop->name' is NULL.
--- arch/powerpc/platforms/pseries/dlpar.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/platforms/pseries/dlpar.c +4 -0
@@ -63,6 +63,10 @@ static struct property *dlpar_parse_cc_property(struct cc_workarea *ccwa) name = (char *)ccwa +be32_to_cpu (ccwa->name_offset); prop->name =kstrdup (name,GFP_KERNEL ); +if (!prop->name) { +dlpar_free_cc_property (prop); +return NULL ; + } prop->length =be32_to_cpu (ccwa->prop_length); value = (char *)ccwa +be32_to_cpu (ccwa->prop_offset);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/125 lib/genalloc.c: use vzalloc_node() to allocate the bitmap
In reply to Greg Kroah-HartmanFrom: Huang Shijie <[email protected]>
[ Upstream commit 6862d2fc81859f88c1f3f660886427893f2b4f3f ]
Some devices may have big memory on chip, such as over 1G. In some cases, the nbytes maybe bigger then 4M which is the bounday of the memory buddy system (4K default).
So use vzalloc_node() to allocate the bitmap. Also use vfree to free it.
--- lib/genalloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/genalloc.c +2 -2
@@ -187,7 +187,7 @@ int gen_pool_add_virt(struct gen_pool *pool, unsigned long virt, phys_addr_t phyint nbytes =sizeof (struct gen_pool_chunk ) +BITS_TO_LONGS (nbits) *sizeof (long ); - chunk =kzalloc_node (nbytes,GFP_KERNEL , nid); + chunk =vzalloc_node (nbytes, nid);if (unlikely (chunk ==NULL ))return -ENOMEM ;
@@ -251,7 +251,7 @@ void gen_pool_destroy(struct gen_pool *pool) bit =find_next_bit (chunk->bits, end_bit,0 );BUG_ON (bit < end_bit); -kfree (chunk); +vfree (chunk); }kfree_const (pool->name);kfree (pool);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/125 net: dev: Use unsigned integer as an argument to left-shift
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit f4d7b3e23d259c44f1f1c39645450680fcd935d6 ]
1 << 31 is Undefined Behaviour according to the C standard. Use U type modifier to avoid theoretical overflow.
--- include/linux/netdevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/netdevice.h +1 -1
@@ -3565,7 +3565,7 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)if (debug_value ==0 )/* no output */ return 0 ;/* set low N bits */ -return (1 << debug_value) -1 ; +return (1U << debug_value) -1 ; }static inline void __netif_tx_lock (struct netdev_queue *txq,int cpu)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/125 scsi: libsas: Support SATA PHY connection rate unmatch fixing during discovery
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
[ Upstream commit cec9771d2e954650095aa37a6a97722c8194e7d2 ]
+----------+ +----------+ | | | | | |--- 3.0 G ---| |--- 6.0 G --- SAS disk | | | | | |--- 3.0 G ---| |--- 6.0 G --- SAS disk |initiator | | | | device |--- 3.0 G ---| Expander |--- 6.0 G --- SAS disk | | | | | |--- 3.0 G ---| |--- 6.0 G --- SATA disk -->failed to connect | | | | | | | |--- 6.0 G --- SATA disk -->failed to connect | | | | +----------+ +----------+
According to Serial Attached SCSI - 1.1 (SAS-1.1):
If an expander PHY attached to a SATA PHY is using a physical link rate greater than the maximum connection rate supported by the pathway from an STP initiator port, a management application client should use the SMP PHY CONTROL function (see 10.4.3.10) to set the PROGRAMMED MAXIMUM PHYSICAL LINK RATE field of the expander PHY to the maximum connection rate supported by the pathway from that STP initiator port.
Currently libsas does not support checking if this condition occurs, nor rectifying when it does.
Such a condition is not at all common, however it has been seen on some pre-silicon environments where the initiator PHY only supports a 1.5 Gbit maximum linkrate, mated with 12G expander PHYs and 3/6G SATA phy.
This patch adds support for checking and rectifying this condition during initial device discovery only.
We do support checking min pathway connection rate during revalidation phase, when new devices can be detected in the topology. However we do not support in the case of the the user reprogramming PHY linkrates, such that min pathway condition is not met/maintained.
A note on root port PHY rates:
The libsas root port PHY rates calculation is broken. Libsas sets the rates (min, max, and current linkrate) of a root port to the same linkrate of the first PHY member of that same port. In doing so, it assumes that all other PHYs which subsequently join the port to have the same negotiated linkrate, when they could actually be different.
In practice this doesn't happen, as initiator and expander PHYs are normally initialised with consistent min/max linkrates.
This has not caused an issue so far, so leave alone for now.
--- drivers/scsi/libsas/sas_expander.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/scsi/libsas/sas_expander.c +20 -0
@@ -806,6 +806,26 @@ static struct domain_device *sas_ex_discover_end_dev(#ifdef CONFIG_SCSI_SAS_ATA if ((phy->attached_tproto &SAS_PROTOCOL_STP ) || phy->attached_sata_dev) { +if (child->linkrate > parent->min_linkrate) { +struct sas_phy_linkrates rates = { + .maximum_linkrate = parent->min_linkrate, + .minimum_linkrate = parent->min_linkrate, + }; +int ret; + +pr_notice ("ex %016llx phy%02d SATA device linkrate > min pathway connection rate, attempting to lower device linkrate\n" , +SAS_ADDR (child->sas_addr), phy_id); + ret =sas_smp_phy_control (parent, phy_id, +PHY_FUNC_LINK_RESET , &rates); +if (ret) { +pr_err ("ex %016llx phy%02d SATA device could not set linkrate (%d)\n" , +SAS_ADDR (child->sas_addr), phy_id, ret); + goto out_free; + } +pr_notice ("ex %016llx phy%02d SATA device set linkrate successfully\n" , +SAS_ADDR (child->sas_addr), phy_id); + child->linkrate = child->min_linkrate; + } res =sas_get_ata_info (child, phy);if (res) goto out_free;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/125 net: fix possible overflow in __sk_mem_raise_allocated()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 5bf325a53202b8728cf7013b72688c46071e212e ]
With many active TCP sockets, fat TCP sockets could fool __sk_mem_raise_allocated() thanks to an overflow.
They would increase their share of the memory, instead of decreasing it.
--- include/net/sock.h | 2 +- net/core/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/net/sock.h +1 -1
@@ -1201,7 +1201,7 @@ static inline void sk_sockets_allocated_inc(struct sock *sk)percpu_counter_inc (sk->sk_prot->sockets_allocated); } -static inline int +static inline u64 sk_sockets_allocated_read_positive (struct sock *sk) {return percpu_counter_read_positive (sk->sk_prot->sockets_allocated);
net/core/sock.c +1 -1
@@ -2156,7 +2156,7 @@ int __sk_mem_schedule(struct sock *sk, int size, int kind) }if (sk_has_memory_pressure (sk)) { -int alloc; +u64 alloc;if (!sk_under_memory_pressure (sk))return 1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/125 decnet: fix DN_IFREQ_SIZE
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 50c2936634bcb1db78a8ca63249236810c11a80f ]
Digging through the ioctls with Al because of the previous patches, we found that on 64-bit decnet's dn_dev_ioctl() is wrong, because struct ifreq::ifr_ifru is actually 24 bytes (not 16 as expected from struct sockaddr) due to the ifru_map and ifru_settings members.
Clearly, decnet expects the ioctl to be called with a struct like
struct ifreq_dn {
char ifr_name[IFNAMSIZ];
struct sockaddr_dn ifr_addr;};
since it does
struct ifreq *ifr = ...;
struct sockaddr_dn *sdn = (struct sockaddr_dn *)&ifr->ifr_addr;
This means that DN_IFREQ_SIZE is too big for what it wants on 64-bit, as it is
sizeof(struct ifreq) - sizeof(struct sockaddr) + sizeof(struct sockaddr_dn)
This assumes that sizeof(struct sockaddr) is the size of ifr_ifru but that isn't true.
Fix this to use offsetof(struct ifreq, ifr_ifru).
This indeed doesn't really matter much - the result is that we copy in/out 8 bytes more than we should on 64-bit platforms. In case the "struct ifreq_dn" lands just on the end of a page though it might lead to faults.
As far as I can tell, it has been like this forever, so it seems very likely that nobody cares.
--- net/decnet/dn_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/decnet/dn_dev.c +1 -1
@@ -55,7 +55,7 @@#include <net/dn_neigh.h> #include <net/dn_fib.h> -#define DN_IFREQ_SIZE (sizeof(struct ifreq) - sizeof(struct sockaddr) + sizeof(struct sockaddr_dn)) +#define DN_IFREQ_SIZE (offsetof(struct ifreq, ifr_ifru) + sizeof(struct sockaddr_dn))static char dn_rt_all_end_mcast[ETH_ALEN ] = {0xAB ,0x00 ,0x00 ,0x04 ,0x00 ,0x00 };static char dn_rt_all_rt_mcast[ETH_ALEN ] = {0xAB ,0x00 ,0x00 ,0x03 ,0x00 ,0x00 };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/125 pinctrl: sh-pfc: sh7734: Fix shifted values in IPSR10
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 054f2400f706327f96770219c3065b5131f8f154 ]
Some values in the Peripheral Function Select Register 10 descriptor are shifted by one position, which may cause a peripheral function to be programmed incorrectly.
Fixing this makes all HSCIF0 pins use Function 4 (value 3), like was already the case for the HSCK0 pin in field IP10[5:3].
--- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pinctrl/sh-pfc/pfc-sh7734.c +8 -8
@@ -2213,22 +2213,22 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {/* IP10_22 [1] */ FN_CAN_CLK_A ,FN_RX4_D ,/* IP10_21_19 [3] */ -FN_AUDIO_CLKOUT ,FN_TX1_E ,FN_HRTS0_C ,FN_FSE_B , -FN_LCD_M_DISP_B ,0 ,0 ,0 , +FN_AUDIO_CLKOUT ,FN_TX1_E ,0 ,FN_HRTS0_C ,FN_FSE_B , +FN_LCD_M_DISP_B ,0 ,0 ,/* IP10_18_16 [3] */ -FN_AUDIO_CLKC ,FN_SCK1_E ,FN_HCTS0_C ,FN_FRB_B , -FN_LCD_VEPWC_B ,0 ,0 ,0 , +FN_AUDIO_CLKC ,FN_SCK1_E ,0 ,FN_HCTS0_C ,FN_FRB_B , +FN_LCD_VEPWC_B ,0 ,0 ,/* IP10_15 [1] */ FN_AUDIO_CLKB_A ,FN_LCD_CLK_B ,/* IP10_14_12 [3] */ FN_AUDIO_CLKA_A ,FN_VI1_CLK_B ,FN_SCK1_D ,FN_IECLK_B ,FN_LCD_FLM_B ,0 ,0 ,0 ,/* IP10_11_9 [3] */ -FN_SSI_SDATA3 ,FN_VI1_7_B ,FN_HTX0_C ,FN_FWE_B , -FN_LCD_CL2_B ,0 ,0 ,0 , +FN_SSI_SDATA3 ,FN_VI1_7_B ,0 ,FN_HTX0_C ,FN_FWE_B , +FN_LCD_CL2_B ,0 ,0 ,/* IP10_8_6 [3] */ -FN_SSI_SDATA2 ,FN_VI1_6_B ,FN_HRX0_C ,FN_FRE_B , -FN_LCD_CL1_B ,0 ,0 ,0 , +FN_SSI_SDATA2 ,FN_VI1_6_B ,0 ,FN_HRX0_C ,FN_FRE_B , +FN_LCD_CL1_B ,0 ,0 ,/* IP10_5_3 [3] */ FN_SSI_WS23 ,FN_VI1_5_B ,FN_TX1_D ,FN_HSCK0_C ,FN_FALE_B , FN_LCD_DON_B, 0, 0, 0,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/125 ocfs2: clear journal dirty flag after shutdown journal
In reply to Greg Kroah-HartmanFrom: Junxiao Bi <[email protected]>
[ Upstream commit d85400af790dba2aa294f0a77e712f166681f977 ]
Dirty flag of the journal should be cleared at the last stage of umount, if do it before jbd2_journal_destroy(), then some metadata in uncommitted transaction could be lost due to io error, but as dirty flag of journal was already cleared, we can't find that until run a full fsck. This may cause system panic or other corruption.
--- fs/ocfs2/journal.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/ocfs2/journal.c +2 -4
@@ -1018,7 +1018,8 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)mlog_errno (status); } -if (status ==0 ) { +/* Shutdown the kernel journal system */ +if (!jbd2_journal_destroy (journal->j_journal) && !status) {/* * Do not toggle if flush was unsuccessful otherwise * will leave dirty metadata in a "clean" journal
@@ -1027,9 +1028,6 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)if (status <0 )mlog_errno (status); } - -/* Shutdown the kernel journal system */ -jbd2_journal_destroy (journal->j_journal); journal->j_journal =NULL ;OCFS2_I (inode)->ip_open_count--;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/125 atl1e: checking the status of atl1e_write_phy_reg
In reply to Greg Kroah-HartmanFrom: Kangjie Lu <[email protected]>
[ Upstream commit ff07d48d7bc0974d4f96a85a4df14564fb09f1ef ]
atl1e_write_phy_reg() could fail. The fix issues an error message when it fails.
--- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/atheros/atl1e/atl1e_main.c +3 -1
@@ -478,7 +478,9 @@ static void atl1e_mdio_write(struct net_device *netdev, int phy_id, {struct atl1e_adapter *adapter =netdev_priv (netdev); -atl1e_write_phy_reg (&adapter->hw, reg_num &MDIO_REG_ADDR_MASK , val); +if (atl1e_write_phy_reg (&adapter->hw, + reg_num &MDIO_REG_ADDR_MASK , val)) +netdev_err (netdev,"write phy register failed\n" ); } static int atl1e_mii_ioctl(struct net_device *netdev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/125 powerpc/83xx: handle machine check caused by watchdog timer
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 0deae39cec6dab3a66794f3e9e83ca4dc30080f1 ]
When the watchdog timer is set in interrupt mode, it causes a machine check when it times out. The purpose of this mode is to ease debugging, not to crash the kernel and reboot the machine.
This patch implements a special handling for that, in order to not crash the kernel if the watchdog times out while in interrupt or within the idle task.
--- arch/powerpc/include/asm/cputable.h | 1 + arch/powerpc/include/asm/reg.h | 2 ++ arch/powerpc/kernel/cputable.c | 10 ++++++---- arch/powerpc/platforms/83xx/misc.c | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-)
arch/powerpc/include/asm/cputable.h +1 -0
@@ -44,6 +44,7 @@ extern int machine_check_e500(struct pt_regs *regs);extern int machine_check_e200 (struct pt_regs *regs);extern int machine_check_47x (struct pt_regs *regs);int machine_check_8xx (struct pt_regs *regs); +int machine_check_83xx (struct pt_regs *regs);extern void cpu_down_flush_e500v2 (void );extern void cpu_down_flush_e500mc (void );
arch/powerpc/include/asm/reg.h +2 -0
@@ -663,6 +663,8 @@#define SRR1_PROGTRAP 0x00020000/* Trap */ #define SRR1_PROGADDR 0x00010000/* SRR0 contains subsequent addr */ +#define SRR1_MCE_MCP 0x00080000/* Machine check signal caused interrupt */ +#define SPRN_HSRR0 0x13A/* Save/Restore Register 0 */ #define SPRN_HSRR1 0x13B/* Save/Restore Register 1 */ #define HSRR1_DENORM 0x00100000/* Denorm exception */
arch/powerpc/kernel/cputable.c +6 -4
@@ -1162,6 +1162,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .machine_check = machine_check_generic, .platform = "ppc603", }, +#ifdef CONFIG_PPC_83xx {/* e300c1 (a 603e core, plus some) on 83xx */ .pvr_mask = 0x7fff0000, .pvr_value = 0x00830000,
@@ -1172,7 +1173,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .icache_bsize = 32, .dcache_bsize = 32, .cpu_setup = __setup_cpu_603, - .machine_check = machine_check_generic, + .machine_check = machine_check_83xx, .platform = "ppc603", }, {/* e300c2 (an e300c1 core, plus some, minus FPU) on 83xx */
@@ -1186,7 +1187,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .icache_bsize = 32, .dcache_bsize = 32, .cpu_setup = __setup_cpu_603, - .machine_check = machine_check_generic, + .machine_check = machine_check_83xx, .platform = "ppc603", }, {/* e300c3 (e300c1, plus one IU, half cache size) on 83xx */
@@ -1200,7 +1201,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .icache_bsize = 32, .dcache_bsize = 32, .cpu_setup = __setup_cpu_603, - .machine_check = machine_check_generic, + .machine_check = machine_check_83xx, .num_pmcs = 4, .oprofile_cpu_type = "ppc/e300", .oprofile_type = PPC_OPROFILE_FSL_EMB,
@@ -1217,12 +1218,13 @@ static struct cpu_spec __initdata cpu_specs[] = { .icache_bsize = 32, .dcache_bsize = 32, .cpu_setup = __setup_cpu_603, - .machine_check = machine_check_generic, + .machine_check = machine_check_83xx, .num_pmcs = 4, .oprofile_cpu_type = "ppc/e300", .oprofile_type = PPC_OPROFILE_FSL_EMB, .platform = "ppc603", }, +#endif {/* default match, we assume split I/D cache & TB (non-601)... */ .pvr_mask = 0x00000000, .pvr_value = 0x00000000,
arch/powerpc/platforms/83xx/misc.c +17 -0
@@ -14,6 +14,7 @@#include <linux/of_platform.h> #include <linux/pci.h> +#include <asm/debug.h> #include <asm/io.h> #include <asm/hw_irq.h> #include <asm/ipic.h>
@@ -150,3 +151,19 @@ void __init mpc83xx_setup_arch(void)mpc83xx_setup_pci (); } + +int machine_check_83xx (struct pt_regs *regs) +{ +u32 mask =1 << (31 -IPIC_MCP_WDT ); + +if (!(regs->msr &SRR1_MCE_MCP ) || !(ipic_get_mcp_status () & mask)) +return machine_check_generic (regs); +ipic_clear_mcp_status (mask); + +if (debugger_fault_handler (regs)) +return 1 ; + +die ("Watchdog NMI Reset" , regs,0 ); + +return 1 ; +}
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/125 crypto: mxc-scc - fix build warnings on ARM64
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 2326828ee40357b3d2b1359b8ca7526af201495b ]
The following build warnings are seen when building for ARM64 allmodconfig:
drivers/crypto/mxc-scc.c:181:20: warning: format '%d' expects argument of type 'int', but argument 5 has type 'size_t' {aka 'long unsigned int'} [-Wformat=] drivers/crypto/mxc-scc.c:186:21: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' {aka 'long unsigned int'} [-Wformat=] drivers/crypto/mxc-scc.c:277:21: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' {aka 'long unsigned int'} [-Wformat=] drivers/crypto/mxc-scc.c:339:3: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] drivers/crypto/mxc-scc.c:340:3: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
Fix them by using the %zu specifier to print a size_t variable and using a plain %x to print the result of a readl().
--- drivers/crypto/mxc-scc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/crypto/mxc-scc.c +6 -6
@@ -178,12 +178,12 @@ static int mxc_scc_get_data(struct mxc_scc_ctx *ctx,else from = scc->black_memory; -dev_dbg (scc->dev,"pcopy: from 0x%p %d bytes\n" , from, +dev_dbg (scc->dev,"pcopy: from 0x%p %zu bytes\n" , from, ctx->dst_nents *8 ); len =sg_pcopy_from_buffer (ablkreq->dst, ctx->dst_nents, from, ctx->size, ctx->offset);if (!len) { -dev_err (scc->dev,"pcopy err from 0x%p (len=%d)\n" , from, len); +dev_err (scc->dev,"pcopy err from 0x%p (len=%zu)\n" , from, len);return -EINVAL ; }
@@ -274,7 +274,7 @@ static int mxc_scc_put_data(struct mxc_scc_ctx *ctx, len =sg_pcopy_to_buffer (req->src, ctx->src_nents, to, len, ctx->offset);if (!len) { -dev_err (scc->dev,"pcopy err to 0x%p (len=%d)\n" , to, len); +dev_err (scc->dev,"pcopy err to 0x%p (len=%zu)\n" , to, len);return -EINVAL ; }
@@ -335,9 +335,9 @@ static void mxc_scc_ablkcipher_next(struct mxc_scc_ctx *ctx,return ; } -dev_dbg (scc->dev,"Start encryption (0x%p/0x%p)\n" , - (void *)readl (scc->base +SCC_SCM_RED_START ), - (void *)readl (scc->base +SCC_SCM_BLACK_START )); +dev_dbg (scc->dev,"Start encryption (0x%x/0x%x)\n" , +readl (scc->base +SCC_SCM_RED_START ), +readl (scc->base +SCC_SCM_BLACK_START ));/* clear interrupt control registers */ writel(SCC_SCM_INTR_CTRL_CLR_INTR,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/125 drbd: reject attach of unsuitable uuids even if connected
In reply to Greg Kroah-HartmanFrom: Lars Ellenberg <[email protected]>
[ Upstream commit fe43ed97bba3b11521abd934b83ed93143470e4f ]
Multiple failure scenario:
a) all good
Connected Primary/Secondary UpToDate/UpToDate
b) lose disk on Primary,
Connected Primary/Secondary Diskless/UpToDate
c) continue to write to the device,
changes only make it to the Secondary storage.
d) lose disk on Secondary,
Connected Primary/Secondary Diskless/Diskless
e) now try to re-attach on Primary
This would have succeeded before, even though that is clearly the wrong data set to attach to (missing the modifications from c). Because we only compared our "effective" and the "to-be-attached" data generation uuid tags if (device->state.conn < C_CONNECTED).
Fix: change that constraint to (device->state.pdsk != D_UP_TO_DATE) compare the uuids, and reject the attach.
This patch also tries to improve the reverse scenario:
first lose Secondary, then Primary disk,
then try to attach the disk on Secondary.
Before this patch, the attach on the Secondary succeeds, but since commit
drbd: disconnect, if the wrong UUIDs are attached on a connected peer the Primary will notice unsuitable data, and drop the connection hard.
Though unfortunately at a point in time during the handshake where we cannot easily abort the attach on the peer without more refactoring of the handshake.
We now reject any attach to "unsuitable" uuids,
as long as we can see a Primary role,
unless we already have access to "good" data.
--- drivers/block/drbd/drbd_nl.c | 6 +++--- drivers/block/drbd/drbd_receiver.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-)
drivers/block/drbd/drbd_nl.c +3 -3
@@ -1927,9 +1927,9 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) } } -if (device->state.conn <C_CONNECTED && - device->state.role ==R_PRIMARY && device->ed_uuid && - (device->ed_uuid & ~((u64 )1 )) != (nbc->md.uuid[UI_CURRENT ] & ~((u64 )1 ))) { +if (device->state.pdsk !=D_UP_TO_DATE && device->ed_uuid && + (device->state.role ==R_PRIMARY || device->state.peer ==R_PRIMARY ) && + (device->ed_uuid & ~((u64 )1 )) != (nbc->md.uuid[UI_CURRENT ] & ~((u64 )1 ))) {drbd_err (device,"Can only attach to data with current UUID=%016llX\n" , (unsigned long long )device->ed_uuid); retcode =ERR_DATA_NOT_CURRENT ;
drivers/block/drbd/drbd_receiver.c +19 -0
@@ -4452,6 +4452,25 @@ static int receive_state(struct drbd_connection *connection, struct packet_infoif (peer_state.conn ==C_AHEAD ) ns.conn =C_BEHIND ; +/* TODO: +* if (primary and diskless and peer uuid != effective uuid) +* abort attach on peer; +* +* If this node does not have good data, was already connected, but +* the peer did a late attach only now, trying to "negotiate" with me, +* AND I am currently Primary, possibly frozen, with some specific +* "effective" uuid, this should never be reached, really, because +* we first send the uuids, then the current state. +* +* In this scenario, we already dropped the connection hard +* when we received the unsuitable uuids (receive_uuids(). +* +* Should we want to change this, that is: not drop the connection in +* receive_uuids() already, then we would need to add a branch here +* that aborts the attach of "unsuitable uuids" on the peer in case +* this node is currently Diskless Primary. +*/ +if (device->p_uuid && peer_state.disk >=D_NEGOTIATING &&get_ldev_if_state (device,D_NEGOTIATING )) {int cr;/* consider resync */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/125 HID: intel-ish-hid: fixes incorrect error handling
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit 6e0856d317440a950b17c00a9283114f025e5699 ]
The memory chunk allocated by hid_allocate_device() should be released by hid_destroy_device(), not kfree().
--- drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/intel-ish-hid/ishtp-hid.c +1 -1
@@ -222,7 +222,7 @@ int ishtp_hid_probe(unsigned int cur_hid_dev, err_hid_device:kfree (hid_data); err_hid_data: -kfree (hid); +hid_destroy_device (hid);return rv; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/125 powerpc/mm: Make NULL pointer deferences explicit on bad page faults.
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 49a502ea23bf9dec47f8f3c3960909ff409cd1bb ]
As several other arches including x86, this patch makes it explicit that a bad page fault is a NULL pointer dereference when the fault address is lower than PAGE_SIZE
In the mean time, this page makes all bad_page_fault() messages shorter so that they remain on one single line. And it prefixes them by "BUG: " so that they get easily grepped.
--- arch/powerpc/mm/fault.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
arch/powerpc/mm/fault.c +9 -8
@@ -521,21 +521,22 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)switch (regs->trap) {case 0x300 :case 0x380 : -printk (KERN_ALERT "Unable to handle kernel paging request for " -"data at address 0x%08lx\n" , regs->dar); +pr_alert ("BUG: %s at 0x%08lx\n" , + regs->dar <PAGE_SIZE ?"Kernel NULL pointer dereference" : +"Unable to handle kernel data access" , regs->dar);break ;case 0x400 :case 0x480 : -printk (KERN_ALERT "Unable to handle kernel paging request for " -"instruction fetch\n" ); +pr_alert ("BUG: Unable to handle kernel instruction fetch%s" , + regs->nip <PAGE_SIZE ?" (NULL pointer?)\n" :"\n" );break ;case 0x600 : -printk (KERN_ALERT "Unable to handle kernel paging request for " -"unaligned access at address 0x%08lx\n" , regs->dar); +pr_alert ("BUG: Unable to handle kernel unaligned access at 0x%08lx\n" , + regs->dar);break ;default : -printk (KERN_ALERT "Unable to handle kernel paging request for " -"unknown fault\n" ); +pr_alert ("BUG: Unable to handle unknown paging fault at 0x%08lx\n" , + regs->dar);break ; } printk(KERN_ALERT "Faulting instruction address: 0x%08lx\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/125 scsi: csiostor: fix incorrect dma device in case of vport
In reply to Greg Kroah-HartmanFrom: Varun Prakash <[email protected]>
[ Upstream commit 9934613edcb40b92a216122876cd3b7e76d08390 ]
In case of ->vport_create() call scsi_add_host_with_dma() instead of scsi_add_host() to pass correct dma device.
--- drivers/scsi/csiostor/csio_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/csiostor/csio_init.c +1 -1
@@ -648,7 +648,7 @@ csio_shost_init(struct csio_hw *hw, struct device *dev,if (csio_lnode_init (ln, hw, pln)) goto err_shost_put; -if (scsi_add_host (shost, dev)) +if (scsi_add_host_with_dma (shost, dev, &hw->pdev->dev)) goto err_lnode_exit;return ln;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/125 powerpc/book3s/32: fix number of bats in p/v_block_mapped()
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit e93ba1b7eb5b188c749052df7af1c90821c5f320 ]
This patch fixes the loop in p_block_mapped() and v_block_mapped() to scan the entire bat_addrs[] array.
--- arch/powerpc/mm/ppc_mmu_32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/mm/ppc_mmu_32.c +2 -2
@@ -52,7 +52,7 @@ struct batrange { /* stores address ranges mapped by BATs */phys_addr_t v_block_mapped (unsigned long va) {int b; -for (b =0 ; b <4 ; ++b) +for (b =0 ; b <ARRAY_SIZE (bat_addrs); ++b)if (va >= bat_addrs[b].start && va < bat_addrs[b].limit)return bat_addrs[b].phys + (va - bat_addrs[b].start);return 0 ;
@@ -64,7 +64,7 @@ phys_addr_t v_block_mapped(unsigned long va)unsigned long p_block_mapped (phys_addr_t pa) {int b; -for (b =0 ; b <4 ; ++b) +for (b =0 ; b <ARRAY_SIZE (bat_addrs); ++b)if (pa >= bat_addrs[b].phys && pa < (bat_addrs[b].limit-bat_addrs[b].start) +bat_addrs[b].phys)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/125 IB/qib: Fix an error code in qib_sdma_verbs_send()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 5050ae5fa3d54c8e83e1e447cc7e3591110a7f57 ]
We accidentally return success on this error path.
--- drivers/infiniband/hw/qib/qib_sdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/qib/qib_sdma.c +3 -1
@@ -600,8 +600,10 @@ retry: dw = (len +3 ) >>2 ; addr =dma_map_single (&ppd->dd->pcidev->dev, sge->vaddr, dw <<2 ,DMA_TO_DEVICE ); -if (dma_mapping_error (&ppd->dd->pcidev->dev, addr)) +if (dma_mapping_error (&ppd->dd->pcidev->dev, addr)) { + ret = -ENOMEM ; goto unmap; + } sdmadesc[0 ] =0 ;make_sdma_desc (ppd, sdmadesc, (u64 ) addr, dw, dwoffset);/* SDmaUseLargeBuf has to be set in every descriptor */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/125 gfs2: take jdata unstuff into account in do_grow
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
[ Upstream commit bc0205612bbd4dd4026d4ba6287f5643c37366ec ]
Before this patch, function do_grow would not reserve enough journal blocks in the transaction to unstuff jdata files while growing them. This patch adds the logic to add one more block if the file to grow is jdata.
--- fs/gfs2/bmap.c | 2 ++ 1 file changed, 2 insertions(+)
fs/gfs2/bmap.c +2 -0
@@ -1236,6 +1236,8 @@ static int do_grow(struct inode *inode, u64 size) } error =gfs2_trans_begin (sdp,RES_DINODE +RES_STATFS +RES_RG_BIT + + (unstuff && +gfs2_is_jdata (ip) ?RES_JDATA :0 ) + (sdp->sd_args.ar_quota ==GFS2_QUOTA_OFF ?0 :RES_QUOTA ),0 );if (error)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 6/125 net: fec: add missed clk_disable_unprepare in remove
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit c43eab3eddb4c6742ac20138659a9b701822b274 ]
This driver forgets to disable and unprepare clks when remove. Add calls to clk_disable_unprepare to fix it.
--- drivers/net/ethernet/freescale/fec_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/freescale/fec_main.c +2 -0
@@ -3539,6 +3539,8 @@ fec_drv_remove(struct platform_device *pdev)regulator_disable (fep->reg_phy);pm_runtime_put (&pdev->dev);pm_runtime_disable (&pdev->dev); +clk_disable_unprepare (fep->clk_ahb); +clk_disable_unprepare (fep->clk_ipg);if (of_phy_is_fixed_link (np))of_phy_deregister_fixed_link (np);of_node_put (fep->phy_node);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/125 clk: at91: avoid sleeping early
In reply to Greg Kroah-HartmanFrom: Alexandre Belloni <[email protected]>
[ Upstream commit 658fd65cf0b0d511de1718e48d9a28844c385ae0 ]
It is not allowed to sleep to early in the boot process and this may lead to kernel issues if the bootloader didn't prepare the slow clock and main clock.
This results in the following error and dump stack on the AriettaG25:
bad: scheduling from the idle thread!
Ensure it is possible to sleep, else simply have a delay.
--- drivers/clk/at91/clk-main.c | 5 ++++- drivers/clk/at91/sckc.c | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-)
drivers/clk/at91/clk-main.c +4 -1
@@ -354,7 +354,10 @@ static int clk_main_probe_frequency(struct regmap *regmap)regmap_read (regmap,AT91_CKGR_MCFR , &mcfr);if (mcfr &AT91_PMC_MAINRDY )return 0 ; -usleep_range (MAINF_LOOP_MIN_WAIT ,MAINF_LOOP_MAX_WAIT ); +if (system_state <SYSTEM_RUNNING ) +udelay (MAINF_LOOP_MIN_WAIT ); +else +usleep_range (MAINF_LOOP_MIN_WAIT ,MAINF_LOOP_MAX_WAIT ); }while (time_before (prep_time, timeout));return -ETIMEDOUT ;
drivers/clk/at91/sckc.c +16 -4
@@ -74,7 +74,10 @@ static int clk_slow_osc_prepare(struct clk_hw *hw)writel (tmp |AT91_SCKC_OSC32EN , sckcr); -usleep_range (osc->startup_usec, osc->startup_usec +1 ); +if (system_state <SYSTEM_RUNNING ) +udelay (osc->startup_usec); +else +usleep_range (osc->startup_usec, osc->startup_usec +1 );return 0 ; }
@@ -197,7 +200,10 @@ static int clk_slow_rc_osc_prepare(struct clk_hw *hw)writel (readl (sckcr) |AT91_SCKC_RCEN , sckcr); -usleep_range (osc->startup_usec, osc->startup_usec +1 ); +if (system_state <SYSTEM_RUNNING ) +udelay (osc->startup_usec); +else +usleep_range (osc->startup_usec, osc->startup_usec +1 );return 0 ; }
@@ -310,7 +316,10 @@ static int clk_sam9x5_slow_set_parent(struct clk_hw *hw, u8 index)writel (tmp, sckcr); -usleep_range (SLOWCK_SW_TIME_USEC ,SLOWCK_SW_TIME_USEC +1 ); +if (system_state <SYSTEM_RUNNING ) +udelay (SLOWCK_SW_TIME_USEC ); +else +usleep_range (SLOWCK_SW_TIME_USEC ,SLOWCK_SW_TIME_USEC +1 );return 0 ; }
@@ -443,7 +452,10 @@ static int clk_sama5d4_slow_osc_prepare(struct clk_hw *hw)return 0 ; } -usleep_range (osc->startup_usec, osc->startup_usec +1 ); +if (system_state <SYSTEM_RUNNING ) +udelay (osc->startup_usec); +else +usleep_range (osc->startup_usec, osc->startup_usec +1 ); osc->prepared = true;return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/125 ubi: Do not drop UBI device reference before using
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit e542087701f09418702673631a908429feb3eae0 ]
The UBI device reference is dropped but then the device is used as a parameter of ubi_err. The bug is introduced in changing ubi_err's behavior. The old ubi_err does not require a UBI device as its first parameter, but the new one does.
--- drivers/mtd/ubi/kapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/ubi/kapi.c +1 -1
@@ -227,9 +227,9 @@ out_unlock: out_free:kfree (desc); out_put_ubi: -ubi_put_device (ubi);ubi_err (ubi,"cannot open device %d, volume %d, error %d" , ubi_num, vol_id, err); +ubi_put_device (ubi);return ERR_PTR (err); }EXPORT_SYMBOL_GPL (ubi_open_volume);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/125 crypto: user - support incremental algorithm dumps
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 0ac6b8fb23c724b015d9ca70a89126e8d1563166 ]
CRYPTO_MSG_GETALG in NLM_F_DUMP mode sometimes doesn't return all registered crypto algorithms, because it doesn't support incremental dumps. crypto_dump_report() only permits itself to be called once, yet the netlink subsystem allocates at most ~64 KiB for the skb being dumped to. Thus only the first recvmsg() returns data, and it may only include a subset of the crypto algorithms even if the user buffer passed to recvmsg() is large enough to hold all of them.
Fix this by using one of the arguments in the netlink_callback structure to keep track of the current position in the algorithm list. Then userspace can do multiple recvmsg() on the socket after sending the dump request. This is the way netlink dumps work elsewhere in the kernel; it's unclear why this was different (probably just an oversight).
Also fix an integer overflow when calculating the dump buffer size hint.
--- crypto/crypto_user.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-)
crypto/crypto_user.c +20 -17
@@ -277,30 +277,33 @@ drop_alg:static int crypto_dump_report (struct sk_buff *skb,struct netlink_callback *cb) { -struct crypto_alg *alg; +const size_t start_pos = cb->args[0 ]; +size_t pos =0 ;struct crypto_dump_info info; -int err; - -if (cb->args[0 ]) - goto out; - - cb->args[0 ] =1 ; +struct crypto_alg *alg; +int res; info.in_skb = cb->skb; info.out_skb = skb; info.nlmsg_seq = cb->nlh->nlmsg_seq; info.nlmsg_flags =NLM_F_MULTI ; +down_read (&crypto_alg_sem);list_for_each_entry (alg, &crypto_alg_list, cra_list) { - err =crypto_report_alg (alg, &info); -if (err) - goto out_err; +if (pos >= start_pos) { + res =crypto_report_alg (alg, &info); +if (res == -EMSGSIZE ) +break ; +if (res) + goto out; + } + pos++; } - + cb->args[0 ] = pos; + res = skb->len; out: -return skb->len; -out_err: -return err; +up_read (&crypto_alg_sem); +return res; }static int crypto_dump_report_done (struct netlink_callback *cb)
@@ -483,7 +486,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)if ((type == (CRYPTO_MSG_GETALG -CRYPTO_MSG_BASE ) && (nlh->nlmsg_flags &NLM_F_DUMP ))) {struct crypto_alg *alg; -u16 dump_alloc =0 ; +unsigned long dump_alloc =0 ;if (link->dump ==NULL )return -EINVAL ;
@@ -491,16 +494,16 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)down_read (&crypto_alg_sem);list_for_each_entry (alg, &crypto_alg_list, cra_list) dump_alloc +=CRYPTO_REPORT_MAXSIZE ; +up_read (&crypto_alg_sem); {struct netlink_dump_control c = { .dump = link->dump, .done = link->done, - .min_dump_alloc = dump_alloc, + .min_dump_alloc =min (dump_alloc,65535UL ), }; err =netlink_dump_start (crypto_nlsk, skb, nlh, &c); } -up_read (&crypto_alg_sem);return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/125 ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 998a84c27a7f3f9133d32af64e19c05cec161a1a ]
imx53-voipac-dmm-668 has two memory nodes, but the correct representation would be to use a single one with two reg entries - one for each RAM chip select, so fix it accordingly.
--- arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi +2 -6
@@ -17,12 +17,8 @@ memory@70000000 { device_type = "memory"; - reg = <0x70000000 0x20000000>; - }; - - memory@b0000000 { - device_type = "memory"; - reg = <0xb0000000 0x20000000>; + reg = <0x70000000 0x20000000>, + <0xb0000000 0x20000000>; }; regulators {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/125 parisc: Fix HP SDC hpa address output
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit c4bff35ca1bfba886da6223c9fed76a2b1382b8e ]
Show the hpa address of the HP SDC instead of a hashed value, e.g.:
HP SDC: HP SDC at 0xf0201000, IRQ 23 (NMI IRQ 24)
--- drivers/input/serio/hp_sdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/serio/hp_sdc.c +2 -2
@@ -887,8 +887,8 @@ static int __init hp_sdc_init(void) "HP SDC NMI", &hp_sdc)) goto err2; - printk(KERN_INFO PREFIX "HP SDC at 0x%p, IRQ %d (NMI IRQ %d)\n", - (void *)hp_sdc.base_io, hp_sdc.irq, hp_sdc.nmi); +pr_info (PREFIX "HP SDC at 0x%08lx, IRQ %d (NMI IRQ %d)\n" , + hp_sdc.base_io, hp_sdc.irq, hp_sdc.nmi);hp_sdc_status_in8 ();hp_sdc_data_in8 ();
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/125 scripts/gdb: fix debugging modules compiled with hot/cold partitioning
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit 8731acc5068eb3f422a45c760d32198175c756f8 ]
gcc's -freorder-blocks-and-partition option makes it group frequently and infrequently used code in .text.hot and .text.unlikely sections respectively. At least when building modules on s390, this option is used by default.
gdb assumes that all code is located in .text section, and that .text section is located at module load address. With such modules this is no longer the case: there is code in .text.hot and .text.unlikely, and either of them might precede .text.
Fix by explicitly telling gdb the addresses of code sections.
It might be tempting to do this for all sections, not only the ones in the white list. Unfortunately, gdb appears to have an issue, when telling it about e.g. loadable .note.gnu.build-id section causes it to think that non-loadable .note.Linux section is loaded at address 0, which in turn causes NULL pointers to be resolved to bogus symbols. So keep using the white list approach for the time being.
--- scripts/gdb/linux/symbols.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/gdb/linux/symbols.py +2 -1
@@ -99,7 +99,8 @@ lx-symbols command.""" attrs[n]['name'].string(): attrs[n]['address'] for n in range(int(sect_attrs['nsections']))} args = [] - for section_name in [".data", ".data..read_mostly", ".rodata", ".bss"]: + for section_name in [".data", ".data..read_mostly", ".rodata", ".bss", + ".text", ".text.hot", ".text.unlikely"]: address = section_name_to_address.get(section_name) if address: args.append(" -s {name} {addr}".format(
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/125 block: drbd: remove a stray unlock in __drbd_send_protocol()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 8e9c523016cf9983b295e4bc659183d1fa6ef8e0 ]
There are two callers of this function and they both unlock the mutex so this ends up being a double unlock.
--- drivers/block/drbd/drbd_main.c | 1 - 1 file changed, 1 deletion(-)
drivers/block/drbd/drbd_main.c +0 -1
@@ -793,7 +793,6 @@ int __drbd_send_protocol(struct drbd_connection *connection, enum drbd_packet cmif (nc->tentative && connection->agreed_pro_version <92 ) {rcu_read_unlock (); -mutex_unlock (&sock->mutex);drbd_err (connection,"--dry-run is not supported by peer" );return -EOPNOTSUPP ; }
Signature · 1 line
2.20.1
Re: [PATCH 4.9 105/125] mm, gup: add missing refcount overflow checks on x86 and s390
In reply to Greg Kroah-HartmanQuoted 13 lines · Greg Kroah-Hartman
From: Vlastimil Babka <[email protected]>
The mainline commit
8fde12ca79af("mm: preventget_user_pages()from overflowing page refcount") was backported to 4.9.y stable as commit2ed768cfd895. The backport however missed that in 4.9, there are several arch-specificgup.cversions with fast gup implementations, so these do not prevent refcount overflow.This is partially fixed for x86 in stable-only commit
d73af79742e7("x86, mm,
gup: preventget_page()race with munmap in paravirt guest"). This stable-only commit adds missing parts to x86 version, as well as s390 version, both taken from the SUSE SLES/openSUSE 4.12-based kernels.
Quoted 7 lines
The remaining architectures with own
gup.care sparc, mips, sh. It's unlikely the known overflow scenario based on FUSE, which needs 140GB of RAM, is a problem for those architectures, and I don't feel confident enough to patch them.Signed-off-by Vlastimil Babka <[email protected]>Signed-off-by Sasha Levin <[email protected]>
No, this one had a leak bug and I've sent updated version:
https://lore.kernel.org/linux-mm/[email protected]/
Quoted 77 lines
--- arch/s390/mm/gup.c | 9 ++++++--- arch/x86/mm/gup.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-)arch/s390/mm/gup.c +6
-3@@ -38,7 +38,8 @@ static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,VM_BUG_ON (!pfn_valid (pte_pfn (pte))); page =pte_page (pte); head =compound_head (page); -if (!page_cache_get_speculative (head)) +if (unlikely (WARN_ON_ONCE (page_ref_count (head) <0 ) + || !page_cache_get_speculative (head)))return 0 ;if (unlikely (pte_val (pte) !=pte_val (*ptep))) {put_page (head);@@ -76,7 +77,8 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, refs++; }while (addr +=PAGE_SIZE , addr != end); -if (!page_cache_add_speculative (head, refs)) { +if (unlikely (WARN_ON_ONCE (page_ref_count (head) <0 ) + || !page_cache_add_speculative (head, refs))) { *nr -= refs;return 0 ; }@@ -150,7 +152,8 @@ static int gup_huge_pud(pud_t *pudp, pud_t pud, unsigned long addr, refs++; }while (addr +=PAGE_SIZE , addr != end); -if (!page_cache_add_speculative (head, refs)) { +if (unlikely (WARN_ON_ONCE (page_ref_count (head) <0 ) + || !page_cache_add_speculative (head, refs))) { *nr -= refs;return 0 ; }arch/x86/mm/gup.c +8
-2@@ -202,10 +202,12 @@ static int __gup_device_huge_pmd(pmd_t pmd, unsigned long addr,undo_dev_pagemap (nr, nr_start, pages);return 0 ; } +if (unlikely (!try_get_page (page))) { +put_dev_pagemap (pgmap); +return 0 ; + }SetPageReferenced (page); pages[*nr] = page; -get_page (page); -put_dev_pagemap (pgmap); (*nr)++; pfn++; }while (addr +=PAGE_SIZE , addr != end);@@ -230,6 +232,8 @@ static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr, refs =0 ; head =pmd_page (pmd); +if (WARN_ON_ONCE (page_ref_count (head) <=0 )) +return 0 ; page = head + ((addr & ~PMD_MASK ) >>PAGE_SHIFT ); do { VM_BUG_ON_PAGE(compound_head(page) != head, page);@@ -289,6 +293,8 @@ static noinline int gup_huge_pud(pud_t pud, unsigned long addr, refs =0 ; head =pud_page (pud); +if (WARN_ON_ONCE (page_ref_count (head) <=0 )) +return 0 ; page = head + ((addr & ~PUD_MASK ) >>PAGE_SHIFT ); do { VM_BUG_ON_PAGE(compound_head(page) != head, page);
Greg Kroah-Hartman
maintainerRe: [PATCH 4.9 105/125] mm, gup: add missing refcount overflow checks on x86 and s390
Quoted 19 lines · Vlastimil Babka
Quoted 18 lines · Greg Kroah-Hartman
From: Vlastimil Babka <[email protected]>
The mainline commit
8fde12ca79af("mm: preventget_user_pages()from overflowing page refcount") was backported to 4.9.y stable as commit2ed768cfd895. The backport however missed that in 4.9, there are several arch-specificgup.cversions with fast gup implementations, so these do not prevent refcount overflow.This is partially fixed for x86 in stable-only commit
d73af79742e7("x86, mm,
gup: preventget_page()race with munmap in paravirt guest"). This stable-only commit adds missing parts to x86 version, as well as s390 version, both taken from the SUSE SLES/openSUSE 4.12-based kernels.The remaining architectures with own
gup.care sparc, mips, sh. It's unlikely the known overflow scenario based on FUSE, which needs 140GB of RAM, is a problem for those architectures, and I don't feel confident enough to patch them.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Vlastimil Babka <[email protected]>Signed-off-by Sasha Levin <[email protected]>No, this one had a leak bug and I've sent updated version:
https://lore.kernel.org/linux-mm/[email protected]/
Ugh. Ok, let me go fix that up...
Greg Kroah-Hartman
maintainerRe: [PATCH 4.9 105/125] mm, gup: add missing refcount overflow checks on x86 and s390
Quoted 20 lines · Greg Kroah-Hartman
Quoted 19 lines · Vlastimil Babka
Quoted 18 lines · Greg Kroah-Hartman
From: Vlastimil Babka <[email protected]>
The mainline commit
8fde12ca79af("mm: preventget_user_pages()from overflowing page refcount") was backported to 4.9.y stable as commit2ed768cfd895. The backport however missed that in 4.9, there are several arch-specificgup.cversions with fast gup implementations, so these do not prevent refcount overflow.This is partially fixed for x86 in stable-only commit
d73af79742e7("x86, mm,
gup: preventget_page()race with munmap in paravirt guest"). This stable-only commit adds missing parts to x86 version, as well as s390 version, both taken from the SUSE SLES/openSUSE 4.12-based kernels.The remaining architectures with own
gup.care sparc, mips, sh. It's unlikely the known overflow scenario based on FUSE, which needs 140GB of RAM, is a problem for those architectures, and I don't feel confident enough to patch them.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Signed-off-by Vlastimil Babka <[email protected]>Signed-off-by Sasha Levin <[email protected]>No, this one had a leak bug and I've sent updated version:
https://lore.kernel.org/linux-mm/[email protected]/Ugh. Ok, let me go fix that up...
Now done and I've pushed out a -rc2 with that fix in it.
thanks,
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.206 release. There are 125 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 Fri, 06 Dec 2019 17:50:36 +0000. 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.206-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.206-rc2
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.9.y
git commit: eedf6ee6d6ccee71e628b172e33ef860e05e6bb2
git describe: v4.9.205-126-geedf6ee6d6cc
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.9-oe/build/v4.9.205-126-geedf6ee6d6cc
No regressions (compared to build v4.9.205)
No fixes (compared to build v4.9.205)
Ran 23412 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
* linux-log-parser
* 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
* 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
* prep-tmp-disk
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Jon Hunter
maintainerQuoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.206 release. There are 125 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 Fri, 06 Dec 2019 17:50:36 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.206-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.
Quoted 5 lines
thanks,
greg k-h
-------------
All tests are 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.206-rc1-g0cc0fc017aa0
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.206 release. There are 125 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 Fri, 06 Dec 2019 17:50:36 +0000. Anything received after that time might be too late.
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 356 pass: 356 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.206 release. There are 125 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 Fri, 06 Dec 2019 17:50:36 +0000. 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.206-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
I know this is way late. I managed to boot 4.9.206 finally on my test system running Ubuntu 19.10.
It turns out, Ubuntu 19.10 defaults to LZ4 compression.
/etc/initramfs-tools/initramfs.conf
COMPRESS=lz4
Enabling the following worked for me.
CONFIG_RD_LZ4=yCONFIG_SQUASHFS_LZ4=yCONFIG_LZ4_DECOMPRESS=yCONFIG_DECOMPRESS_LZ4=y
Stable release older than 4.19 will require the above change.
thanks,
-- Shuah