4.4.212-stable review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 160/183 can, slip: Protect tty->disc_data in write_wakeup and close with RCU
In reply to Greg Kroah-HartmanFrom: Richard Palethorpe <[email protected]>
[ Upstream commit 0ace17d56824165c7f4c68785d6b58971db954dd ]
write_wakeup can happen in parallel with close/hangup where tty->disc_data is set to NULL and the netdevice is freed thus also freeing disc_data. write_wakeup accesses disc_data so we must prevent close from freeing the netdev while write_wakeup has a non-NULL view of tty->disc_data.
We also need to make sure that accesses to disc_data are atomic. Which can all be done with RCU.
This problem was found by Syzkaller on SLCAN, but the same issue is reproducible with the SLIP line discipline using an LTP test based on the Syzkaller reproducer.
A fix which didn't use RCU was posted by Hillf Danton.
--- drivers/net/can/slcan.c | 12 ++++++++++-- drivers/net/slip/slip.c | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-)
drivers/net/can/slcan.c +10 -2
@@ -344,9 +344,16 @@ static void slcan_transmit(struct work_s*/ static void slcan_write_wakeup (struct tty_struct *tty) { -struct slcan *sl = tty->disc_data; +struct slcan *sl; + +rcu_read_lock (); + sl =rcu_dereference (tty->disc_data); +if (!sl) + goto out;schedule_work (&sl->tx_work); +out: +rcu_read_unlock (); }/* Send a can_frame to a TTY queue. */
@@ -640,10 +647,11 @@ static void slcan_close(struct tty_strucreturn ;spin_lock_bh (&sl->lock); - tty->disc_data =NULL ; +rcu_assign_pointer (tty->disc_data,NULL ); sl->tty =NULL ;spin_unlock_bh (&sl->lock); +synchronize_rcu ();flush_work (&sl->tx_work);/* Flush network side */
drivers/net/slip/slip.c +10 -2
@@ -452,9 +452,16 @@ static void slip_transmit(struct work_st*/ static void slip_write_wakeup (struct tty_struct *tty) { -struct slip *sl = tty->disc_data; +struct slip *sl; + +rcu_read_lock (); + sl =rcu_dereference (tty->disc_data); +if (!sl) + goto out;schedule_work (&sl->tx_work); +out: +rcu_read_unlock (); }static void sl_tx_timeout (struct net_device *dev)
@@ -887,10 +894,11 @@ static void slip_close(struct tty_structreturn ;spin_lock_bh (&sl->lock); - tty->disc_data =NULL ; +rcu_assign_pointer (tty->disc_data,NULL ); sl->tty =NULL ;spin_unlock_bh (&sl->lock); +synchronize_rcu ();flush_work (&sl->tx_work);/* VSV = very important to remove timers */
Greg Kroah-Hartman
maintainerPATCH 1/183 xfs: Sanity check flags of Q_XQUOTARM call
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 3dd4d40b420846dd35869ccc8f8627feef2cff32 upstream.
Flags passed to Q_XQUOTARM were not sanity checked for invalid values. Fix that.
--- fs/xfs/xfs_quotaops.c | 3 +++ 1 file changed, 3 insertions(+)
fs/xfs/xfs_quotaops.c +3 -0
@@ -214,6 +214,9 @@ xfs_fs_rm_xquota(if (XFS_IS_QUOTA_ON (mp))return -EINVAL ; +if (uflags & ~(FS_USER_QUOTA |FS_GROUP_QUOTA |FS_PROJ_QUOTA )) +return -EINVAL ; +if (uflags &FS_USER_QUOTA ) flags |=XFS_DQ_USER ;if (uflags &FS_GROUP_QUOTA )
Greg Kroah-Hartman
maintainerPATCH 11/183 pinctrl: sh-pfc: r8a7740: Add missing REF125CK pin to gether_gmii group
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 1ebc589a7786f17f97b9e87b44e0fb4d0290d8f8 ]
The gether_gmii_mux[] array contains the REF125CK pin mark, but the gether_gmii_pins[] array lacks the corresponding pin number.
--- drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-r8a7740.c +1 -1
@@ -1983,7 +1983,7 @@ static const unsigned int gether_gmii_pins[] = {*/ 185 ,186 ,187 ,188 ,189 ,190 ,191 ,192 ,174 ,161 ,204 ,171 ,170 ,169 ,168 ,167 ,166 ,173 ,172 ,176 ,184 ,183 ,203 , - 205, 163, 206, 207, + 205, 163, 206, 207, 158, };static const unsigned int gether_gmii_mux[] = { ET_ERXD0_MARK, ET_ERXD1_MARK, ET_ERXD2_MARK, ET_ERXD3_MARK,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/183 pinctrl: sh-pfc: r8a7740: Add missing LCD0 marks to lcd0_data24_1 group
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 96bb2a6ab4eca10e5b6490b3f0738e9f7ec22c2b ]
The lcd0_data24_1_pins[] array contains the LCD0 D1[2-5] pin numbers, but the lcd0_data24_1_mux[] array lacks the corresponding pin marks.
--- drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/sh-pfc/pfc-r8a7740.c +1 -0
@@ -2155,6 +2155,7 @@ static const unsigned int lcd0_data24_1_mux[] = {LCD0_D0_MARK ,LCD0_D1_MARK ,LCD0_D2_MARK ,LCD0_D3_MARK ,LCD0_D4_MARK ,LCD0_D5_MARK ,LCD0_D6_MARK ,LCD0_D7_MARK ,LCD0_D8_MARK ,LCD0_D9_MARK ,LCD0_D10_MARK ,LCD0_D11_MARK , +LCD0_D12_MARK ,LCD0_D13_MARK ,LCD0_D14_MARK ,LCD0_D15_MARK ,LCD0_D16_MARK ,LCD0_D17_MARK ,LCD0_D18_PORT163_MARK ,LCD0_D19_PORT162_MARK ,LCD0_D20_PORT161_MARK ,LCD0_D21_PORT158_MARK , LCD0_D22_PORT160_MARK, LCD0_D23_PORT159_MARK,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/183 pinctrl: sh-pfc: r8a7791: Remove bogus ctrl marks from qspi_data4_b group
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 884fa25fb6e5e63ab970d612a628313bb68f37cc ]
The qspi_data4_b_mux[] array contains pin marks for the clock and chip select pins. The qspi_data4_b_pins[] array rightfully does not contain the corresponding pin numbers, as the control pins are provided by a separate group (qspi_ctrl_b).
--- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a7791.c +1 -2
@@ -3059,8 +3059,7 @@ static const unsigned int qspi_data4_b_pins[] = { RCAR_GP_PIN(6, 4), };static const unsigned int qspi_data4_b_mux[] = { -SPCLK_B_MARK ,MOSI_IO0_B_MARK ,MISO_IO1_B_MARK , -IO2_B_MARK ,IO3_B_MARK ,SSL_B_MARK , +MOSI_IO0_B_MARK ,MISO_IO1_B_MARK ,IO2_B_MARK ,IO3_B_MARK , };/* - SCIF0 ------------------------------------------------------------------ */ static const unsigned int scif0_data_pins[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/183 pinctrl: sh-pfc: r8a7791: Remove bogus marks from vin1_b_data18 group
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0d6256cb880166a4111bebce35790019e56b6e1b ]
The vin1_b_data18_mux[] arrays contains pin marks for the 2 LSB bits of the color components. The vin1_b_data18_pins[] array rightfully does not include the corresponding pin numbers, as RGB18 is subset of RGB24, containing only the 6 MSB bits of each component.
--- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 3 --- 1 file changed, 3 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a7791.c +0 -3
@@ -4170,17 +4170,14 @@ static const unsigned int vin1_b_data18_pins[] = { };static const unsigned int vin1_b_data18_mux[] = {/* B */ -VI1_DATA0_B_MARK ,VI1_DATA1_B_MARK ,VI1_DATA2_B_MARK ,VI1_DATA3_B_MARK ,VI1_DATA4_B_MARK ,VI1_DATA5_B_MARK ,VI1_DATA6_B_MARK ,VI1_DATA7_B_MARK ,/* G */ -VI1_G0_B_MARK ,VI1_G1_B_MARK ,VI1_G2_B_MARK ,VI1_G3_B_MARK ,VI1_G4_B_MARK ,VI1_G5_B_MARK ,VI1_G6_B_MARK ,VI1_G7_B_MARK ,/* R */ -VI1_R0_B_MARK ,VI1_R1_B_MARK ,VI1_R2_B_MARK ,VI1_R3_B_MARK ,VI1_R4_B_MARK ,VI1_R5_B_MARK ,VI1_R6_B_MARK ,VI1_R7_B_MARK ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/183 pinctrl: sh-pfc: sh73a0: Add missing TO pin to tpu4_to3 group
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 124cde98f856b6206b804acbdec3b7c80f8c3427 ]
The tpu4_to3_mux[] array contains the TPU4TO3 pin mark, but the tpu4_to3_pins[] array lacks the corresponding pin number.
Add the missing pin number, for non-GPIO pin F26.
--- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/sh-pfc/pfc-sh73a0.c +1 -0
@@ -2672,6 +2672,7 @@ static const unsigned int tpu4_to2_mux[] = { };static const unsigned int tpu4_to3_pins[] = {/* TO */ +PIN_NUMBER (6 ,26 ), };static const unsigned int tpu4_to3_mux[] = {TPU4TO3_MARK ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/183 pinctrl: sh-pfc: r8a7794: Remove bogus IPSR9 field
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 6a6c195d98a1a5e70faa87f594d7564af1dd1bed ]
The Peripheral Function Select Register 9 contains 12 fields, but the variable field descriptor contains a 13th bogus field of 3 bits.
--- drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-r8a7794.c +1 -1
@@ -4046,7 +4046,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { FN_AVB_MDC, FN_SSI_SDATA6_B, 0, 0, } }, { PINMUX_CFG_REG_VAR("IPSR9", 0xE6060044, 32, - 1, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3) { + 1, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3) {/* IP9_31 [1] */ 0, 0,/* IP9_30_28 [3] */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/183 pinctrl: sh-pfc: sh7734: Add missing IPSR11 field
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 94482af7055e1ffa211c1135256b85590ebcac99 ]
The Peripheral Function Select Register 11 contains 3 reserved bits and 15 variable-width fields, but the variable field descriptor does not contain the 3-bit field IP11[25:23].
--- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-sh7734.c +1 -1
@@ -2242,7 +2242,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { FN_LCD_DATA15_B, 0, 0, 0 } }, {PINMUX_CFG_REG_VAR ("IPSR11" ,0xFFFC0048 ,32 , - 3, 1, 2, 2, 2, 3, 3, 1, 2, 3, 3, 1, 1, 1, 1) { + 3, 1, 2, 3, 2, 2, 3, 3, 1, 2, 3, 3, 1, 1, 1, 1) {/* IP11_31_29 [3] */ 0, 0, 0, 0, 0, 0, 0, 0,/* IP11_28 [1] */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/183 pinctrl: sh-pfc: sh7269: Add missing PCIOR0 field
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 9540cbdfcd861caf67a6f0e4bb7f46d41c4aad86 ]
The Port C I/O Register 0 contains 7 reserved bits, but the descriptor contains only dummy configuration values for 6 reserved bits, thus breaking the configuration of all subsequent fields in the register.
Fix this by adding the two missing configuration values.
--- drivers/pinctrl/sh-pfc/pfc-sh7269.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-sh7269.c +1 -1
@@ -2119,7 +2119,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { }, { PINMUX_CFG_REG("PCIOR0", 0xfffe3852, 16, 1) { -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 ,PC8_IN ,PC8_OUT ,PC7_IN ,PC7_OUT , PC6_IN, PC6_OUT,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/183 pinctrl: sh-pfc: sh7734: Remove bogus IPSR10 value
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 4d374bacd7c9665179f9752a52d5d602c45d8190 ]
The IP10[5:3] field in Peripheral Function Select Register 10 has a width of 3 bits, i.e. it allows programming one out of 8 different configurations.
However, 9 values are provided instead of 8, overflowing into the subsequent field in the register, and thus breaking the configuration of the latter.
Fix this by dropping a bogus zero value.
--- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-sh7734.c +1 -1
@@ -2236,7 +2236,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {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 , +FN_LCD_DON_B ,0 ,0 ,/* IP10_2_0 [3] */ FN_SSI_SCK23 ,FN_VI1_4_B ,FN_RX1_D ,FN_FCLE_B , FN_LCD_DATA15_B, 0, 0, 0 }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/183 Input: nomadik-ske-keypad - fix a loop timeout test
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4d8f727b83bcd6702c2d210330872c9122d2d360 ]
The loop exits with "timeout" set to -1 not to 0.
--- drivers/input/keyboard/nomadik-ske-keypad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/keyboard/nomadik-ske-keypad.c +1 -1
@@ -100,7 +100,7 @@ static int __init ske_keypad_chip_init(struct ske_keypad *keypad)while ((readl (keypad->reg_base +SKE_RIS ) !=0x00000000 ) && timeout--)cpu_relax (); -if (!timeout) +if (timeout ==-1 )return -EINVAL ;/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/183 clk: highbank: fix refcount leak in hb_clk_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 5eb8ba90958de1285120dae5d3a5d2b1a360b3b4 ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/clk-highbank.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk-highbank.c +1 -0
@@ -294,6 +294,7 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk/* Map system registers */ srnp =of_find_compatible_node (NULL ,NULL ,"calxeda,hb-sregs" ); hb_clk->reg =of_iomap (srnp,0 ); +of_node_put (srnp);BUG_ON (!hb_clk->reg); hb_clk->reg += reg;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/183 clk: socfpga: fix refcount leak
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 7f9705beeb3759e69165e7aff588f6488ff6c1ac ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/socfpga/clk-pll-a10.c | 1 + drivers/clk/socfpga/clk-pll.c | 1 + 2 files changed, 2 insertions(+)
drivers/clk/socfpga/clk-pll-a10.c +1 -0
@@ -95,6 +95,7 @@ static struct __init clk * __socfpga_pll_init(struct device_node *node, clkmgr_np =of_find_compatible_node (NULL ,NULL ,"altr,clk-mgr" ); clk_mgr_a10_base_addr =of_iomap (clkmgr_np,0 ); +of_node_put (clkmgr_np);BUG_ON (!clk_mgr_a10_base_addr); pll_clk->hw.reg = clk_mgr_a10_base_addr + reg;
drivers/clk/socfpga/clk-pll.c +1 -0
@@ -100,6 +100,7 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node, clkmgr_np =of_find_compatible_node (NULL ,NULL ,"altr,clk-mgr" ); clk_mgr_base_addr =of_iomap (clkmgr_np,0 ); +of_node_put (clkmgr_np);BUG_ON (!clk_mgr_base_addr); pll_clk->hw.reg = clk_mgr_base_addr + reg;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/183 clk: samsung: exynos4: fix refcount leak in exynos4_get_xom()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit cee82eb9532090cd1dc953e845d71f9b1445c84e ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/samsung/clk-exynos4.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/samsung/clk-exynos4.c +1 -0
@@ -1224,6 +1224,7 @@ static unsigned long exynos4_get_xom(void) xom =readl (chipid_base +8 );iounmap (chipid_base); +of_node_put (np); }return xom;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/183 clk: imx6q: fix refcount leak in imx6q_clocks_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit c9ec1d8fef31b5fc9e90e99f9bd685db5caa7c5e ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/imx/clk-imx6q.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/imx/clk-imx6q.c +1 -0
@@ -155,6 +155,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) np =of_find_compatible_node (NULL ,NULL ,"fsl,imx6q-anatop" ); base =of_iomap (np,0 );WARN_ON (!base); +of_node_put (np);/* Audio/video PLL post dividers do not work on i.MX6q revision 1.0 */ if (clk_on_imx6q () &&imx_get_soc_revision () ==IMX_CHIP_REVISION_1_0 ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/183 clk: imx7d: fix refcount leak in imx7d_clocks_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 5f8c183a996b76bb09748073c856e4246fd4ce95 ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/imx/clk-imx7d.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/imx/clk-imx7d.c +1 -0
@@ -386,6 +386,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) np =of_find_compatible_node (NULL ,NULL ,"fsl,imx7d-anatop" ); base =of_iomap (np,0 );WARN_ON (!base); +of_node_put (np); clks[IMX7D_PLL_ARM_MAIN_SRC ] =imx_clk_mux ("pll_arm_main_src" , base +0x60 ,14 ,2 , pll_bypass_src_sel,ARRAY_SIZE (pll_bypass_src_sel)); clks[IMX7D_PLL_DRAM_MAIN_SRC ] =imx_clk_mux ("pll_dram_main_src" , base +0x70 ,14 ,2 , pll_bypass_src_sel,ARRAY_SIZE (pll_bypass_src_sel));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/183 clk: imx6sx: fix refcount leak in imx6sx_clocks_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 1731e14fb30212dd8c1e9f8fc1af061e56498c55 ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/imx/clk-imx6sx.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/imx/clk-imx6sx.c +1 -0
@@ -162,6 +162,7 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) np =of_find_compatible_node (NULL ,NULL ,"fsl,imx6sx-anatop" ); base =of_iomap (np,0 );WARN_ON (!base); +of_node_put (np); clks[IMX6SX_PLL1_BYPASS_SRC ] =imx_clk_mux ("pll1_bypass_src" , base +0x00 ,14 ,1 , pll_bypass_src_sels,ARRAY_SIZE (pll_bypass_src_sels)); clks[IMX6SX_PLL2_BYPASS_SRC ] =imx_clk_mux ("pll2_bypass_src" , base +0x30 ,14 ,1 , pll_bypass_src_sels,ARRAY_SIZE (pll_bypass_src_sels));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/183 clk: armada-370: fix refcount leak in a370_clk_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit a3c24050bdf70c958a8d98c2823b66ea761e6a31 ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/mvebu/armada-370.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clk/mvebu/armada-370.c +3 -1
@@ -177,8 +177,10 @@ static void __init a370_clk_init(struct device_node *np)mvebu_coreclk_setup (np, &a370_coreclks); -if (cgnp) +if (cgnp) {mvebu_clk_gating_setup (cgnp, a370_gating_desc); +of_node_put (cgnp); + } }CLK_OF_DECLARE (a370_clk,"marvell,armada-370-core-clock" , a370_clk_init);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/183 mt7601u: fix bbp version check in mt7601u_wait_bbp_ready
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
commit 15e14f76f85f4f0eab3b8146e1cd3c58ce272823 upstream.
Fix bbp ready check in mt7601u_wait_bbp_ready. The issue is reported by coverity with the following error:
Logical vs. bitwise operator
The expression's value does not depend on the operands; inadvertent use of the wrong operator is a likely logic error.
Addresses-Coverity-ID: 1309441 ("Logical vs. bitwise operator")
--- drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt7601u/phy.c +1 -1
@@ -219,7 +219,7 @@ int mt7601u_wait_bbp_ready(struct mt7601do { val =mt7601u_bbp_rr (dev,MT_BBP_REG_VERSION ); -if (val && ~val) +if (val && val !=0xff )break ; }while (--i);
Greg Kroah-Hartman
maintainerPATCH 30/183 clk: kirkwood: fix refcount leak in kirkwood_clk_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit e7beeab9c61591cd0e690d8733d534c3f4278ff8 ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/mvebu/kirkwood.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/mvebu/kirkwood.c +2 -0
@@ -335,6 +335,8 @@ static void __init kirkwood_clk_init(struct device_node *np)if (cgnp) {mvebu_clk_gating_setup (cgnp, kirkwood_gating_desc);kirkwood_clk_muxing_setup (cgnp, kirkwood_mux_desc); + +of_node_put (cgnp); } } CLK_OF_DECLARE(kirkwood_clk, "marvell,kirkwood-core-clock",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/183 drm/virtio: fix bounds check in virtio_gpu_cmd_get_capset()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 09c4b49457434fa74749ad6194ef28464d9f5df9 ]
This doesn't affect runtime because in the current code "idx" is always valid.
First, we read from "vgdev->capsets[idx].max_size" before checking whether "idx" is within bounds. And secondly the bounds check is off by one so we could end up reading one element beyond the end of the vgdev->capsets[] array.
--- drivers/gpu/drm/virtio/virtgpu_vq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/virtio/virtgpu_vq.c +3 -2
@@ -681,11 +681,11 @@ int virtio_gpu_cmd_get_capset(struct virtio_gpu_device *vgdev, {struct virtio_gpu_get_capset *cmd_p;struct virtio_gpu_vbuffer *vbuf; -int max_size = vgdev->capsets[idx].max_size; +int max_size;struct virtio_gpu_drv_cap_cache *cache_ent;void *resp_buf; -if (idx > vgdev->num_capsets) +if (idx >= vgdev->num_capsets)return -EINVAL ;if (version > vgdev->capsets[idx].max_version)
@@ -695,6 +695,7 @@ int virtio_gpu_cmd_get_capset(struct virtio_gpu_device *vgdev,if (!cache_ent)return -ENOMEM ; + max_size = vgdev->capsets[idx].max_size; cache_ent->caps_cache =kmalloc (max_size,GFP_KERNEL );if (!cache_ent->caps_cache) {kfree (cache_ent);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 6/183 ALSA: usb-audio: update quirk for B&W PX to remove microphone
In reply to Greg Kroah-HartmanFrom: Nicolas Huaman <[email protected]>
[ Upstream commit c369c8db15d51fa175d2ba85928f79d16af6b562 ]
A quirk in snd-usb-audio was added to automate setting sample rate to 4800k and remove the previously exposed nonfunctional microphone for the Bowers & Wilkins PX:
commit 240a8af929c7c57dcde28682725b29cf8474e8e5
https://lore.kernel.org/patchwork/patch/919689/
However the headphones where updated shortly after that to remove the unintentional microphone functionality. I guess because of this the headphones now crash when connecting them via USB while the quirk is active. Dmesg:
snd-usb-audio: probe of 2-3:1.0 failed with error -22 usb 2-3: 2:1: cannot get min/max values for control 2 (id 2)
This patch removes the microfone and allows the headphones to connect and work out of the box. It is based on the current mainline kernel
and successfully applied an tested on my machine (4.18.10.arch1-1).
--- sound/usb/quirks-table.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
sound/usb/quirks-table.h +2 -7
@@ -3293,19 +3293,14 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), .ifnum = 0, .type = QUIRK_AUDIO_STANDARD_MIXER, }, - /* Capture */ - { - .ifnum = 1, - .type = QUIRK_IGNORE_INTERFACE, - },/* Playback */ { - .ifnum = 2, + .ifnum = 1, .type = QUIRK_AUDIO_FIXED_ENDPOINT, .data = &(const struct audioformat) { .formats = SNDRV_PCM_FMTBIT_S16_LE, .channels = 2, - .iface = 2, + .iface = 1, .altsetting = 1, .altset_idx = 1, .attributes = UAC_EP_CS_ATTR_FILL_MAX |
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 7/183 staging: comedi: ni_mio_common: protect register write overflow
In reply to Greg Kroah-HartmanFrom: Spencer E. Olson <[email protected]>
[ Upstream commit 1cbca5852d6c16e85a21487a15d211195aacd4a1 ]
Fixes two problems introduced as early as
commit 03aef4b6dc12 ("Staging: comedi: add ni_mio_common code"):
(1) Ensures that the last four bits of NISTC_RTSI_TRIGB_OUT_REG register is not unduly overwritten on e-series devices. On e-series devices, the first three of the last four bits are reserved. The last bit defines the output selection of the RGOUT0 pin, otherwise known as RTSI_Sub_Selection. For m-series devices, these last four bits are indeed used as the output selection of the RTSI7 pin (and the RTSI_Sub_Selection bit for the RGOUT0 pin is moved to the RTSI_Trig_Direction register.
(2) Allows all 4 RTSI_BRD lines to be treated as valid sources for RTSI lines.
This patch also cleans up the ni_get_rtsi_routing command for readability.
--- .../staging/comedi/drivers/ni_mio_common.c | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/staging/comedi/drivers/ni_mio_common.c +17 -7
@@ -4809,7 +4809,10 @@ static int ni_valid_rtsi_output_source(struct comedi_device *dev,case NI_RTSI_OUTPUT_G_SRC0 :case NI_RTSI_OUTPUT_G_GATE0 :case NI_RTSI_OUTPUT_RGOUT0 : -case NI_RTSI_OUTPUT_RTSI_BRD_0 : +case NI_RTSI_OUTPUT_RTSI_BRD (0 ): +case NI_RTSI_OUTPUT_RTSI_BRD (1 ): +case NI_RTSI_OUTPUT_RTSI_BRD (2 ): +case NI_RTSI_OUTPUT_RTSI_BRD (3 ):return 1 ;case NI_RTSI_OUTPUT_RTSI_OSC :return (devpriv->is_m_series) ?1 :0 ;
@@ -4830,11 +4833,18 @@ static int ni_set_rtsi_routing(struct comedi_device *dev, devpriv->rtsi_trig_a_output_reg |=NISTC_RTSI_TRIG (chan, src);ni_stc_writew (dev, devpriv->rtsi_trig_a_output_reg,NISTC_RTSI_TRIGA_OUT_REG ); - }else if (chan <8 ) { + }else if (chan <NISTC_RTSI_TRIG_NUM_CHAN (devpriv->is_m_series)) { devpriv->rtsi_trig_b_output_reg &= ~NISTC_RTSI_TRIG_MASK (chan); devpriv->rtsi_trig_b_output_reg |=NISTC_RTSI_TRIG (chan, src);ni_stc_writew (dev, devpriv->rtsi_trig_b_output_reg,NISTC_RTSI_TRIGB_OUT_REG ); + }else if (chan !=NISTC_RTSI_TRIG_OLD_CLK_CHAN ) { +/* probably should never reach this, since the +* ni_valid_rtsi_output_source above errors out if chan is too +* high +*/ +dev_err (dev->class_dev,"%s: unknown rtsi channel\n" , __func__); +return -EINVAL ; }return 2 ; }
@@ -4849,12 +4859,12 @@ static unsigned ni_get_rtsi_routing(struct comedi_device *dev, unsigned chan) }else if (chan <NISTC_RTSI_TRIG_NUM_CHAN (devpriv->is_m_series)) {return NISTC_RTSI_TRIG_TO_SRC (chan, devpriv->rtsi_trig_b_output_reg); - }else { -if (chan ==NISTC_RTSI_TRIG_OLD_CLK_CHAN ) -return NI_RTSI_OUTPUT_RTSI_OSC ; -dev_err (dev->class_dev,"bug! should never get here?\n" ); -return 0 ; + }else if (chan ==NISTC_RTSI_TRIG_OLD_CLK_CHAN ) { +return NI_RTSI_OUTPUT_RTSI_OSC ; } + +dev_err (dev->class_dev,"%s: unknown rtsi channel\n" , __func__); +return -EINVAL ; } static int ni_rtsi_insn_config(struct comedi_device *dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/183 exportfs: fix passing zero to ERR_PTR() warning
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 909e22e05353a783c526829427e9a8de122fba9c ]
Fix a static code checker warning:
fs/exportfs/expfs.c:171 reconnect_one() warn: passing zero to 'ERR_PTR'
The error path for lookup_one_len_unlocked failure should set err to PTR_ERR.
--- fs/exportfs/expfs.c | 1 + 1 file changed, 1 insertion(+)
fs/exportfs/expfs.c +1 -0
@@ -148,6 +148,7 @@ static struct dentry *reconnect_one(struct vfsmount *mnt,mutex_unlock (&parent->d_inode->i_mutex);if (IS_ERR (tmp)) {dprintk ("%s: lookup failed: %d\n" , __func__,PTR_ERR (tmp)); + err =PTR_ERR (tmp); goto out_err; }if (tmp != dentry) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 4.4.212-stable review
This is the start of the stable review cycle for the 4.4.212 release. There are 183 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 Thu, 30 Jan 2020 13:57:09 +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.4.212-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.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.4.212-rc1
Wen Huang <[email protected]>
libertas: Fix two buffer overflows at parsing bss descriptor
Martin Schiller <[email protected]>
net/x25: fix nonblocking connect
Kadlecsik József <[email protected]>
netfilter: ipset: use bitmap infrastructure completely
Andy Shevchenko <[email protected]>
bitmap: Add bitmap_alloc(), bitmap_zalloc() and bitmap_free()
Andy Shevchenko <[email protected]>
md: Avoid namespace collision with bitmap API
Bo Wu <[email protected]>
scsi: iscsi: Avoid potential deadlock in iscsi_if_rx func
Lars Möllendorf <[email protected]>
iio: buffer: align the size of scan bytes to size of the largest element
Al Viro <[email protected]>
do_last(): fetch directory ->i_mode and ->i_uid before it's too late
Changbin Du <[email protected]>
tracing: xen: Ordered comparison of function pointers
Bart Van Assche <[email protected]>
scsi: RDMA/isert: Fix a recently introduced regression related to logout
Gilles Buloz <[email protected]>
hwmon: (nct7802) Fix voltage limits to wrong registers
Johan Hovold <[email protected]>
Input: aiptek - fix endpoint sanity check
Johan Hovold <[email protected]>
Input: gtco - fix endpoint sanity check
Johan Hovold <[email protected]>
Input: sur40 - fix interface sanity checks
Michał Mirosław <[email protected]>
mmc: sdhci: fix minimum clock rate for v3 controller
Alex Sverdlin <[email protected]>
ARM: 8950/1: ftrace/recordmcount: filter relocation types
Johan Hovold <[email protected]>
Input: keyspan-remote - fix control-message timeouts
Luuk Paulussen <[email protected]>
hwmon: (adt7475) Make volt2reg return same reg as reg2volt input
James Hughes <[email protected]>
net: usb: lan78xx: Add .ndo_features_check
Cong Wang <[email protected]>
net_sched: fix datalen for ematch
William Dauchy <[email protected]>
net, ip_tunnel: fix namespaces move
Michael Ellerman <[email protected]>
net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM
Wenwen Wang <[email protected]>
firestream: fix memory leaks
Richard Palethorpe <[email protected]>
can, slip: Protect tty->disc_data in write_wakeup and close with RCU
Finn Thain <[email protected]>
m68k: Call timer_interrupt() with interrupts disabled
Andre Przywara <[email protected]>
arm64: dts: juno: Fix UART frequency
Sam Bobroff <[email protected]>
drm/radeon: fix bad DMA from INTERRUPT_CNTL2
Chuhong Yuan <[email protected]>
dmaengine: ti: edma: fix missed failure handling
Eric Dumazet <[email protected]>
packet: fix data-race in fanout_flow_is_huge()
Eric Dumazet <[email protected]>
net: neigh: use long type to store jiffies delta
Tiezhu Yang <[email protected]>
MIPS: Loongson: Fix return value of loongson_hwmon_init
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix .get_fmt() V4L2_SUBDEV_FORMAT_TRY support
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix some format attributes not under control
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix incorrect use of JPEG colorspace
Stefan Wahren <[email protected]>
net: qca_spi: Move reset_count to struct qcaspi
Robin Gong <[email protected]>
dmaengine: imx-sdma: fix size check for sdma script_number
Jeffrey Hugo <[email protected]>
drm/msm/dsi: Implement reset correctly
Antonio Borneo <[email protected]>
net: stmmac: fix length of PTP clock's name string
Eric Biggers <[email protected]>
llc: fix sk_buff refcounting in llc_conn_state_process()
Eric Biggers <[email protected]>
llc: fix another potential sk_buff leak in llc_ui_sendmsg()
Johannes Berg <[email protected]>
mac80211: accept deauth frames in IBSS mode
Dan Carpenter <[email protected]>
net: ethernet: stmmac: Fix signedness bug in ipq806x_gmac_of_parse()
Dan Carpenter <[email protected]>
net: broadcom/bcmsysport: Fix signedness in bcm_sysport_probe()
Dan Carpenter <[email protected]>
net: hisilicon: Fix signedness bug in hix5hd2_dev_probe()
Filippo Sironi <[email protected]>
iommu/amd: Wait for completion of IOTLB flush in attach_device
Gerd Rausch <[email protected]>
net/rds: Fix 'ib_evt_handler_call' element in 'rds_ib_stat_names'
Mao Wenan <[email protected]>
net: sonic: replace dev_kfree_skb in sonic_send_packet
Dan Robertson <[email protected]>
hwmon: (shtc1) fix shtc1 and shtw1 id mask
Filipe Manana <[email protected]>
Btrfs: fix hang when loading existing inode cache off disk
Mao Wenan <[email protected]>
net: sonic: return NETDEV_TX_OK if failed to map buffer
Lorenzo Bianconi <[email protected]>
ath9k: dynack: fix possible deadlock in ath_dynack_node_{de}init
Colin Ian King <[email protected]>
iio: dac: ad5380: fix incorrect assignment to val
Colin Ian King <[email protected]>
bcma: fix incorrect update of BCMA_CORE_PCI_MDIO_DATA
Masami Hiramatsu <[email protected]>
x86, perf: Fix the dependency of the x86 insn decoder selftest
Stephen Boyd <[email protected]>
power: supply: Init device wakeup after device_add()
Linus Torvalds <[email protected]>
Partially revert "kfifo: fix kfifo_alloc() and kfifo_init()"
Andy Shevchenko <[email protected]>
ahci: Do not export local variable ahci_em_messages
Nick Desaulniers <[email protected]>
mips: avoid explicit UB in assignment of mips_io_port_base
Felix Fietkau <[email protected]>
mac80211: minstrel_ht: fix per-group max throughput rate initialization
Andy Shevchenko <[email protected]>
dmaengine: dw: platform: Switch to acpi_dma_controller_register()
Eric W. Biederman <[email protected]>
signal: Allow cifs and drbd to receive their terminating signals
YueHaibing <[email protected]>
ASoC: wm8737: Fix copy-paste error in wm8737_snd_controls
YueHaibing <[email protected]>
ASoC: cs4349: Use PM ops 'cs4349_runtime_pm'
YueHaibing <[email protected]>
ASoC: es8328: Fix copy-paste error in es8328_right_line_controls
Colin Ian King <[email protected]>
ext4: set error return correctly when ext4_htree_store_dirent fails
Iuliana Prodan <[email protected]>
crypto: caam - free resources in case caam_rng registration failed
Steve French <[email protected]>
cifs: fix rmmod regression in cifs.ko caused by force_sig changes
Johannes Berg <[email protected]>
ALSA: aoa: onyx: always initialize register read value
Thomas Gleixner <[email protected]>
x86/kgbd: Use NMI_VECTOR not APIC_DM_NMI
Arnd Bergmann <[email protected]>
mic: avoid statically declaring a 'struct device'.
Ruslan Bilovol <[email protected]>
usb: host: xhci-hub: fix extra endianness conversion
YueHaibing <[email protected]>
libertas_tf: Use correct channel range in lbtf_geo_init
Colin Ian King <[email protected]>
scsi: libfc: fix null pointer dereference on a null lport
Wen Yang <[email protected]>
net: pasemi: fix an use-after-free in pasemi_mac_phy_init()
Arnd Bergmann <[email protected]>
devres: allow const resource arguments
Andy Shevchenko <[email protected]>
mfd: intel-lpss: Release IDA resources
Kevin Mitchell <[email protected]>
iommu/amd: Make iommu_disable safer
Rob Clark <[email protected]>
drm/msm/a3xx: remove TPL1 regs from snapshot
Chen-Yu Tsai <[email protected]>
rtc: pcf8563: Clear event flags and disable interrupts before requesting irq
Peter Ujfalusi <[email protected]>
ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs
Julian Wiedmann <[email protected]>
net/af_iucv: always register net_device notifier
Jeffrey Hugo <[email protected]>
drm/msm/mdp5: Fix mdp5_cfg_init error return
Nathan Lynch <[email protected]>
powerpc/cacheinfo: add cacheinfo_teardown, cacheinfo_rebuild
Colin Ian King <[email protected]>
media: vivid: fix incorrect assignment operation when setting video mode
Eric Dumazet <[email protected]>
inet: frags: call inet_frags_fini() after unregister_pernet_subsys()
Eric W. Biederman <[email protected]>
signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig
Lu Baolu <[email protected]>
iommu: Use right function to get group for device
Nathan Chancellor <[email protected]>
misc: sgi-xp: Properly initialize buf in xpc_get_rsvd_page_pa
Christophe Leroy <[email protected]>
spi: spi-fsl-spi: call spi_finalize_current_message() at the end
Matthias Kaehlcke <[email protected]>
thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power
Brian Masney <[email protected]>
backlight: lm3630a: Return 0 on success in update_status functions
Dan Carpenter <[email protected]>
kdb: do a sanity check on the cpu in kdb_per_cpu()
Russell King <[email protected]>
ARM: riscpc: fix lack of keyboard interrupts after irq conversion
Florian Westphal <[email protected]>
netfilter: ebtables: CONFIG_COMPAT: reject trailing data after last rule
Dan Carpenter <[email protected]>
platform/x86: alienware-wmi: printing the wrong error code
Dan Carpenter <[email protected]>
media: davinci/vpbe: array underflow in vpbe_enum_outputs()
Dan Carpenter <[email protected]>
media: omap_vout: potential buffer overflow in vidioc_dqbuf()
Lu Baolu <[email protected]>
iommu/vt-d: Make kernel parameter igfx_off work with vIOMMU
Jack Morgenstein <[email protected]>
IB/mlx5: Add missing XRC options to QP optional params mask
Jerome Brunet <[email protected]>
ASoC: fix valid stream condition
Willem de Bruijn <[email protected]>
packet: in recvmsg msg_name return at least sizeof sockaddr_ll
Takashi Iwai <[email protected]>
ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk()
Alexandru Ardelean <[email protected]>
dmaengine: axi-dmac: Don't check the number of frames for alignment
Dan Carpenter <[email protected]>
6lowpan: Off by one handling ->nexthdr
Akinobu Mita <[email protected]>
media: ov2659: fix unbalanced mutex_lock/unlock
Ben Hutchings <[email protected]>
powerpc: vdso: Make vdso32 installation conditional in vdso_install
Jie Liu <[email protected]>
tipc: set sysctl_tipc_rmem and named_timeout right range
Guenter Roeck <[email protected]>
hwmon: (w83627hf) Use request_muxed_region for Super-IO accesses
YueHaibing <[email protected]>
ARM: pxa: ssp: Fix "WARNING: invalid free of devm_ allocated data"
Bart Van Assche <[email protected]>
scsi: qla2xxx: Unregister chrdev if module initialization fails
YueHaibing <[email protected]>
ehea: Fix a copy-paste err in ehea_init_port_res
Martin Sperl <[email protected]>
spi: bcm2835aux: fix driver to not allow 65535 (=-1) cs-gpios
Dan Carpenter <[email protected]>
soc/fsl/qe: Fix an error code in qe_pin_request()
Sowjanya Komatineni <[email protected]>
spi: tegra114: fix for unpacked mode transfers
Sowjanya Komatineni <[email protected]>
spi: tegra114: clear packed bit for unpacked mode
Arnd Bergmann <[email protected]>
media: davinci-isif: avoid uninitialized variable use
Tony Lindgren <[email protected]>
ARM: OMAP2+: Fix potentially uninitialized return value for _setup_reset()
Finn Thain <[email protected]>
m68k: mac: Fix VIA timer counter accesses
Arnd Bergmann <[email protected]>
jfs: fix bogus variable self-initialization
Nicholas Mc Guire <[email protected]>
media: cx23885: check allocation return
Dan Carpenter <[email protected]>
media: wl128x: Fix an error code in fm_download_firmware()
Dan Carpenter <[email protected]>
media: cx18: update *pos correctly in cx18_read_pos()
Dan Carpenter <[email protected]>
media: ivtv: update *pos correctly in ivtv_read_pos()
Kangjie Lu <[email protected]>
net: sh_eth: fix a missing check of of_get_phy_mode
Dan Carpenter <[email protected]>
xen, cpu_hotplug: Prevent an out of bounds access
Steve Sistare <[email protected]>
scsi: megaraid_sas: reduce module load time
Guenter Roeck <[email protected]>
nios2: ksyms: Add missing symbol exports
Axel Lin <[email protected]>
regulator: wm831x-dcdc: Fix list of wm831x_dcdc_ilim from mA to uA
Marek Szyprowski <[email protected]>
ARM: 8847/1: pm: fix HYP/SVC mode mismatch when MCPM is used
Chen-Yu Tsai <[email protected]>
clocksource/drivers/sun5i: Fail gracefully when clock rate is unavailable
Eric W. Biederman <[email protected]>
fs/nfs: Fix nfs_parse_devname to not modify it's argument
Takashi Iwai <[email protected]>
ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()
Colin Ian King <[email protected]>
drm/nouveau/pmu: don't print reply values if exec is false
Colin Ian King <[email protected]>
drm/nouveau/bios/ramcfg: fix missing parentheses when calculating RON
YueHaibing <[email protected]>
cdc-wdm: pass return value of recover_from_urb_loss
Eric Auger <[email protected]>
vfio_pci: Enable memory accesses before calling pci_map_rom
Ming Lei <[email protected]>
block: don't use bio->bi_vcnt to figure out segment number
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh73a0: Fix fsic_spdif pin groups
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: r8a7791: Fix scifb2_data_c pin group
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: emev2: Add missing pinmux functions
YueHaibing <[email protected]>
fbdev: chipsfb: remove set but not used variable 'size'
Colin Ian King <[email protected]>
rtc: pm8xxx: fix unintended sign extension
Colin Ian King <[email protected]>
rtc: 88pm80x: fix unintended sign extension
Colin Ian King <[email protected]>
rtc: 88pm860x: fix unintended sign extension
Colin Ian King <[email protected]>
rtc: ds1672: fix unintended sign extension
YueHaibing <[email protected]>
tty: ipwireless: Fix potential NULL pointer dereference
Eric Wong <[email protected]>
rtc: cmos: ignore bogus century byte
Stefan Agner <[email protected]>
ASoC: imx-sgtl5000: put of nodes if finding codec fails
Eric Biggers <[email protected]>
crypto: tgr192 - fix unaligned memory access
Pawe? Chmiel <[email protected]>
media: s5p-jpeg: Correct step and max values for V4L2_CID_JPEG_RESTART_INTERVAL
Gal Pressman <[email protected]>
RDMA/ocrdma: Fix out of bounds index check in query pkey
Gal Pressman <[email protected]>
IB/usnic: Fix out of bounds index check in query pkey
Yangtao Li <[email protected]>
clk: armada-xp: fix refcount leak in axp_clk_init()
Yangtao Li <[email protected]>
clk: kirkwood: fix refcount leak in kirkwood_clk_init()
Yangtao Li <[email protected]>
clk: armada-370: fix refcount leak in a370_clk_init()
Yangtao Li <[email protected]>
clk: vf610: fix refcount leak in vf610_clocks_init()
Yangtao Li <[email protected]>
clk: imx7d: fix refcount leak in imx7d_clocks_init()
Yangtao Li <[email protected]>
clk: imx6sx: fix refcount leak in imx6sx_clocks_init()
Yangtao Li <[email protected]>
clk: imx6q: fix refcount leak in imx6q_clocks_init()
Yangtao Li <[email protected]>
clk: samsung: exynos4: fix refcount leak in exynos4_get_xom()
Yangtao Li <[email protected]>
clk: socfpga: fix refcount leak
Yangtao Li <[email protected]>
clk: qoriq: fix refcount leak in clockgen_init()
Yangtao Li <[email protected]>
clk: highbank: fix refcount leak in hb_clk_init()
Dan Carpenter <[email protected]>
Input: nomadik-ske-keypad - fix a loop timeout test
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7734: Remove bogus IPSR10 value
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7269: Add missing PCIOR0 field
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7734: Add missing IPSR11 field
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: r8a7794: Remove bogus IPSR9 field
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh73a0: Add missing TO pin to tpu4_to3 group
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: r8a7791: Remove bogus marks from vin1_b_data18 group
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: r8a7791: Remove bogus ctrl marks from qspi_data4_b group
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: r8a7740: Add missing LCD0 marks to lcd0_data24_1 group
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: r8a7740: Add missing REF125CK pin to gether_gmii group
Lyude Paul <[email protected]>
drm/dp_mst: Skip validating ports during destruction, just ref
YueHaibing <[email protected]>
exportfs: fix 'passing zero to ERR_PTR()' warning
Colin Ian King <[email protected]>
pcrypt: use format specifier in kobject_add
Spencer E. Olson <[email protected]>
staging: comedi: ni_mio_common: protect register write overflow
Nicolas Huaman <[email protected]>
ALSA: usb-audio: update quirk for B&W PX to remove microphone
Anders Roxell <[email protected]>
ALSA: hda: fix unused variable warning
Dan Carpenter <[email protected]>
drm/virtio: fix bounds check in virtio_gpu_cmd_get_capset()
Lorenzo Bianconi <[email protected]>
mt7601u: fix bbp version check in mt7601u_wait_bbp_ready
Ard Biesheuvel <[email protected]>
powerpc/archrandom: fix arch_get_random_seed_int()
Jan Kara <[email protected]>
xfs: Sanity check flags of Q_XQUOTARM call
-------------
Diffstat:
Makefile | 4 +- arch/arm/common/mcpm_entry.c | 2 +- arch/arm/include/asm/suspend.h | 1 + arch/arm/kernel/sleep.S | 12 +++ arch/arm/mach-omap2/omap_hwmod.c | 2 +- arch/arm/mach-rpc/irq.c | 3 +- arch/arm/plat-pxa/ssp.c | 6 -- arch/arm64/boot/dts/arm/juno-clocks.dtsi | 4 +- arch/m68k/amiga/cia.c | 9 ++ arch/m68k/atari/ataints.c | 4 +- arch/m68k/atari/time.c | 15 ++- arch/m68k/bvme6000/config.c | 20 ++-- arch/m68k/hp300/time.c | 10 +- arch/m68k/mac/via.c | 119 ++++++++++++--------- arch/m68k/mvme147/config.c | 18 ++-- arch/m68k/mvme16x/config.c | 21 ++-- arch/m68k/q40/q40ints.c | 19 ++-- arch/m68k/sun3/sun3ints.c | 3 + arch/m68k/sun3x/time.c | 16 +-- arch/mips/include/asm/io.h | 14 +-- arch/mips/kernel/setup.c | 2 +- arch/nios2/kernel/nios2_ksyms.c | 12 +++ arch/powerpc/Makefile | 2 + arch/powerpc/include/asm/archrandom.h | 2 +- arch/powerpc/kernel/cacheinfo.c | 21 ++++ arch/powerpc/kernel/cacheinfo.h | 4 + arch/powerpc/sysdev/qe_lib/gpio.c | 4 +- arch/x86/Kconfig.debug | 2 +- arch/x86/kernel/kgdb.c | 2 +- block/blk-merge.c | 8 +- crypto/pcrypt.c | 2 +- crypto/tgr192.c | 6 +- drivers/ata/libahci.c | 1 - drivers/atm/firestream.c | 3 + drivers/bcma/driver_pci.c | 4 +- drivers/block/drbd/drbd_main.c | 2 + drivers/clk/clk-highbank.c | 1 + drivers/clk/clk-qoriq.c | 1 + drivers/clk/imx/clk-imx6q.c | 1 + drivers/clk/imx/clk-imx6sx.c | 1 + drivers/clk/imx/clk-imx7d.c | 1 + drivers/clk/imx/clk-vf610.c | 1 + drivers/clk/mvebu/armada-370.c | 4 +- drivers/clk/mvebu/armada-xp.c | 4 +- drivers/clk/mvebu/kirkwood.c | 2 + drivers/clk/samsung/clk-exynos4.c | 1 + drivers/clk/socfpga/clk-pll-a10.c | 1 + drivers/clk/socfpga/clk-pll.c | 1 + drivers/clocksource/timer-sun5i.c | 10 ++ drivers/crypto/caam/caamrng.c | 5 +- drivers/dma/dma-axi-dmac.c | 2 +- drivers/dma/dw/platform.c | 14 ++- drivers/dma/edma.c | 6 +- drivers/dma/imx-sdma.c | 8 ++ drivers/gpu/drm/drm_dp_mst_topology.c | 15 ++- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 24 ++--- drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c | 4 +- drivers/gpu/drm/radeon/cik.c | 4 +- drivers/gpu/drm/radeon/r600.c | 4 +- drivers/gpu/drm/radeon/si.c | 4 +- drivers/gpu/drm/virtio/virtgpu_vq.c | 5 +- drivers/hwmon/adt7475.c | 5 +- drivers/hwmon/nct7802.c | 4 +- drivers/hwmon/shtc1.c | 2 +- drivers/hwmon/w83627hf.c | 42 +++++++- drivers/iio/dac/ad5380.c | 2 +- drivers/iio/industrialio-buffer.c | 6 +- drivers/infiniband/hw/mlx5/qp.c | 21 ++++ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- drivers/infiniband/ulp/isert/ib_isert.c | 12 --- drivers/input/keyboard/nomadik-ske-keypad.c | 2 +- drivers/input/misc/keyspan_remote.c | 9 +- drivers/input/tablet/aiptek.c | 6 +- drivers/input/tablet/gtco.c | 10 +- drivers/input/touchscreen/sur40.c | 2 +- drivers/iommu/amd_iommu.c | 2 + drivers/iommu/amd_iommu_init.c | 3 + drivers/iommu/intel-iommu.c | 5 +- drivers/iommu/iommu.c | 6 +- drivers/md/bitmap.c | 8 +- drivers/media/i2c/ov2659.c | 2 +- drivers/media/i2c/soc_camera/ov6650.c | 72 ++++++++----- drivers/media/pci/cx18/cx18-fileops.c | 2 +- drivers/media/pci/cx23885/cx23885-dvb.c | 5 +- drivers/media/pci/ivtv/ivtv-fileops.c | 2 +- drivers/media/platform/davinci/isif.c | 9 -- drivers/media/platform/davinci/vpbe.c | 2 +- drivers/media/platform/omap/omap_vout.c | 15 ++- drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +- drivers/media/platform/vivid/vivid-osd.c | 2 +- drivers/media/radio/wl128x/fmdrv_common.c | 5 +- drivers/mfd/intel-lpss.c | 1 + drivers/misc/mic/card/mic_x100.c | 28 +++-- drivers/misc/sgi-xp/xpc_partition.c | 2 +- drivers/mmc/host/sdhci.c | 10 +- drivers/net/can/slcan.c | 12 ++- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- drivers/net/ethernet/natsemi/sonic.c | 6 +- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- drivers/net/ethernet/qualcomm/qca_spi.c | 9 +- drivers/net/ethernet/qualcomm/qca_spi.h | 1 + drivers/net/ethernet/renesas/sh_eth.c | 6 +- .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- drivers/net/slip/slip.c | 12 ++- drivers/net/usb/lan78xx.c | 15 +++ drivers/net/wireless/ath/ath9k/dynack.c | 8 +- drivers/net/wireless/libertas/cfg.c | 16 ++- drivers/net/wireless/libertas_tf/cmd.c | 2 +- drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +- drivers/pinctrl/sh-pfc/pfc-emev2.c | 20 ++++ drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 3 +- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 8 +- drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 2 +- drivers/pinctrl/sh-pfc/pfc-sh7269.c | 2 +- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 4 +- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 4 +- drivers/platform/mips/cpu_hwmon.c | 2 +- drivers/platform/x86/alienware-wmi.c | 2 +- drivers/power/power_supply_core.c | 10 +- drivers/regulator/wm831x-dcdc.c | 4 +- drivers/rtc/rtc-88pm80x.c | 21 ++-- drivers/rtc/rtc-88pm860x.c | 21 ++-- drivers/rtc/rtc-ds1672.c | 3 +- drivers/rtc/rtc-pcf8563.c | 11 +- drivers/rtc/rtc-pm8xxx.c | 6 +- drivers/scsi/libfc/fc_exch.c | 2 +- drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- drivers/scsi/qla2xxx/qla_os.c | 34 +++--- drivers/scsi/scsi_transport_iscsi.c | 7 ++ drivers/spi/spi-bcm2835aux.c | 13 ++- drivers/spi/spi-fsl-spi.c | 2 +- drivers/spi/spi-tegra114.c | 45 ++++++-- drivers/staging/comedi/drivers/ni_mio_common.c | 24 +++-- drivers/target/iscsi/iscsi_target.c | 6 +- drivers/thermal/cpu_cooling.c | 2 +- drivers/tty/ipwireless/hardware.c | 2 + drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/host/xhci-hub.c | 2 +- drivers/vfio/pci/vfio_pci.c | 19 +++- drivers/video/backlight/lm3630a_bl.c | 4 +- drivers/video/fbdev/chipsfb.c | 3 +- drivers/xen/cpu_hotplug.c | 2 +- fs/btrfs/inode-map.c | 1 + fs/cifs/connect.c | 3 +- fs/exportfs/expfs.c | 1 + fs/ext4/inline.c | 2 +- fs/jfs/jfs_txnmgr.c | 3 +- fs/namei.c | 17 +-- fs/nfs/super.c | 2 +- fs/xfs/xfs_quotaops.c | 3 + include/asm-generic/rtc.h | 2 +- include/linux/bitmap.h | 8 ++ include/linux/device.h | 3 +- include/linux/netfilter/ipset/ip_set.h | 7 -- include/linux/platform_data/dma-imx-sdma.h | 3 + include/linux/signal.h | 15 ++- include/media/davinci/vpbe.h | 2 +- include/trace/events/xen.h | 6 +- kernel/debug/kdb/kdb_main.c | 2 +- kernel/signal.c | 5 + lib/bitmap.c | 20 ++++ lib/devres.c | 3 +- lib/kfifo.c | 3 +- net/6lowpan/nhc.c | 2 +- net/bridge/netfilter/ebtables.c | 4 +- net/core/neighbour.c | 4 +- net/ieee802154/6lowpan/reassembly.c | 2 +- net/ipv4/ip_tunnel.c | 4 +- net/ipv6/reassembly.c | 2 +- net/iucv/af_iucv.c | 27 +++-- net/llc/af_llc.c | 34 +++--- net/llc/llc_conn.c | 35 ++---- net/llc/llc_if.c | 12 ++- net/mac80211/rc80211_minstrel_ht.c | 2 +- net/mac80211/rx.c | 11 +- net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- net/netfilter/ipset/ip_set_bitmap_ip.c | 6 +- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 6 +- net/netfilter/ipset/ip_set_bitmap_port.c | 6 +- net/packet/af_packet.c | 25 ++++- net/rds/ib_stats.c | 2 +- net/sched/ematch.c | 2 +- net/tipc/sysctl.c | 8 +- net/x25/af_x25.c | 6 +- scripts/recordmcount.c | 17 +++ sound/aoa/codecs/onyx.c | 4 +- sound/pci/hda/hda_controller.h | 9 +- sound/soc/codecs/cs4349.c | 1 + sound/soc/codecs/es8328.c | 2 +- sound/soc/codecs/wm8737.c | 2 +- sound/soc/davinci/davinci-mcasp.c | 13 ++- sound/soc/fsl/imx-sgtl5000.c | 3 +- sound/soc/qcom/apq8016_sbc.c | 21 +++- sound/soc/soc-pcm.c | 4 +- sound/usb/mixer.c | 4 +- sound/usb/quirks-table.h | 9 +- 204 files changed, 1064 insertions(+), 560 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 32/183 IB/usnic: Fix out of bounds index check in query pkey
From: Gal Pressman <[email protected]>
[ Upstream commit 4959d5da5737dd804255c75b8cea0a2929ce279a ]
The pkey table size is one element, index should be tested for > 0 instead of > 1.
--- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/usnic/usnic_ib_verbs.c +1 -1
@@ -427,7 +427,7 @@ int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index,int usnic_ib_query_pkey (struct ib_device *ibdev,u8 port,u16 index,u16 *pkey) { -if (index >1 ) +if (index >0 )return -EINVAL ; *pkey =0xffff ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/183 rtc: 88pm80x: fix unintended sign extension
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit fb0b322537a831b5b0cb948c56f8f958ce493d3a ]
Shifting a u8 by 24 will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an unsigned long will sign extend the value causing the upper 32 bits to be set in the result.
Fix this by casting the u8 value to an unsigned long before the shift.
Detected by CoverityScan, CID#714646-714649 ("Unintended sign extension")
--- drivers/rtc/rtc-88pm80x.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/rtc/rtc-88pm80x.c +14 -7
@@ -116,12 +116,14 @@ static int pm80x_rtc_read_time(struct device *dev, struct rtc_time *tm)unsigned char buf[4 ];unsigned long ticks, base, data;regmap_raw_read (info->map,PM800_RTC_EXPIRE2_1 , buf,4 ); - base = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + base = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ];dev_dbg (info->dev,"%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ]);/* load 32-bit read-only counter */ regmap_raw_read (info->map,PM800_RTC_COUNTER1 , buf,4 ); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -144,7 +146,8 @@ static int pm80x_rtc_set_time(struct device *dev, struct rtc_time *tm)/* load 32-bit read-only counter */ regmap_raw_read (info->map,PM800_RTC_COUNTER1 , buf,4 ); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; base = ticks - data;dev_dbg (info->dev,"set base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -165,11 +168,13 @@ static int pm80x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)int ret;regmap_raw_read (info->map,PM800_RTC_EXPIRE2_1 , buf,4 ); - base = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + base = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ];dev_dbg (info->dev,"%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ]);regmap_raw_read (info->map,PM800_RTC_EXPIRE1_1 , buf,4 ); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -192,12 +197,14 @@ static int pm80x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)regmap_update_bits (info->map,PM800_RTC_CONTROL ,PM800_ALARM1_EN ,0 );regmap_raw_read (info->map,PM800_RTC_EXPIRE2_1 , buf,4 ); - base = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + base = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ];dev_dbg (info->dev,"%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ]);/* load 32-bit read-only counter */ regmap_raw_read (info->map,PM800_RTC_COUNTER1 , buf,4 ); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/183 pcrypt: use format specifier in kobject_add
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit b1e3874c75ab15288f573b3532e507c37e8e7656 ]
Passing string 'name' as the format specifier is potentially hazardous because name could (although very unlikely to) have a format specifier embedded in it causing issues when parsing the non-existent arguments to these. Follow best practice by using the "%s" format string for the string 'name'.
Cleans up clang warning:crypto/pcrypt.c:397:40: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
--- crypto/pcrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/pcrypt.c +1 -1
@@ -394,7 +394,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)int ret; pinst->kobj.kset = pcrypt_kset; - ret =kobject_add (&pinst->kobj,NULL , name); + ret =kobject_add (&pinst->kobj,NULL ,"%s" , name);if (!ret)kobject_uevent (&pinst->kobj,KOBJ_ADD );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/183 pinctrl: sh-pfc: sh73a0: Fix fsic_spdif pin groups
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0e6e448bdcf896d001a289a6112a704542d51516 ]
There are two pin groups for the FSIC SPDIF signal, but the FSIC pin group array lists only one, and it refers to a nonexistent group.
--- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-sh73a0.c +2 -1
@@ -2895,7 +2895,8 @@ static const char * const fsic_groups[] = {"fsic_sclk_out" ,"fsic_data_in" ,"fsic_data_out" , - "fsic_spdif", +"fsic_spdif_0" , + "fsic_spdif_1", }; static const char * const fsid_groups[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/183 rtc: pm8xxx: fix unintended sign extension
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit e42280886018c6f77f0a90190f7cba344b0df3e0 ]
Shifting a u8 by 24 will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an unsigned long will sign extend the value causing the upper 32 bits to be set in the result.
Fix this by casting the u8 value to an unsigned long before the shift.
Detected by CoverityScan, CID#1309693 ("Unintended sign extension")
--- drivers/rtc/rtc-pm8xxx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/rtc/rtc-pm8xxx.c +4 -2
@@ -186,7 +186,8 @@ static int pm8xxx_rtc_read_time(struct device *dev, struct rtc_time *tm) } } - secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | (value[3 ] <<24 ); + secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | + ((unsigned long )value[3 ] <<24 );rtc_time_to_tm (secs, tm);
@@ -267,7 +268,8 @@ static int pm8xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)return rc; } - secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | (value[3 ] <<24 ); + secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | + ((unsigned long )value[3 ] <<24 );rtc_time_to_tm (secs, &alarm->time);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/183 vfio_pci: Enable memory accesses before calling pci_map_rom
In reply to Greg Kroah-HartmanFrom: Eric Auger <[email protected]>
[ Upstream commit 0cfd027be1d6def4a462cdc180c055143af24069 ]
pci_map_rom/pci_get_rom_size() performs memory access in the ROM. In case the Memory Space accesses were disabled, readw() is likely to trigger a synchronous external abort on some platforms.
In case memory accesses were disabled, re-enable them before the call and disable them back again just after.
--- drivers/vfio/pci/vfio_pci.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/vfio/pci/vfio_pci.c +14 -5
@@ -496,6 +496,7 @@ static long vfio_pci_ioctl(void *device_data, {void __iomem *io;size_t size; +u16 orig_cmd; info.offset =VFIO_PCI_INDEX_TO_OFFSET (info.index); info.flags =0 ;
@@ -505,15 +506,23 @@ static long vfio_pci_ioctl(void *device_data,if (!info.size)break ; -/* Is it really there? */ +/* +* Is it really there? Enable memory decode for +* implicit access in pci_map_rom(). +*/ +pci_read_config_word (pdev,PCI_COMMAND , &orig_cmd); +pci_write_config_word (pdev,PCI_COMMAND , + orig_cmd |PCI_COMMAND_MEMORY ); + io =pci_map_rom (pdev, &size); -if (!io || !size) { +if (io) { + info.flags =VFIO_REGION_INFO_FLAG_READ ; +pci_unmap_rom (pdev, io); + }else { info.size =0 ; -break ; } -pci_unmap_rom (pdev, io); - info.flags =VFIO_REGION_INFO_FLAG_READ ; +pci_write_config_word (pdev,PCI_COMMAND , orig_cmd);break ; }case VFIO_PCI_VGA_REGION_INDEX :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/183 block: dont use bio->bi_vcnt to figure out segment number
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 1a67356e9a4829da2935dd338630a550c59c8489 ]
It is wrong to use bio->bi_vcnt to figure out how many segments there are in the bio even though CLONED flag isn't set on this bio, because this bio may be splitted or advanced.
So always use bio_segments() in blk_recount_segments(), and it shouldn't cause any performance loss now because the physical segment number is figured out in blk_queue_split() and BIO_SEG_VALID is set meantime since bdced438acd83ad83a6c ("block: setup bi_phys_segments after splitting").
--- block/blk-merge.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
block/blk-merge.c +1 -7
@@ -296,13 +296,7 @@ void blk_recalc_rq_segments(struct request *rq)void blk_recount_segments (struct request_queue *q,struct bio *bio) { -unsigned short seg_cnt; - -/* estimate segment number by bi_vcnt for non-cloned bio */ -if (bio_flagged (bio,BIO_CLONED )) - seg_cnt =bio_segments (bio); -else - seg_cnt = bio->bi_vcnt; +unsigned short seg_cnt =bio_segments (bio);if (test_bit (QUEUE_FLAG_NO_SG_MERGE , &q->queue_flags) && (seg_cnt <queue_max_segments (q)))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/183 drm/nouveau/pmu: dont print reply values if exec is false
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit b1d03fc36ec9834465a08c275c8d563e07f6f6bf ]
Currently the uninitialized values in the array reply are printed out when exec is false and nvkm_pmu_send has not updated the array. Avoid confusion by only dumping out these values if they have been actually updated.
Detected by CoverityScan, CID#1271291 ("Uninitialized scaler variable")
--- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c +2 -2
@@ -87,10 +87,10 @@ nvkm_memx_fini(struct nvkm_memx **pmemx, bool exec)if (exec) {nvkm_pmu_send (pmu, reply,PROC_MEMX ,MEMX_MSG_EXEC , memx->base, finish); +nvkm_debug (subdev,"Exec took %uns, PMU_IN %08x\n" , + reply[0 ], reply[1 ]); } -nvkm_debug (subdev,"Exec took %uns, PMU_IN %08x\n" , - reply[0 ], reply[1 ]);kfree (memx);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/183 drm/nouveau/bios/ramcfg: fix missing parentheses when calculating RON
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 13649101a25c53c87f4ab98a076dfe61f3636ab1 ]
Currently, the expression for calculating RON is always going to result in zero no matter the value of ram->mr[1] because the ! operator has higher precedence than the shift >> operator. I believe the missing parentheses around the expression before appying the ! operator will result in the desired result.
[ Note, not tested ]
Detected by CoveritScan, CID#1324005 ("Operands don't affect result")
--- drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c +1 -1
@@ -87,7 +87,7 @@ nvkm_gddr3_calc(struct nvkm_ram *ram)WR = (ram->next->bios.timing[2 ] &0x007f0000 ) >>16 ;/* XXX: Get these values from the VBIOS instead */ DLL = !(ram->mr[1 ] &0x1 ); -RON = !(ram->mr[1 ] &0x300 ) >>8 ; +RON = !((ram->mr[1 ] &0x300 ) >>8 );break ;default :return -ENOSYS ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/183 RDMA/ocrdma: Fix out of bounds index check in query pkey
In reply to Greg Kroah-HartmanFrom: Gal Pressman <[email protected]>
[ Upstream commit b188940796c7be31c1b8c25a9a0e0842c2e7a49e ]
The pkey table size is one element, index should be tested for > 0 instead of > 1.
--- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +1 -1
@@ -55,7 +55,7 @@int ocrdma_query_pkey (struct ib_device *ibdev,u8 port,u16 index,u16 *pkey) { -if (index >1 ) +if (index >0 )return -EINVAL ; *pkey =0xffff ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/183 ARM: 8847/1: pm: fix HYP/SVC mode mismatch when MCPM is used
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit ca70ea43f80c98582f5ffbbd1e6f4da2742da0c4 ]
MCPM does a soft reset of the CPUs and uses common cpu_resume() routine to perform low-level platform initialization. This results in a try to install HYP stubs for the second time for each CPU and results in false HYP/SVC mode mismatch detection. The HYP stubs are already installed at the beginning of the kernel initialization on the boot CPU (head.S) or in the secondary_startup() for other CPUs. To fix this issue MCPM code should use a cpu_resume() routine without HYP stubs installation.
This change fixes HYP/SVC mode mismatch on Samsung Exynos5422-based Odroid XU3/XU4/HC1 boards.
--- arch/arm/common/mcpm_entry.c | 2 +- arch/arm/include/asm/suspend.h | 1 + arch/arm/kernel/sleep.S | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-)
arch/arm/common/mcpm_entry.c +1 -1
@@ -379,7 +379,7 @@ static int __init nocache_trampoline(unsigned long _arg)unsigned int cluster =MPIDR_AFFINITY_LEVEL (mpidr,1 );phys_reset_t phys_reset; -mcpm_set_entry_vector (cpu, cluster, cpu_resume); +mcpm_set_entry_vector (cpu, cluster, cpu_resume_no_hyp);setup_mm_for_reboot ();__mcpm_cpu_going_down (cpu, cluster);
arch/arm/include/asm/suspend.h +1 -0
@@ -7,6 +7,7 @@ struct sleep_save_sp { };extern void cpu_resume (void ); +extern void cpu_resume_no_hyp (void );extern void cpu_resume_arm (void );extern int cpu_suspend (unsigned long ,int (*)(unsigned long ));
arch/arm/kernel/sleep.S +12 -0
@@ -119,6 +119,14 @@ ENDPROC(cpu_resume_after_mmu) .text .align +#ifdef CONFIG_MCPM + .arm +THUMB( .thumb ) +ENTRY(cpu_resume_no_hyp) +ARM_BE8(setend be) @ ensure we are in BE mode + b no_hyp +#endif + #ifdef CONFIG_MMU .arm ENTRY(cpu_resume_arm)
@@ -134,6 +142,7 @@ ARM_BE8(setend be) @ ensure we are in BE mode bl __hyp_stub_install_secondary #endif safe_svcmode_maskall r1 +no_hyp: mov r1, #0 ALT_SMP(mrc p15, 0, r0, c0, c0, 5) ALT_UP_B(1f)
@@ -162,6 +171,9 @@ ENDPROC(cpu_resume) #ifdef CONFIG_MMU ENDPROC(cpu_resume_arm) +#endif +#ifdef CONFIG_MCPM +ENDPROC(cpu_resume_no_hyp) #endif .align 2
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/183 clocksource/drivers/sun5i: Fail gracefully when clock rate is unavailable
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit e7e7e0d7beafebd11b0c065cd5fbc1e5759c5aab ]
If the clock tree is not fully populated when the timer-sun5i init code is called, attempts to get the clock rate for the timer would fail and return 0.
Make the init code for both clock events and clocksource check the returned clock rate and fail gracefully if the result is 0, instead of causing a divide by 0 exception later on.
--- drivers/clocksource/timer-sun5i.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/clocksource/timer-sun5i.c +10 -0
@@ -201,6 +201,11 @@ static int __init sun5i_setup_clocksource(struct device_node *node, } rate =clk_get_rate (clk); +if (!rate) { +pr_err ("Couldn't get parent clock rate\n" ); + ret = -EINVAL ; + goto err_disable_clk; + } cs->timer.base = base; cs->timer.clk = clk;
@@ -274,6 +279,11 @@ static int __init sun5i_setup_clockevent(struct device_node *node, void __iomem } rate =clk_get_rate (clk); +if (!rate) { +pr_err ("Couldn't get parent clock rate\n" ); + ret = -EINVAL ; + goto err_disable_clk; + } ce->timer.base = base; ce->timer.ticks_per_jiffy =DIV_ROUND_UP (rate,HZ );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/183 scsi: megaraid_sas: reduce module load time
In reply to Greg Kroah-HartmanFrom: Steve Sistare <[email protected]>
[ Upstream commit 31b6a05f86e690e1818116fd23c3be915cc9d9ed ]
megaraid_sas takes 1+ seconds to load while waiting for firmware:
[2.822603] megaraid_sas 0000:03:00.0: Waiting for FW to come to ready state [3.871003] megaraid_sas 0000:03:00.0: FW now in Ready state
This is due to the following loop in megasas_transition_to_ready(), which waits a minimum of 1 second, even though the FW becomes ready in tens of millisecs:
/*
* The cur_state should not last for more than max_wait secs
*/
for (i = 0; i < max_wait; i++) {
...
msleep(1000);
...
dev_info(&instance->pdev->dev, "FW now in Ready state\n");This is a regression, caused by a change of the msleep granularity from 1 to 1000 due to concern about waiting too long on systems with coarse jiffies.
To fix, increase iterations and use msleep(20), which results in:
[2.670627] megaraid_sas 0000:03:00.0: Waiting for FW to come to ready state [2.739386] megaraid_sas 0000:03:00.0: FW now in Ready state
--- drivers/scsi/megaraid/megaraid_sas_base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +2 -2
@@ -3585,12 +3585,12 @@ megasas_transition_to_ready(struct megasas_instance *instance, int ocr)/* * The cur_state should not last for more than max_wait secs */ -for (i =0 ; i < max_wait; i++) { +for (i =0 ; i < max_wait *50 ; i++) { curr_abs_state = instance->instancet->read_fw_status_reg (instance->reg_set);if (abs_state == curr_abs_state) { -msleep (1000 ); +msleep (20 ); }else break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/183 net: sh_eth: fix a missing check of of_get_phy_mode
In reply to Greg Kroah-HartmanFrom: Kangjie Lu <[email protected]>
[ Upstream commit 035a14e71f27eefa50087963b94cbdb3580d08bf ]
of_get_phy_mode may fail and return a negative error code; the fix checks the return value of of_get_phy_mode and returns NULL of it fails.
--- drivers/net/ethernet/renesas/sh_eth.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/renesas/sh_eth.c +5 -1
@@ -3040,12 +3040,16 @@ static struct sh_eth_plat_data *sh_eth_parse_dt(struct device *dev)struct device_node *np = dev->of_node;struct sh_eth_plat_data *pdata;const char *mac_addr; +int ret; pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );if (!pdata)return NULL ; - pdata->phy_interface =of_get_phy_mode (np); + ret =of_get_phy_mode (np); +if (ret <0 ) +return NULL ; + pdata->phy_interface = ret; mac_addr =of_get_mac_address (np);if (mac_addr)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/183 media: s5p-jpeg: Correct step and max values for V4L2_CID_JPEG_RESTART_INTERVAL
In reply to Greg Kroah-HartmanFrom: Pawe? Chmiel <[email protected]>
[ Upstream commit 19c624c6b29e244c418f8b44a711cbf5e82e3cd4 ]
This commit corrects max and step values for v4l2 control for V4L2_CID_JPEG_RESTART_INTERVAL. Max should be 0xffff and step should be 1. It was found by using v4l2-compliance tool and checking result of VIDIOC_QUERY_EXT_CTRL/QUERYMENU test.
Previously it was complaining that step was bigger than difference between max and min.
--- drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/s5p-jpeg/jpeg-core.c +1 -1
@@ -1952,7 +1952,7 @@ static int s5p_jpeg_controls_create(struct s5p_jpeg_ctx *ctx)v4l2_ctrl_new_std (&ctx->ctrl_handler, &s5p_jpeg_ctrl_ops,V4L2_CID_JPEG_RESTART_INTERVAL , -0 ,3 ,0xffff ,0 ); +0 ,0xffff ,1 ,0 );if (ctx->jpeg->variant->version ==SJPEG_S5P ) mask = ~0x06 ;/* 422, 420 */ }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/183 media: ivtv: update *pos correctly in ivtv_read_pos()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit f8e579f3ca0973daef263f513da5edff520a6c0d ]
We had intended to update *pos, but the current code is a no-op.
--- drivers/media/pci/ivtv/ivtv-fileops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/ivtv/ivtv-fileops.c +1 -1
@@ -420,7 +420,7 @@ static ssize_t ivtv_read_pos(struct ivtv_stream *s, char __user *ubuf, size_t coIVTV_DEBUG_HI_FILE ("read %zd from %s, got %zd\n" , count, s->name, rc);if (rc >0 ) - pos += rc; + *pos += rc;return rc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/183 media: wl128x: Fix an error code in fm_download_firmware()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit ef4bb63dc1f7213c08e13f6943c69cd27f69e4a3 ]
We forgot to set "ret" on this error path.
--- drivers/media/radio/wl128x/fmdrv_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/radio/wl128x/fmdrv_common.c +3 -2
@@ -1278,8 +1278,9 @@ static int fm_download_firmware(struct fmdev *fmdev, const u8 *fw_name)switch (action->type) {case ACTION_SEND_COMMAND :/* Send */ -if (fmc_send_cmd (fmdev,0 ,0 , action->data, - action->size,NULL ,NULL )) + ret =fmc_send_cmd (fmdev,0 ,0 , action->data, + action->size,NULL ,NULL ); +if (ret) goto rel_fw; cmd_cnt++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/183 media: cx23885: check allocation return
In reply to Greg Kroah-HartmanFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit a3d7f22ef34ec4206b50ee121384d5c8bebd5591 ]
Checking of kmalloc() seems to have been committed - as cx23885_dvb_register() is checking for != 0 return, returning -ENOMEM should be fine here. While at it address the coccicheck suggestion to move to kmemdup rather than using kmalloc+memcpy.
--- drivers/media/pci/cx23885/cx23885-dvb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/pci/cx23885/cx23885-dvb.c +3 -2
@@ -1452,8 +1452,9 @@ static int dvb_register(struct cx23885_tsport *port)if (fe0->dvb.frontend !=NULL ) {struct i2c_adapter *tun_i2c; - fe0->dvb.frontend->sec_priv =kmalloc (sizeof (dib7000p_ops),GFP_KERNEL ); -memcpy (fe0->dvb.frontend->sec_priv, &dib7000p_ops,sizeof (dib7000p_ops)); + fe0->dvb.frontend->sec_priv =kmemdup (&dib7000p_ops,sizeof (dib7000p_ops),GFP_KERNEL ); +if (!fe0->dvb.frontend->sec_priv) +return -ENOMEM ; tun_i2c = dib7000p_ops.get_i2c_master (fe0->dvb.frontend,DIBX000_I2C_INTERFACE_TUNER ,1 );if (!dvb_attach (dib0070_attach, fe0->dvb.frontend, tun_i2c, &dib7070p_dib0070_config))return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/183 media: cx18: update *pos correctly in cx18_read_pos()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 7afb0df554292dca7568446f619965fb8153085d ]
We should be updating *pos. The current code is a no-op.
--- drivers/media/pci/cx18/cx18-fileops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/cx18/cx18-fileops.c +1 -1
@@ -490,7 +490,7 @@ static ssize_t cx18_read_pos(struct cx18_stream *s, char __user *ubuf,CX18_DEBUG_HI_FILE ("read %zd from %s, got %zd\n" , count, s->name, rc);if (rc >0 ) - pos += rc; + *pos += rc;return rc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/183 jfs: fix bogus variable self-initialization
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit a5fdd713d256887b5f012608701149fa939e5645 ]
A statement was originally added in 2006 to shut up a gcc warning, now but now clang warns about it:
fs/jfs/jfs_txnmgr.c:1932:15: error: variable 'pxd' is uninitialized when used within its own initialization
[-Werror,-Wuninitialized]
pxd_t pxd = pxd; /* truncated extent of xad */
~~~ ^~~
Modern versions of gcc are fine without the silly assignment, so just drop it. Tested with gcc-4.6 (released 2011), 4.7, 4.8, and 4.9.
--- fs/jfs/jfs_txnmgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/jfs/jfs_txnmgr.c +1 -2
@@ -1928,8 +1928,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,* header ? */ if (tlck->type & tlckTRUNCATE) { -/* This odd declaration suppresses a bogus gcc warning */ -pxd_t pxd = pxd;/* truncated extent of xad */ +pxd_t pxd;/* truncated extent of xad */ int twm;/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/183 ARM: OMAP2+: Fix potentially uninitialized return value for _setup_reset()
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 7f0d078667a494466991aa7133f49594f32ff6a2 ]
Commit 747834ab8347 ("ARM: OMAP2+: hwmod: revise hardreset behavior") made the call to _enable() conditional based on no oh->rst_lines_cnt. This caused the return value to be potentially uninitialized. Curiously we see no compiler warnings for this, probably as this gets inlined.
We call _setup_reset() from _setup() and only _setup_postsetup() if the return value is zero. Currently the return value can be uninitialized for cases where oh->rst_lines_cnt is set and HWMOD_INIT_NO_RESET is not set.
--- arch/arm/mach-omap2/omap_hwmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod.c +1 -1
@@ -2563,7 +2563,7 @@ static void _setup_iclk_autoidle(struct omap_hwmod *oh)*/ static int _setup_reset (struct omap_hwmod *oh) { -int r; +int r =0 ;if (oh->_state != _HWMOD_STATE_INITIALIZED)return -EINVAL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/183 spi: tegra114: clear packed bit for unpacked mode
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit 7b3d10cdf54b8bc1dc0da21faed9789ac4da3684 ]
Packed bit is not cleared when not using packed mode. This results in transfer timeouts for the unpacked mode transfers followed by the packed mode transfers.
--- drivers/spi/spi-tegra114.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi-tegra114.c +2 -0
@@ -730,6 +730,8 @@ static int tegra_spi_start_transfer_one(struct spi_device *spi,if (tspi->is_packed) command1 |=SPI_PACKED ; +else + command1 &= ~SPI_PACKED ; command1 &= ~(SPI_CS_SEL_MASK |SPI_TX_EN |SPI_RX_EN ); tspi->cur_direction =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/183 spi: tegra114: fix for unpacked mode transfers
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit 1a89ac5b91895127f7c586ec5075c3753ca25501 ]
Fixes: computation of actual bytes to fill/receive in/from FIFO in unpacked mode when transfer length is not a multiple of requested bits per word.
unpacked mode transfers fails when the transfer includes partial bytes in the last word.
Total words to be written/read to/from FIFO is computed based on transfer length and bits per word. Unpacked mode includes 0 padding bytes for partial words to align with bits per word and these extra bytes are also accounted for calculating bytes left to transfer in the current driver.
This causes extra bytes access of tx/rx buffers along with buffer index position crossing actual length where remain_len becomes negative and due to unsigned type, negative value is a 32 bit representation of signed value and transferred bytes never meets the actual transfer length resulting in transfer timeout and a hang.
This patch fixes this with proper computation of the actual bytes to fill in FIFO during transmit and the actual bytes to read from FIFO during receive ignoring 0 padded bytes.
--- drivers/spi/spi-tegra114.c | 43 +++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-)
drivers/spi/spi-tegra114.c +36 -7
@@ -307,10 +307,16 @@ static unsigned tegra_spi_fill_tx_fifo_from_client_txbuf( x |= (u32)(*tx_buf++) << (i *8 );tegra_spi_writel (tspi, x,SPI_TX_FIFO ); } + + tspi->cur_tx_pos += written_words * tspi->bytes_per_word; }else { +unsigned int write_bytes; max_n_32bit =min (tspi->curr_dma_words, tx_empty_count); written_words = max_n_32bit; nbytes = written_words * tspi->bytes_per_word; +if (nbytes > t->len - tspi->cur_pos) + nbytes = t->len - tspi->cur_pos; + write_bytes = nbytes;for (count =0 ; count < max_n_32bit; count++) {u32 x =0 ;
@@ -319,8 +325,10 @@ static unsigned tegra_spi_fill_tx_fifo_from_client_txbuf( x |= (u32)(*tx_buf++) << (i *8 );tegra_spi_writel (tspi, x,SPI_TX_FIFO ); } + + tspi->cur_tx_pos += write_bytes; } - tspi->cur_tx_pos += written_words * tspi->bytes_per_word; +return written_words; }
@@ -344,20 +352,27 @@ static unsigned int tegra_spi_read_rx_fifo_to_client_rxbuf(for (i =0 ; len && (i <4 ); i++, len--) *rx_buf++ = (x >> i*8 ) &0xFF ; } - tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word; read_words += tspi->curr_dma_words; + tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word; }else {u32 rx_mask = ((u32 )1 << t->bits_per_word) -1 ; +u8 bytes_per_word = tspi->bytes_per_word; +unsigned int read_bytes; + len = rx_full_count * bytes_per_word; +if (len > t->len - tspi->cur_pos) + len = t->len - tspi->cur_pos; + read_bytes = len;for (count =0 ; count < rx_full_count; count++) {u32 x =tegra_spi_readl (tspi,SPI_RX_FIFO ) & rx_mask; -for (i =0 ; (i < tspi->bytes_per_word); i++) +for (i =0 ; len && (i < bytes_per_word); i++, len--) *rx_buf++ = (x >> (i*8 )) &0xFF ; } - tspi->cur_rx_pos += rx_full_count * tspi->bytes_per_word; read_words += rx_full_count; + tspi->cur_rx_pos += read_bytes; } +return read_words; }
@@ -372,12 +387,17 @@ static void tegra_spi_copy_client_txbuf_to_spi_txbuf(unsigned len = tspi->curr_dma_words * tspi->bytes_per_word;memcpy (tspi->tx_dma_buf, t->tx_buf + tspi->cur_pos, len); + tspi->cur_tx_pos += tspi->curr_dma_words * tspi->bytes_per_word; }else {unsigned int i;unsigned int count;u8 *tx_buf = (u8 *)t->tx_buf + tspi->cur_tx_pos;unsigned consume = tspi->curr_dma_words * tspi->bytes_per_word; +unsigned int write_bytes; +if (consume > t->len - tspi->cur_pos) + consume = t->len - tspi->cur_pos; + write_bytes = consume;for (count =0 ; count < tspi->curr_dma_words; count++) {u32 x =0 ;
@@ -386,8 +406,9 @@ static void tegra_spi_copy_client_txbuf_to_spi_txbuf( x |= (u32)(*tx_buf++) << (i *8 ); tspi->tx_dma_buf[count] = x; } + + tspi->cur_tx_pos += write_bytes; } - tspi->cur_tx_pos += tspi->curr_dma_words * tspi->bytes_per_word;/* Make the dma buffer to read by dma */ dma_sync_single_for_device(tspi->dev, tspi->tx_dma_phys,
@@ -405,20 +426,28 @@ static void tegra_spi_copy_spi_rxbuf_to_client_rxbuf(unsigned len = tspi->curr_dma_words * tspi->bytes_per_word;memcpy (t->rx_buf + tspi->cur_rx_pos, tspi->rx_dma_buf, len); + tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word; }else {unsigned int i;unsigned int count;unsigned char *rx_buf = t->rx_buf + tspi->cur_rx_pos;u32 rx_mask = ((u32 )1 << t->bits_per_word) -1 ; +unsigned consume = tspi->curr_dma_words * tspi->bytes_per_word; +unsigned int read_bytes; +if (consume > t->len - tspi->cur_pos) + consume = t->len - tspi->cur_pos; + read_bytes = consume;for (count =0 ; count < tspi->curr_dma_words; count++) {u32 x = tspi->rx_dma_buf[count] & rx_mask; -for (i =0 ; (i < tspi->bytes_per_word); i++) +for (i =0 ; consume && (i < tspi->bytes_per_word); + i++, consume--) *rx_buf++ = (x >> (i*8 )) &0xFF ; } + + tspi->cur_rx_pos += read_bytes; } - tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word;/* Make the dma buffer to read by dma */ dma_sync_single_for_device(tspi->dev, tspi->rx_dma_phys,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/183 crypto: tgr192 - fix unaligned memory access
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit f990f7fb58ac8ac9a43316f09a48cff1a49dda42 ]
Fix an unaligned memory access in tgr192_transform() by using the unaligned access helpers.
--- crypto/tgr192.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
crypto/tgr192.c +3 -3
@@ -25,8 +25,9 @@#include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> -#include <asm/byteorder.h> #include <linux/types.h> +#include <asm/byteorder.h> +#include <asm/unaligned.h> #define TGR192_DIGEST_SIZE 24#define TGR160_DIGEST_SIZE 20
@@ -468,10 +469,9 @@ static void tgr192_transform(struct tgr192_ctx *tctx, const u8 * data)u64 a, b, c, aa, bb, cc;u64 x[8 ];int i; -const __le64 *ptr = (const __le64 *)data;for (i =0 ; i <8 ; i++) - x[i] =le64_to_cpu (ptr[i]); + x[i] =get_unaligned_le64 (data + i *sizeof (__le64));/* save */ a = aa = tctx->a;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/183 rtc: cmos: ignore bogus century byte
In reply to Greg Kroah-HartmanFrom: Eric Wong <[email protected]>
[ Upstream commit 2a4daadd4d3e507138f8937926e6a4df49c6bfdc ]
Older versions of Libreboot and Coreboot had an invalid value (`3' in my case) in the century byte affecting the GM45 in the Thinkpad X200. Not everybody's updated their firmwares, and Linux <= 4.2 was able to read the RTC without problems, so workaround this by ignoring invalid values.
--- include/asm-generic/rtc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/asm-generic/rtc.h +1 -1
@@ -106,7 +106,7 @@ static inline unsigned int __get_rtc_time(struct rtc_time *time) time->tm_year += real_year -72 ;#endif -if (century) +if (century >20 ) time->tm_year += (century -19 ) *100 ;/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/183 rtc: ds1672: fix unintended sign extension
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit f0c04c276739ed8acbb41b4868e942a55b128dca ]
Shifting a u8 by 24 will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an unsigned long will sign extend the value causing the upper 32 bits to be set in the result.
Fix this by casting the u8 value to an unsigned long before the shift.
Detected by CoverityScan, CID#138801 ("Unintended sign extension")
--- drivers/rtc/rtc-ds1672.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/rtc-ds1672.c +2 -1
@@ -60,7 +60,8 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)"%s: raw read data - counters=%02x,%02x,%02x,%02x\n" , __func__, buf[0], buf[1], buf[2], buf[3]); - time = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + time = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ];rtc_time_to_tm (time, tm);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/183 tty: ipwireless: Fix potential NULL pointer dereference
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 7dd50e205b3348dc7784efbdf85723551de64a25 ]
There is a potential NULL pointer dereference in case alloc_ctrl_packet() fails and returns NULL.
--- drivers/tty/ipwireless/hardware.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/ipwireless/hardware.c +2 -0
@@ -1515,6 +1515,8 @@ static void ipw_send_setup_packet(struct ipw_hardware *hw)sizeof (struct ipw_setup_get_version_query_packet ),ADDR_SETUP_PROT ,TL_PROTOCOLID_SETUP , TL_SETUP_SIGNO_GET_VERSION_QRY); +if (!ver_packet) +return ; ver_packet->header.length =sizeof (struct tl_setup_get_version_qry );/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/183 rtc: 88pm860x: fix unintended sign extension
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit dc9e47160626cdb58d5c39a4f43dcfdb27a5c004 ]
Shifting a u8 by 24 will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an unsigned long will sign extend the value causing the upper 32 bits to be set in the result.
Fix this by casting the u8 value to an unsigned long before the shift.
Detected by CoverityScan, CID#144925-144928 ("Unintended sign extension")
--- drivers/rtc/rtc-88pm860x.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/rtc/rtc-88pm860x.c +14 -7
@@ -115,11 +115,13 @@ static int pm860x_rtc_read_time(struct device *dev, struct rtc_time *tm)pm860x_page_bulk_read (info->i2c,REG0_ADDR ,8 , buf);dev_dbg (info->dev,"%x-%x-%x-%x-%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ], buf[4 ], buf[5 ], buf[6 ], buf[7 ]); - base = (buf[1 ] <<24 ) | (buf[3 ] <<16 ) | (buf[5 ] <<8 ) | buf[7 ]; + base = ((unsigned long )buf[1 ] <<24 ) | (buf[3 ] <<16 ) | + (buf[5 ] <<8 ) | buf[7 ];/* load 32-bit read-only counter */ pm860x_bulk_read (info->i2c,PM8607_RTC_COUNTER1 ,4 , buf); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -145,7 +147,8 @@ static int pm860x_rtc_set_time(struct device *dev, struct rtc_time *tm)/* load 32-bit read-only counter */ pm860x_bulk_read (info->i2c,PM8607_RTC_COUNTER1 ,4 , buf); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; base = ticks - data;dev_dbg (info->dev,"set base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -170,10 +173,12 @@ static int pm860x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)pm860x_page_bulk_read (info->i2c,REG0_ADDR ,8 , buf);dev_dbg (info->dev,"%x-%x-%x-%x-%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ], buf[4 ], buf[5 ], buf[6 ], buf[7 ]); - base = (buf[1 ] <<24 ) | (buf[3 ] <<16 ) | (buf[5 ] <<8 ) | buf[7 ]; + base = ((unsigned long )buf[1 ] <<24 ) | (buf[3 ] <<16 ) | + (buf[5 ] <<8 ) | buf[7 ];pm860x_bulk_read (info->i2c,PM8607_RTC_EXPIRE1 ,4 , buf); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -198,11 +203,13 @@ static int pm860x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)pm860x_page_bulk_read (info->i2c,REG0_ADDR ,8 , buf);dev_dbg (info->dev,"%x-%x-%x-%x-%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ], buf[4 ], buf[5 ], buf[6 ], buf[7 ]); - base = (buf[1 ] <<24 ) | (buf[3 ] <<16 ) | (buf[5 ] <<8 ) | buf[7 ]; + base = ((unsigned long )buf[1 ] <<24 ) | (buf[3 ] <<16 ) | + (buf[5 ] <<8 ) | buf[7 ];/* load 32-bit read-only counter */ pm860x_bulk_read (info->i2c,PM8607_RTC_COUNTER1 ,4 , buf); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/183 clk: armada-xp: fix refcount leak in axp_clk_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit db20a90a4b6745dad62753f8bd2f66afdd5abc84 ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/mvebu/armada-xp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clk/mvebu/armada-xp.c +3 -1
@@ -202,7 +202,9 @@ static void __init axp_clk_init(struct device_node *np)mvebu_coreclk_setup (np, &axp_coreclks); -if (cgnp) +if (cgnp) {mvebu_clk_gating_setup (cgnp, axp_gating_desc); +of_node_put (cgnp); + } }CLK_OF_DECLARE (axp_clk,"marvell,armada-xp-core-clock" , axp_clk_init);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/183 spi: bcm2835aux: fix driver to not allow 65535 (=-1) cs-gpios
In reply to Greg Kroah-HartmanFrom: Martin Sperl <[email protected]>
[ Upstream commit 509c583620e9053e43d611bf1614fc3d3abafa96 ]
The original driver by default defines num_chipselects as -1. This actually allicates an array of 65535 entries in of_spi_register_master.
There is a side-effect for buggy device trees that (contrary to dt-binding documentation) have no cs-gpio defined.
This mode was never supported by the driver due to limitations of native cs and additional code complexity and is explicitly not stated to be implemented.
To keep backwards compatibility with such buggy DTs we limit the number of chip_selects to 1, as for all practical purposes it is only ever realistic to use a single chip select in native cs mode without negative side-effects.
--- drivers/spi/spi-bcm2835aux.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/spi/spi-bcm2835aux.c +12 -1
@@ -390,7 +390,18 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)platform_set_drvdata (pdev, master); master->mode_bits =BCM2835_AUX_SPI_MODE_BITS ; master->bits_per_word_mask =SPI_BPW_MASK (8 ); - master->num_chipselect =-1 ; +/* even though the driver never officially supported native CS +* allow a single native CS for legacy DT support purposes when +* no cs-gpio is configured. +* Known limitations for native cs are: +* * multiple chip-selects: cs0-cs2 are all simultaniously asserted +* whenever there is a transfer - this even includes SPI_NO_CS +* * SPI_CS_HIGH: is ignores - cs are always asserted low +* * cs_change: cs is deasserted after each spi_transfer +* * cs_delay_usec: cs is always deasserted one SCK cycle after +* a spi_transfer +*/ + master->num_chipselect =1 ; master->transfer_one = bcm2835aux_spi_transfer_one; master->handle_err = bcm2835aux_spi_handle_err; master->dev.of_node = pdev->dev.of_node;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/183 ASoC: fix valid stream condition
In reply to Greg Kroah-HartmanFrom: Jerome Brunet <[email protected]>
[ Upstream commit 6a7c59c6d9f3b280e81d7a04bbe4e55e90152dce ]
A stream may specify a rate range using 'rate_min' and 'rate_max', so a stream may be valid and not specify any rates. However, as stream cannot be valid and not have any channel. Let's use this condition instead to determine if a stream is valid or not.
--- sound/soc/soc-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +2 -2
@@ -48,8 +48,8 @@ static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream)else codec_stream = &dai->driver->capture; -/* If the codec specifies any rate at all, it supports the stream. */ -return codec_stream->rates; +/* If the codec specifies any channels at all, it supports the stream */ +return codec_stream->channels_min; }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/183 packet: in recvmsg msg_name return at least sizeof sockaddr_ll
In reply to Greg Kroah-HartmanFrom: Willem de Bruijn <[email protected]>
[ Upstream commit b2cf86e1563e33a14a1c69b3e508d15dc12f804c ]
Packet send checks that msg_name is at least sizeof sockaddr_ll. Packet recv must return at least this length, so that its output can be passed unmodified to packet send.
This ceased to be true since adding support for lladdr longer than sll_addr. Since, the return value uses true address length.
Always return at least sizeof sockaddr_ll, even if address length is shorter. Zero the padding bytes.
Change v1->v2: do not overwrite zeroed padding again. use copy_len.
--- net/packet/af_packet.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/packet/af_packet.c +11 -2
@@ -3309,20 +3309,29 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,sock_recv_ts_and_drops (msg, sk, skb);if (msg->msg_name) { +int copy_len; +/* If the address length field is there to be filled * in, we fill it in now. */ if (sock->type ==SOCK_PACKET ) {__sockaddr_check_size (sizeof (struct sockaddr_pkt )); msg->msg_namelen =sizeof (struct sockaddr_pkt ); + copy_len = msg->msg_namelen; }else {struct sockaddr_ll *sll = &PACKET_SKB_CB (skb)->sa.ll; msg->msg_namelen = sll->sll_halen + offsetof(struct sockaddr_ll , sll_addr); + copy_len = msg->msg_namelen; +if (msg->msg_namelen <sizeof (struct sockaddr_ll )) { +memset (msg->msg_name + + offsetof(struct sockaddr_ll , sll_addr), +0 ,sizeof (sll->sll_addr)); + msg->msg_namelen =sizeof (struct sockaddr_ll ); + } } -memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, - msg->msg_namelen); +memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, copy_len); }if (pkt_sk (sk)->auxdata) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/183 IB/mlx5: Add missing XRC options to QP optional params mask
In reply to Greg Kroah-HartmanFrom: Jack Morgenstein <[email protected]>
[ Upstream commit 8f4426aa19fcdb9326ac44154a117b1a3a5ae126 ]
The QP transition optional parameters for the various transition for XRC QPs are identical to those for RC QPs.
Many of the XRC QP transition optional parameter bits are missing from the QP optional mask table. These omissions caused failures when doing XRC QP state transitions.
For example, when trying to change the response timer of an XRC receive QP via the RTS2RTS transition, the new timer value was ignored because MLX5_QP_OPTPAR_RNR_TIMEOUT bit was missing from the optional params mask for XRC qps for the RTS2RTS transition.
Fix this by adding the missing XRC optional parameters for all QP transitions to the opt_mask table.
--- drivers/infiniband/hw/mlx5/qp.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/infiniband/hw/mlx5/qp.c +21 -0
@@ -1426,6 +1426,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q [MLX5_QP_ST_UD ] =MLX5_QP_OPTPAR_PKEY_INDEX |MLX5_QP_OPTPAR_Q_KEY | MLX5_QP_OPTPAR_PRI_PORT, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_RRE | +MLX5_QP_OPTPAR_RAE | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_PKEY_INDEX | +MLX5_QP_OPTPAR_PRI_PORT , }, [MLX5_QP_STATE_RTR] = { [MLX5_QP_ST_RC] = MLX5_QP_OPTPAR_ALT_ADDR_PATH |
@@ -1459,6 +1464,12 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_QMLX5_QP_OPTPAR_RWE | MLX5_QP_OPTPAR_PM_STATE, [MLX5_QP_ST_UD] = MLX5_QP_OPTPAR_Q_KEY, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_ALT_ADDR_PATH | +MLX5_QP_OPTPAR_RRE | +MLX5_QP_OPTPAR_RAE | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_PM_STATE | + MLX5_QP_OPTPAR_RNR_TIMEOUT, }, }, [MLX5_QP_STATE_RTS] = {
@@ -1475,6 +1486,12 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q [MLX5_QP_ST_UD ] =MLX5_QP_OPTPAR_Q_KEY |MLX5_QP_OPTPAR_SRQN | MLX5_QP_OPTPAR_CQN_RCV, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_RRE | +MLX5_QP_OPTPAR_RAE | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_RNR_TIMEOUT | +MLX5_QP_OPTPAR_PM_STATE | + MLX5_QP_OPTPAR_ALT_ADDR_PATH, }, }, [MLX5_QP_STATE_SQER] = {
@@ -1486,6 +1503,10 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_QMLX5_QP_OPTPAR_RWE |MLX5_QP_OPTPAR_RAE | MLX5_QP_OPTPAR_RRE, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_RNR_TIMEOUT | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_RAE | + MLX5_QP_OPTPAR_RRE, }, }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/183 media: omap_vout: potential buffer overflow in vidioc_dqbuf()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit dd6e2a981bfe83aa4a493143fd8cf1edcda6c091 ]
The "b->index" is a u32 the comes from the user in the ioctl. It hasn't been checked. We aren't supposed to use it but we're instead supposed to use the value that gets written to it when we call videobuf_dqbuf().
The videobuf_dqbuf() first memsets it to zero and then re-initializes it inside the videobuf_status() function. It's this final value which we want.
Hans Verkuil pointed out that we need to check the return from videobuf_dqbuf(). I ended up doing a little cleanup related to that as well.
--- drivers/media/platform/omap/omap_vout.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/media/platform/omap/omap_vout.c +6 -9
@@ -1580,23 +1580,20 @@ static int vidioc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *b)unsigned long size;struct videobuf_buffer *vb; - vb = q->bufs[b->index]; -if (!vout->streaming)return -EINVAL ; -if (file->f_flags &O_NONBLOCK ) -/* Call videobuf_dqbuf for non blocking mode */ - ret =videobuf_dqbuf (q, (struct v4l2_buffer *)b,1 ); -else -/* Call videobuf_dqbuf for blocking mode */ - ret =videobuf_dqbuf (q, (struct v4l2_buffer *)b,0 ); + ret =videobuf_dqbuf (q, b, !!(file->f_flags &O_NONBLOCK )); +if (ret) +return ret; + + vb = q->bufs[b->index]; addr = (unsigned long ) vout->buf_phy_addr[vb->i]; size = (unsigned long ) vb->size;dma_unmap_single (vout->vid_dev->v4l2_dev.dev, addr, size,DMA_TO_DEVICE ); -return ret; +return 0 ; }static int vidioc_streamon (struct file *file,void *fh,enum v4l2_buf_type i)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/183 platform/x86: alienware-wmi: printing the wrong error code
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 6d1f8b3d75419a8659ac916a1e9543bb3513a882 ]
The "out_data" variable is uninitialized at the point. Originally, this used to print "status" instead and that seems like the correct thing to print.
--- drivers/platform/x86/alienware-wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/alienware-wmi.c +1 -1
@@ -511,7 +511,7 @@ static ssize_t show_hdmi_source(struct device *dev,return scnprintf (buf,PAGE_SIZE ,"input [gpu] unknown\n" ); } -pr_err ("alienware-wmi: unknown HDMI source status: %d\n" , out_data); +pr_err ("alienware-wmi: unknown HDMI source status: %u\n" , status);return scnprintf (buf,PAGE_SIZE ,"input gpu [unknown]\n" ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/183 netfilter: ebtables: CONFIG_COMPAT: reject trailing data after last rule
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 680f6af5337c98d116e4f127cea7845339dba8da ]
If userspace provides a rule blob with trailing data after last target, we trigger a splat, then convert ruleset to 64bit format (with trailing data), then pass that to do_replace_finish() which then returns -EINVAL.
Erroring out right away avoids the splat plus unneeded translation and error unwind.
--- net/bridge/netfilter/ebtables.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bridge/netfilter/ebtables.c +3 -1
@@ -2174,7 +2174,9 @@ static int compat_copy_entries(unsigned char *data, unsigned int size_user,if (ret <0 )return ret; -WARN_ON (size_remaining); +if (size_remaining) +return -EINVAL ; +return state->buf_kern_offset; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/183 ARM: riscpc: fix lack of keyboard interrupts after irq conversion
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 63a0666bca9311f35017be454587f3ba903644b8 ]
Fix lack of keyboard interrupts for RiscPC due to incorrect conversion.
--- arch/arm/mach-rpc/irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-rpc/irq.c +2 -1
@@ -117,7 +117,7 @@ extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end;void __init rpc_init_irq (void ) { -unsigned int irq, clr, set =0 ; +unsigned int irq, clr, set;iomd_writeb (0 ,IOMD_IRQMASKA );iomd_writeb (0 ,IOMD_IRQMASKB );
@@ -129,6 +129,7 @@ void __init rpc_init_irq(void)for (irq =0 ; irq <NR_IRQS ; irq++) { clr =IRQ_NOREQUEST ; + set =0 ;if (irq <=6 || (irq >=9 && irq <=15 )) clr |=IRQ_NOPROBE ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/183 kdb: do a sanity check on the cpu in kdb_per_cpu()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b586627e10f57ee3aa8f0cfab0d6f7dc4ae63760 ]
The "whichcpu" comes from argv[3]. The cpu_online() macro looks up the cpu in a bitmap of online cpus, but if the value is too high then it could read beyond the end of the bitmap and possibly Oops.
--- kernel/debug/kdb/kdb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/debug/kdb/kdb_main.c +1 -1
@@ -2632,7 +2632,7 @@ static int kdb_per_cpu(int argc, const char **argv) diag =kdbgetularg (argv[3 ], &whichcpu);if (diag)return diag; -if (!cpu_online (whichcpu)) { +if (whichcpu >= nr_cpu_ids || !cpu_online (whichcpu)) {kdb_printf ("cpu %ld is not online\n" , whichcpu);return KDB_BADCPUNUM ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/183 backlight: lm3630a: Return 0 on success in update_status functions
In reply to Greg Kroah-HartmanFrom: Brian Masney <[email protected]>
[ Upstream commit d3f48ec0954c6aac736ab21c34a35d7554409112 ]
lm3630a_bank_a_update_status() and lm3630a_bank_b_update_status() both return the brightness value if the brightness was successfully updated. Writing to these attributes via sysfs would cause a 'Bad address' error to be returned. These functions should return 0 on success, so let's change it to correct that error.
--- drivers/video/backlight/lm3630a_bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/lm3630a_bl.c +2 -2
@@ -200,7 +200,7 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl) LM3630A_LEDA_ENABLE, LM3630A_LEDA_ENABLE);if (ret <0 ) goto out_i2c_err; -return bl->props.brightness; +return 0 ; out_i2c_err:dev_err (pchip->dev,"i2c failed to access\n" );
@@ -277,7 +277,7 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl) LM3630A_LEDB_ENABLE, LM3630A_LEDB_ENABLE);if (ret <0 ) goto out_i2c_err; -return bl->props.brightness; +return 0 ; out_i2c_err:dev_err (pchip->dev,"i2c failed to access REG_CTRL\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/183 spi: spi-fsl-spi: call spi_finalize_current_message() at the end
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 44a042182cb1e9f7916e015c836967bf638b33c4 ]
spi_finalize_current_message() shall be called once all actions are finished, otherwise the last actions might step over a newly started transfer.
--- drivers/spi/spi-fsl-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-fsl-spi.c +1 -1
@@ -408,7 +408,6 @@ static int fsl_spi_do_one_msg(struct spi_master *master, } m->status = status; -spi_finalize_current_message (master);if (status || !cs_change) {ndelay (nsecs);
@@ -416,6 +415,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master, }fsl_spi_setup_transfer (spi,NULL ); +spi_finalize_current_message (master);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/183 thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power
In reply to Greg Kroah-HartmanFrom: Matthias Kaehlcke <[email protected]>
[ Upstream commit bf45ac18b78038e43af3c1a273cae4ab5704d2ce ]
The CPU load values passed to the thermal_power_cpu_get_power tracepoint are zero for all CPUs, unless, unless the thermal_power_cpu_limit tracepoint is enabled too:
irq/41-rockchip-98 [000] .... 290.972410: thermal_power_cpu_get_power:
cpus=0000000f freq=1800000 load={{0x0,0x0,0x0,0x0}} dynamic_power=4815
vs
irq/41-rockchip-96 [000] .... 95.773585: thermal_power_cpu_get_power:
cpus=0000000f freq=1800000 load={{0x56,0x64,0x64,0x5e}} dynamic_power=4959
irq/41-rockchip-96 [000] .... 95.773596: thermal_power_cpu_limit:
cpus=0000000f freq=408000 cdev_state=10 power=416
There seems to be no good reason for omitting the CPU load information depending on another tracepoint. My guess is that the intention was to check whether thermal_power_cpu_get_power is (still) enabled, however 'load_cpu != NULL' already indicates that it was at least enabled when cpufreq_get_requested_power() was entered, there seems little gain from omitting the assignment if the tracepoint was just disabled, so just remove the check.
--- drivers/thermal/cpu_cooling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/cpu_cooling.c +1 -1
@@ -607,7 +607,7 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, load =0 ; total_load += load; -if (trace_thermal_power_cpu_limit_enabled () && load_cpu) +if (load_cpu) load_cpu[i] = load; i++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/183 misc: sgi-xp: Properly initialize buf in xpc_get_rsvd_page_pa
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit b0576f9ecb5c51e9932531d23c447b2739261841 ]
Clang warns:
drivers/misc/sgi-xp/xpc_partition.c:73:14: warning: variable 'buf' is uninitialized when used within its own initialization [-Wuninitialized]
void *buf = buf;
~~~ ^~~1 warning generated.
Arnd's explanation during review:
/*
* Returns the physical address of the partition's reserved page through
* an iterative number of calls.
*
* On first call, 'cookie' and 'len' should be set to 0, and 'addr'
* set to the nasid of the partition whose reserved page's address is
* being sought.
* On subsequent calls, pass the values, that were passed back on the
* previous call.
*
* While the return status equals SALRET_MORE_PASSES, keep calling
* this function after first copying 'len' bytes starting at 'addr'
* into 'buf'. Once the return status equals SALRET_OK, 'addr' will
* be the physical address of the partition's reserved page. If the
* return status equals neither of these, an error as occurred. */
static inline s64
sn_partition_reserved_page_pa(u64 buf, u64 *cookie, u64 *addr, u64 *len)
so *len is set to zero on the first call and tells the bios how many bytes are accessible at 'buf', and it does get updated by the BIOS to tell us how many bytes it needs, and then we allocate that and try again.
--- drivers/misc/sgi-xp/xpc_partition.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/sgi-xp/xpc_partition.c +1 -1
@@ -70,7 +70,7 @@ xpc_get_rsvd_page_pa(int nasid)unsigned long rp_pa = nasid;/* seed with nasid */ size_t len =0 ;size_t buf_len =0 ; -void *buf = buf; +void *buf =NULL ;void *buf_base =NULL ;enum xp_retval (*get_partition_rsvd_page_pa) (void *, u64 *, unsigned long *, size_t *) =
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/183 signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ]
The locking in force_sig_info is not prepared to deal with a task that exits or execs (as sighand may change). The is not a locking problem in force_sig as force_sig is only built to handle synchronous exceptions.
Further the function force_sig_info changes the signal state if the signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the delivery of the signal. The signal SIGKILL can not be ignored and can not be blocked and SIGNAL_UNKILLABLE won't prevent it from being delivered.
So using force_sig rather than send_sig for SIGKILL is confusing and pointless.
Because it won't impact the sending of the signal and and because using force_sig is wrong, replace force_sig with send_sig.
--- fs/cifs/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/connect.c +1 -1
@@ -2246,7 +2246,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) task =xchg (&server->tsk,NULL );if (task) -force_sig (SIGKILL , task); +send_sig (SIGKILL , task,1 ); } static struct TCP_Server_Info *
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/183 inet: frags: call inet_frags_fini() after unregister_pernet_subsys()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit ae7352d384a552d8c799c242e74a934809990a71 ]
Both IPv6 and 6lowpan are calling inet_frags_fini() too soon.
inet_frags_fini() is dismantling a kmem_cache, that might be needed later when unregister_pernet_subsys() eventually has to remove frags queues from hash tables and free them.
This fixes potential use-after-free, and is a prereq for the following patch.
--- net/ieee802154/6lowpan/reassembly.c | 2 +- net/ipv6/reassembly.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/ieee802154/6lowpan/reassembly.c +1 -1
@@ -634,7 +634,7 @@ err_sysctl:void lowpan_net_frag_exit (void ) { -inet_frags_fini (&lowpan_frags);lowpan_frags_sysctl_unregister ();unregister_pernet_subsys (&lowpan_frags_ops); +inet_frags_fini (&lowpan_frags); }
net/ipv6/reassembly.c +1 -1
@@ -774,8 +774,8 @@ err_protocol:void ipv6_frag_exit (void ) { -inet_frags_fini (&ip6_frags);ip6_frags_sysctl_unregister ();unregister_pernet_subsys (&ip6_frags_ops);inet6_del_protocol (&frag_protocol,IPPROTO_FRAGMENT ); +inet_frags_fini (&ip6_frags); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/183 media: vivid: fix incorrect assignment operation when setting video mode
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit d4ec9550e4b2d2e357a46fdc65d8ef3d4d15984c ]
The assigment of FB_VMODE_NONINTERLACE to var->vmode should be a bit-wise or of FB_VMODE_NONINTERLACE instead of an assignment, otherwise the previous clearing of the FB_VMODE_MASK bits of var->vmode makes no sense and is redundant.
Addresses-Coverity: ("Unused value")
--- drivers/media/platform/vivid/vivid-osd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/vivid/vivid-osd.c +1 -1
@@ -167,7 +167,7 @@ static int _vivid_fb_check_var(struct fb_var_screeninfo *var, struct vivid_dev * var->nonstd =0 ; var->vmode &= ~FB_VMODE_MASK ; - var->vmode =FB_VMODE_NONINTERLACED ; + var->vmode |=FB_VMODE_NONINTERLACED ;/* Dummy values */ var->hsync_len =24 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/183 scsi: qla2xxx: Unregister chrdev if module initialization fails
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit c794d24ec9eb6658909955772e70f34bef5b5b91 ]
If module initialization fails after the character device has been registered, unregister the character device. Additionally, avoid duplicating error path code.
--- drivers/scsi/qla2xxx/qla_os.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +21 -13
@@ -5780,8 +5780,7 @@ qla2x00_module_init(void)/* Initialize target kmem_cache and mem_pools */ ret =qlt_init ();if (ret <0 ) { -kmem_cache_destroy (srb_cachep); -return ret; + goto destroy_cache; }else if (ret >0 ) {/* * If initiator mode is explictly disabled by qlt_init(),
@@ -5800,11 +5799,10 @@ qla2x00_module_init(void) qla2xxx_transport_template =fc_attach_transport (&qla2xxx_transport_functions);if (!qla2xxx_transport_template) { -kmem_cache_destroy (srb_cachep);ql_log (ql_log_fatal,NULL ,0x0002 ,"fc_attach_transport failed...Failing load!.\n" ); -qlt_exit (); -return -ENODEV ; + ret = -ENODEV ; + goto qlt_exit; } apidev_major =register_chrdev (0 ,QLA2XXX_APIDEV , &apidev_fops);
@@ -5816,27 +5814,37 @@ qla2x00_module_init(void) qla2xxx_transport_vport_template =fc_attach_transport (&qla2xxx_transport_vport_functions);if (!qla2xxx_transport_vport_template) { -kmem_cache_destroy (srb_cachep); -qlt_exit (); -fc_release_transport (qla2xxx_transport_template);ql_log (ql_log_fatal,NULL ,0x0004 ,"fc_attach_transport vport failed...Failing load!.\n" ); -return -ENODEV ; + ret = -ENODEV ; + goto unreg_chrdev; }ql_log (ql_log_info,NULL ,0x0005 ,"QLogic Fibre Channel HBA Driver: %s.\n" , qla2x00_version_str); ret =pci_register_driver (&qla2xxx_pci_driver);if (ret) { -kmem_cache_destroy (srb_cachep); -qlt_exit (); -fc_release_transport (qla2xxx_transport_template); -fc_release_transport (qla2xxx_transport_vport_template);ql_log (ql_log_fatal,NULL ,0x0006 ,"pci_register_driver failed...ret=%d Failing load!.\n" , ret); + goto release_vport_transport; }return ret; + +release_vport_transport: +fc_release_transport (qla2xxx_transport_vport_template); + +unreg_chrdev: +if (apidev_major >=0 ) +unregister_chrdev (apidev_major,QLA2XXX_APIDEV ); +fc_release_transport (qla2xxx_transport_template); + +qlt_exit: +qlt_exit (); + +destroy_cache: +kmem_cache_destroy (srb_cachep); +return ret; }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/183 powerpc/cacheinfo: add cacheinfo_teardown, cacheinfo_rebuild
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit d4aa219a074a5abaf95a756b9f0d190b5c03a945 ]
Allow external callers to force the cacheinfo code to release all its references to cache nodes, e.g. before processing device tree updates post-migration, and to rebuild the hierarchy afterward.
CPU online/offline must be blocked by callers; enforce this.
--- arch/powerpc/kernel/cacheinfo.c | 21 +++++++++++++++++++++ arch/powerpc/kernel/cacheinfo.h | 4 ++++ 2 files changed, 25 insertions(+)
arch/powerpc/kernel/cacheinfo.c +21 -0
@@ -867,4 +867,25 @@ void cacheinfo_cpu_offline(unsigned int cpu_id)if (cache) cache_cpu_clear(cache, cpu_id); } + +void cacheinfo_teardown (void ) +{ +unsigned int cpu; + +lockdep_assert_cpus_held (); + +for_each_online_cpu (cpu) +cacheinfo_cpu_offline (cpu); +} + +void cacheinfo_rebuild (void ) +{ +unsigned int cpu; + +lockdep_assert_cpus_held (); + +for_each_online_cpu (cpu) +cacheinfo_cpu_online (cpu); +} +#endif /* (CONFIG_PPC_PSERIES && CONFIG_SUSPEND) || CONFIG_HOTPLUG_CPU */
arch/powerpc/kernel/cacheinfo.h +4 -0
@@ -5,4 +5,8 @@extern void cacheinfo_cpu_online (unsigned int cpu_id);extern void cacheinfo_cpu_offline (unsigned int cpu_id); +/* Allow migration/suspend to tear down and rebuild the hierarchy. */ +extern void cacheinfo_teardown (void ); +extern void cacheinfo_rebuild (void ); +#endif /* _PPC_CACHEINFO_H */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/183 net/af_iucv: always register net_device notifier
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 06996c1d4088a0d5f3e7789d7f96b4653cc947cc ]
Even when running as VM guest (ie pr_iucv != NULL), af_iucv can still open HiperTransport-based connections. For robust operation these connections require the af_iucv_netdev_notifier, so register it unconditionally.
Also handle any error that register_netdevice_notifier() returns.
--- net/iucv/af_iucv.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
net/iucv/af_iucv.c +20 -7
@@ -2392,6 +2392,13 @@ out:return err; } +static void afiucv_iucv_exit (void ) +{ +device_unregister (af_iucv_dev); +driver_unregister (&af_iucv_driver); + pr_iucv->iucv_unregister (&af_iucv_handler,0 ); +} +static int __init afiucv_init (void ) {int err;
@@ -2425,11 +2432,18 @@ static int __init afiucv_init(void) err =afiucv_iucv_init ();if (err) goto out_sock; - }else -register_netdevice_notifier (&afiucv_netdev_notifier); + } + + err =register_netdevice_notifier (&afiucv_netdev_notifier); +if (err) + goto out_notifier; +dev_add_pack (&iucv_packet_type);return 0 ; +out_notifier: +if (pr_iucv) +afiucv_iucv_exit (); out_sock:sock_unregister (PF_IUCV ); out_proto:
@@ -2443,12 +2457,11 @@ out: static void __exit afiucv_exit(void) {if (pr_iucv) { -device_unregister (af_iucv_dev); -driver_unregister (&af_iucv_driver); - pr_iucv->iucv_unregister (&af_iucv_handler,0 ); +afiucv_iucv_exit ();symbol_put (iucv_if); - }else -unregister_netdevice_notifier (&afiucv_netdev_notifier); + } + +unregister_netdevice_notifier (&afiucv_netdev_notifier);dev_remove_pack (&iucv_packet_type);sock_unregister (PF_IUCV );proto_unregister (&iucv_proto);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/183 ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit fd14f4436fd47d5418023c90e933e66d3645552e ]
If multiple serializers are connected in the system and the number of channels will need to use more than one serializer the mask to enable the serializers were left to 0 if tdm_mask is provided
--- sound/soc/davinci/davinci-mcasp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
sound/soc/davinci/davinci-mcasp.c +6 -7
@@ -875,14 +875,13 @@ static int mcasp_i2s_hw_param(struct davinci_mcasp *mcasp, int stream, active_slots =hweight32 (mcasp->tdm_mask[stream]); active_serializers = (channels + active_slots -1 ) / active_slots; -if (active_serializers ==1 ) { +if (active_serializers ==1 ) active_slots = channels; -for (i =0 ; i < total_slots; i++) { -if ((1 << i) & mcasp->tdm_mask[stream]) { - mask |= (1 << i); -if (--active_slots <=0 ) -break ; - } +for (i =0 ; i < total_slots; i++) { +if ((1 << i) & mcasp->tdm_mask[stream]) { + mask |= (1 << i); +if (--active_slots <=0 ) +break ; } } }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/183 drm/msm/a3xx: remove TPL1 regs from snapshot
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit f47bee2ba447bebc304111c16ef1e1a73a9744dd ]
These regs are write-only, and the hw throws a hissy-fit (ie. reboots) when we try to read them for GPU state snapshot, in response to a GPU hang. It is rather impolite when GPU recovery triggers an insta- reboot, so lets remove the TPL1 registers from the snapshot.
--- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +11 -13
@@ -383,19 +383,17 @@ static const unsigned int a3xx_registers[] = {0x2200 ,0x2212 ,0x2214 ,0x2217 ,0x221a ,0x221a ,0x2240 ,0x227e ,0x2280 ,0x228b ,0x22c0 ,0x22c0 ,0x22c4 ,0x22ce ,0x22d0 ,0x22d8 ,0x22df ,0x22e6 ,0x22e8 ,0x22e9 ,0x22ec ,0x22ec ,0x22f0 ,0x22f7 , -0x22ff ,0x22ff ,0x2340 ,0x2343 ,0x2348 ,0x2349 ,0x2350 ,0x2356 , -0x2360 ,0x2360 ,0x2440 ,0x2440 ,0x2444 ,0x2444 ,0x2448 ,0x244d , -0x2468 ,0x2469 ,0x246c ,0x246d ,0x2470 ,0x2470 ,0x2472 ,0x2472 , -0x2474 ,0x2475 ,0x2479 ,0x247a ,0x24c0 ,0x24d3 ,0x24e4 ,0x24ef , -0x2500 ,0x2509 ,0x250c ,0x250c ,0x250e ,0x250e ,0x2510 ,0x2511 , -0x2514 ,0x2515 ,0x25e4 ,0x25e4 ,0x25ea ,0x25ea ,0x25ec ,0x25ed , -0x25f0 ,0x25f0 ,0x2600 ,0x2612 ,0x2614 ,0x2617 ,0x261a ,0x261a , -0x2640 ,0x267e ,0x2680 ,0x268b ,0x26c0 ,0x26c0 ,0x26c4 ,0x26ce , -0x26d0 ,0x26d8 ,0x26df ,0x26e6 ,0x26e8 ,0x26e9 ,0x26ec ,0x26ec , -0x26f0 ,0x26f7 ,0x26ff ,0x26ff ,0x2740 ,0x2743 ,0x2748 ,0x2749 , -0x2750 ,0x2756 ,0x2760 ,0x2760 ,0x300c ,0x300e ,0x301c ,0x301d , -0x302a ,0x302a ,0x302c ,0x302d ,0x3030 ,0x3031 ,0x3034 ,0x3036 , -0x303c ,0x303c ,0x305e ,0x305f , +0x22ff ,0x22ff ,0x2340 ,0x2343 ,0x2440 ,0x2440 ,0x2444 ,0x2444 , +0x2448 ,0x244d ,0x2468 ,0x2469 ,0x246c ,0x246d ,0x2470 ,0x2470 , +0x2472 ,0x2472 ,0x2474 ,0x2475 ,0x2479 ,0x247a ,0x24c0 ,0x24d3 , +0x24e4 ,0x24ef ,0x2500 ,0x2509 ,0x250c ,0x250c ,0x250e ,0x250e , +0x2510 ,0x2511 ,0x2514 ,0x2515 ,0x25e4 ,0x25e4 ,0x25ea ,0x25ea , +0x25ec ,0x25ed ,0x25f0 ,0x25f0 ,0x2600 ,0x2612 ,0x2614 ,0x2617 , +0x261a ,0x261a ,0x2640 ,0x267e ,0x2680 ,0x268b ,0x26c0 ,0x26c0 , +0x26c4 ,0x26ce ,0x26d0 ,0x26d8 ,0x26df ,0x26e6 ,0x26e8 ,0x26e9 , +0x26ec ,0x26ec ,0x26f0 ,0x26f7 ,0x26ff ,0x26ff ,0x2740 ,0x2743 , +0x300c ,0x300e ,0x301c ,0x301d ,0x302a ,0x302a ,0x302c ,0x302d , +0x3030 ,0x3031 ,0x3034 ,0x3036 ,0x303c ,0x303c ,0x305e ,0x305f , ~0 /* sentinel */ };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/183 mfd: intel-lpss: Release IDA resources
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 02f36911c1b41fcd8779fa0c135aab0554333fa5 ]
ida instances allocate some internal memory for ->free_bitmap in addition to the base 'struct ida'. Use ida_destroy() to release that memory at module_exit().
--- drivers/mfd/intel-lpss.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/intel-lpss.c +1 -0
@@ -525,6 +525,7 @@ module_init(intel_lpss_init); static void __exit intel_lpss_exit(void) { +ida_destroy (&intel_lpss_devid_ida);debugfs_remove (intel_lpss_debugfs); }module_exit (intel_lpss_exit);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/183 net: pasemi: fix an use-after-free in pasemi_mac_phy_init()
In reply to Greg Kroah-HartmanFrom: Wen Yang <[email protected]>
[ Upstream commit faf5577f2498cea23011b5c785ef853ded22700b ]
The phy_dn variable is still being used in of_phy_connect() after the of_node_put() call, which may result in use-after-free.
--- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/pasemi/pasemi_mac.c +1 -1
@@ -1091,7 +1091,6 @@ static int pasemi_mac_phy_init(struct net_device *dev) dn =pci_device_to_OF_node (mac->pdev); phy_dn =of_parse_phandle (dn,"phy-handle" ,0 ); -of_node_put (phy_dn); mac->link =0 ; mac->speed =0 ;
@@ -1100,6 +1099,7 @@ static int pasemi_mac_phy_init(struct net_device *dev) phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,0 ,PHY_INTERFACE_MODE_SGMII ); +of_node_put (phy_dn);if (!phydev) {printk (KERN_ERR "%s: Could not attach to phy\n" , dev->name);return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/183 hwmon: (w83627hf) Use request_muxed_region for Super-IO accesses
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit e95fd518d05bfc087da6fcdea4900a57cfb083bd ]
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.
--- drivers/hwmon/w83627hf.c | 42 +++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-)
drivers/hwmon/w83627hf.c +37 -5
@@ -130,17 +130,23 @@ superio_select(struct w83627hf_sio_data *sio, int ld)outb (ld, sio->sioaddr +1 ); } -static inline void +static inline int superio_enter (struct w83627hf_sio_data *sio) { +if (!request_muxed_region (sio->sioaddr,2 ,DRVNAME )) +return -EBUSY ; +outb (0x87 , sio->sioaddr);outb (0x87 , sio->sioaddr); + +return 0 ; }static inline void superio_exit (struct w83627hf_sio_data *sio) {outb (0xAA , sio->sioaddr); +release_region (sio->sioaddr,2 ); }#define W627_DEVID 0x52
@@ -1275,7 +1281,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);static int __init w83627hf_find (int sioaddr,unsigned short *addr,struct w83627hf_sio_data *sio_data) { -int err = -ENODEV ; +int err;u16 val;static __initconst char *const names[] = {
@@ -1287,7 +1293,11 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr, }; sio_data->sioaddr = sioaddr; -superio_enter (sio_data); + err =superio_enter (sio_data); +if (err) +return err; + + err = -ENODEV ; val = force_id ? force_id :superio_inb (sio_data,DEVID );switch (val) {case W627_DEVID :
@@ -1641,9 +1651,21 @@ static int w83627thf_read_gpio5(struct platform_device *pdev)struct w83627hf_sio_data *sio_data =dev_get_platdata (&pdev->dev);int res =0xff , sel; -superio_enter (sio_data); +if (superio_enter (sio_data)) { +/* +* Some other driver reserved the address space for itself. +* We don't want to fail driver instantiation because of that, +* so display a warning and keep going. +*/ +dev_warn (&pdev->dev, +"Can not read VID data: Failed to enable SuperIO access\n" ); +return res; + } +superio_select (sio_data,W83627HF_LD_GPIO5 ); + res =0xff ; +/* Make sure these GPIO pins are enabled */ if (!(superio_inb (sio_data,W83627THF_GPIO5_EN ) & (1 <<3 ))) {dev_dbg (&pdev->dev,"GPIO5 disabled, no VID function\n" );
@@ -1674,7 +1696,17 @@ static int w83687thf_read_vid(struct platform_device *pdev)struct w83627hf_sio_data *sio_data =dev_get_platdata (&pdev->dev);int res =0xff ; -superio_enter (sio_data); +if (superio_enter (sio_data)) { +/* +* Some other driver reserved the address space for itself. +* We don't want to fail driver instantiation because of that, +* so display a warning and keep going. +*/ +dev_warn (&pdev->dev, +"Can not read VID data: Failed to enable SuperIO access\n" ); +return res; + } +superio_select (sio_data,W83627HF_LD_HWM );/* Make sure these GPIO pins are enabled */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/183 tipc: set sysctl_tipc_rmem and named_timeout right range
In reply to Greg Kroah-HartmanFrom: Jie Liu <[email protected]>
[ Upstream commit 4bcd4ec1017205644a2697bccbc3b5143f522f5f ]
We find that sysctl_tipc_rmem and named_timeout do not have the right minimum setting. sysctl_tipc_rmem should be larger than zero, like sysctl_tcp_rmem. And named_timeout as a timeout setting should be not less than zero.
--- net/tipc/sysctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/tipc/sysctl.c +6 -2
@@ -37,6 +37,8 @@#include <linux/sysctl.h> +static int zero; +static int one =1 ;static struct ctl_table_header *tipc_ctl_hdr;static struct ctl_table tipc_table[] = {
@@ -45,14 +47,16 @@ static struct ctl_table tipc_table[] = { .data = &sysctl_tipc_rmem, .maxlen = sizeof(sysctl_tipc_rmem), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, }, { .procname = "named_timeout", .data = &sysctl_tipc_named_timeout, .maxlen = sizeof(sysctl_tipc_named_timeout), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, }, {} };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/183 powerpc: vdso: Make vdso32 installation conditional in vdso_install
In reply to Greg Kroah-HartmanFrom: Ben Hutchings <[email protected]>
[ Upstream commit ff6d27823f619892ab96f7461764840e0d786b15 ]
The 32-bit vDSO is not needed and not normally built for 64-bit little-endian configurations. However, the vdso_install target still builds and installs it. Add the same config condition as is normally used for the build.
--- arch/powerpc/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/Makefile +2 -0
@@ -350,7 +350,9 @@ vdso_install: ifeq ($(CONFIG_PPC64),y) $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@ endif +ifdef CONFIG_VDSO32 $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@ +endif archclean: $(Q)$(MAKE) $(clean)=$(boot)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/183 soc/fsl/qe: Fix an error code in qe_pin_request()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 5674a92ca4b7e5a6a19231edd10298d30324cd27 ]
We forgot to set "err" on this error path.
--- arch/powerpc/sysdev/qe_lib/gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/sysdev/qe_lib/gpio.c +3 -1
@@ -155,8 +155,10 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index)if (err <0 ) goto err0; gc =gpio_to_chip (err); -if (WARN_ON (!gc)) +if (WARN_ON (!gc)) { + err = -ENODEV ; goto err0; + }if (!of_device_is_compatible (gc->of_node,"fsl,mpc8323-qe-pario-bank" )) {pr_debug ("%s: tried to get a non-qe pin\n" , __func__);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/183 6lowpan: Off by one handling ->nexthdr
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit f57c4bbf34439531adccd7d3a4ecc14f409c1399 ]
NEXTHDR_MAX is 255. What happens here is that we take a u8 value "hdr->nexthdr" from the network and then look it up in lowpan_nexthdr_nhcs[]. The problem is that if hdr->nexthdr is 0xff then we read one element beyond the end of the array so the array needs to be one element larger.
--- net/6lowpan/nhc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/6lowpan/nhc.c +1 -1
@@ -18,7 +18,7 @@#include "nhc.h" static struct rb_root rb_root =RB_ROOT ; -static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX ]; +static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX +1 ];static DEFINE_SPINLOCK (lowpan_nhc_lock);static int lowpan_nhc_insert (struct lowpan_nhc *nhc)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/183 ASoC: cs4349: Use PM ops cs4349_runtime_pm
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 9b4275c415acca6264a3d7f1182589959c93d530 ]
sound/soc/codecs/cs4349.c:358:32: warning:
cs4349_runtime_pm defined but not used [-Wunused-const-variable=]
cs4349_runtime_pm ops already defined, it seems we should enable it.
--- sound/soc/codecs/cs4349.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/cs4349.c +1 -0
@@ -379,6 +379,7 @@ static struct i2c_driver cs4349_i2c_driver = { .driver = { .name = "cs4349", .of_match_table = cs4349_of_match, + .pm = &cs4349_runtime_pm, }, .id_table = cs4349_i2c_id, .probe = cs4349_i2c_probe,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/183 ASoC: wm8737: Fix copy-paste error in wm8737_snd_controls
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 554b75bde64bcad9662530726d1483f7ef012069 ]
sound/soc/codecs/wm8737.c:112:29: warning:
high_3d defined but not used [-Wunused-const-variable=]
'high_3d' should be used for 3D High Cut-off.
--- sound/soc/codecs/wm8737.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8737.c +1 -1
@@ -170,7 +170,7 @@ SOC_DOUBLE("Polarity Invert Switch", WM8737_ADC_CONTROL, 5, 6, 1, 0),SOC_SINGLE ("3D Switch" ,WM8737_3D_ENHANCE ,0 ,1 ,0 ),SOC_SINGLE ("3D Depth" ,WM8737_3D_ENHANCE ,1 ,15 ,0 ),SOC_ENUM ("3D Low Cut-off" , low_3d), -SOC_ENUM ("3D High Cut-off" , low_3d), +SOC_ENUM ("3D High Cut-off" , high_3d),SOC_SINGLE_TLV ("3D ADC Volume" ,WM8737_3D_ENHANCE ,7 ,1 ,1 , adc_tlv), SOC_SINGLE("Noise Gate Switch", WM8737_NOISE_GATE, 0, 1, 0),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/183 signal: Allow cifs and drbd to receive their terminating signals
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 33da8e7c814f77310250bb54a9db36a44c5de784 ]
My recent to change to only use force_sig for a synchronous events wound up breaking signal reception cifs and drbd. I had overlooked the fact that by default kthreads start out with all signals set to SIG_IGN. So a change I thought was safe turned out to have made it impossible for those kernel thread to catch their signals.
Reverting the work on force_sig is a bad idea because what the code was doing was very much a misuse of force_sig. As the way force_sig ultimately allowed the signal to happen was to change the signal handler to SIG_DFL. Which after the first signal will allow userspace to send signals to these kernel threads. At least for wake_ack_receiver in drbd that does not appear actively wrong.
So correct this problem by adding allow_kernel_signal that will allow signals whose siginfo reports they were sent by the kernel through, but will not allow userspace generated signals, and update cifs and drbd to call allow_kernel_signal in an appropriate place so that their thread can receive this signal.
Fixing things this way ensures that userspace won't be able to send signals and cause problems, that it is clear which signals the threads are expecting to receive, and it guarantees that nothing else in the system will be affected.
This change was partly inspired by similar cifs and drbd patches that added allow_signal.
--- drivers/block/drbd/drbd_main.c | 2 ++ fs/cifs/connect.c | 2 +- include/linux/signal.h | 15 ++++++++++++++- kernel/signal.c | 5 +++++ 4 files changed, 22 insertions(+), 2 deletions(-)
drivers/block/drbd/drbd_main.c +2 -0
@@ -331,6 +331,8 @@ static int drbd_thread_setup(void *arg) thi->name[0 ], resource->name); +allow_kernel_signal (DRBD_SIGKILL ); +allow_kernel_signal (SIGXCPU ); restart: retval = thi->function (thi);
fs/cifs/connect.c +1 -1
@@ -939,7 +939,7 @@ cifs_demultiplex_thread(void *p)mempool_resize (cifs_req_poolp, length + cifs_min_rcv);set_freezable (); -allow_signal (SIGKILL ); +allow_kernel_signal (SIGKILL );while (server->tcpStatus != CifsExiting) {if (try_to_freeze ())continue ;
include/linux/signal.h +14 -1
@@ -313,6 +313,9 @@ extern void signal_setup_done(int failed, struct ksignal *ksig, int stepping);extern void exit_signals (struct task_struct *tsk);extern void kernel_sigaction (int ,__sighandler_t ); +#define SIG_KTHREAD ((__force __sighandler_t)2) +#define SIG_KTHREAD_KERNEL ((__force __sighandler_t)3) +static inline void allow_signal (int sig) {/*
@@ -320,7 +323,17 @@ static inline void allow_signal(int sig)* know it'll be handled, so that they don't get converted to * SIGKILL or just silently dropped. */ -kernel_sigaction (sig, (__force __sighandler_t )2 ); +kernel_sigaction (sig,SIG_KTHREAD ); +} + +static inline void allow_kernel_signal (int sig) +{ +/* +* Kernel threads handle their own signals. Let the signal code +* know signals sent by the kernel will be handled, so that they +* don't get silently dropped. +*/ +kernel_sigaction (sig,SIG_KTHREAD_KERNEL ); }static inline void disallow_signal (int sig)
kernel/signal.c +5 -0
@@ -79,6 +79,11 @@ static int sig_task_ignored(struct task_struct *t, int sig, bool force) handler == SIG_DFL && !(force && sig_kernel_only(sig)))return 1 ; +/* Only allow kernel generated signals to this kthread */ +if (unlikely ((t->flags &PF_KTHREAD ) && + (handler ==SIG_KTHREAD_KERNEL ) && !force)) +return true; +return sig_handler_ignored (handler, sig); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/183 dmaengine: dw: platform: Switch to acpi_dma_controller_register()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit e7b8514e4d68bec21fc6385fa0a66797ddc34ac9 ]
There is a possibility to have registered ACPI DMA controller while it has been gone already.
To avoid the potential crash, move to non-managed acpi_dma_controller_register().
--- drivers/dma/dw/platform.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/dma/dw/platform.c +12 -2
@@ -87,13 +87,20 @@ static void dw_dma_acpi_controller_register(struct dw_dma *dw)dma_cap_set (DMA_SLAVE , info->dma_cap); info->filter_fn = dw_dma_acpi_filter; - ret =devm_acpi_dma_controller_register (dev, acpi_dma_simple_xlate, - info); + ret =acpi_dma_controller_register (dev, acpi_dma_simple_xlate, info);if (ret) dev_err(dev, "could not register acpi_dma_controller\n"); } + +static void dw_dma_acpi_controller_free (struct dw_dma *dw) +{ +struct device *dev = dw->dma.dev; + +acpi_dma_controller_free (dev); +}#else /* !CONFIG_ACPI */ static inline void dw_dma_acpi_controller_register (struct dw_dma *dw) {} +static inline void dw_dma_acpi_controller_free (struct dw_dma *dw) {}#endif /* !CONFIG_ACPI */ #ifdef CONFIG_OF
@@ -225,6 +232,9 @@ static int dw_remove(struct platform_device *pdev) {struct dw_dma_chip *chip =platform_get_drvdata (pdev); +if (ACPI_HANDLE (&pdev->dev)) +dw_dma_acpi_controller_free (chip->dw); +if (pdev->dev.of_node)of_dma_controller_free (pdev->dev.of_node);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/183 mac80211: minstrel_ht: fix per-group max throughput rate initialization
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 56dd918ff06e3ee24d8067e93ed12b2a39e71394 ]
The group number needs to be multiplied by the number of rates per group to get the full rate index
--- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rc80211_minstrel_ht.c +1 -1
@@ -546,7 +546,7 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)/* (re)Initialize group rate indexes */ for (j =0 ; j <MAX_THR_RATES ; j++) - tmp_group_tp_rate[j] = group; + tmp_group_tp_rate[j] =MCS_GROUP_RATES * group;for (i =0 ; i <MCS_GROUP_RATES ; i++) {if (!(mg->supported &BIT (i)))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/183 mips: avoid explicit UB in assignment of mips_io_port_base
In reply to Greg Kroah-HartmanFrom: Nick Desaulniers <[email protected]>
[ Upstream commit 12051b318bc3ce5b42d6d786191008284b067d83 ]
The code in question is modifying a variable declared const through pointer manipulation. Such code is explicitly undefined behavior, and is the lone issue preventing malta_defconfig from booting when built with Clang:
If an attempt is made to modify an object defined with a const-qualified type through use of an lvalue with non-const-qualified type, the behavior is undefined.
LLVM is removing such assignments. A simple fix is to not declare variables const that you plan on modifying. Limiting the scope would be a better method of preventing unwanted writes to such a variable.
Further, the code in question mentions "compiler bugs" without any links to bug reports, so it is difficult to know if the issue is resolved in GCC. The patch was authored in 2006, which would have been GCC 4.0.3 or 4.1.1. The minimal supported version of GCC in the Linux kernel is currently 4.6.
For what its worth, there was UB before the commit in question, it just added a barrier and got lucky IRT codegen. I don't think there's any actual compiler bugs related, just runtime bugs due to UB.
--- arch/mips/include/asm/io.h | 14 ++------------ arch/mips/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-)
arch/mips/include/asm/io.h +2 -12
@@ -60,21 +60,11 @@* instruction, so the lower 16 bits must be zero. Should be true on * on any sane architecture; generic code does not use this assumption. */ -extern const unsigned long mips_io_port_base; +extern unsigned long mips_io_port_base; -/* -* Gcc will generate code to load the value of mips_io_port_base after each -* function call which may be fairly wasteful in some cases. So we don't -* play quite by the book. We tell gcc mips_io_port_base is a long variable -* which solves the code generation issue. Now we need to violate the -* aliasing rules a little to make initialization possible and finally we -* will need the barrier() to fight side effects of the aliasing chat. -* This trickery will eventually collapse under gcc's optimizer. Oh well. -*/ static inline void set_io_port_base (unsigned long base) { - * (unsigned long *) &mips_io_port_base = base; -barrier (); + mips_io_port_base = base; }/*
arch/mips/kernel/setup.c +1 -1
@@ -80,7 +80,7 @@ static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;* mips_io_port_base is the begin of the address space to which x86 style * I/O ports are mapped. */ -const unsigned long mips_io_port_base =-1 ; +unsigned long mips_io_port_base =-1 ;EXPORT_SYMBOL (mips_io_port_base);static struct resource code_resource = { .name ="Kernel code" , };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/183 Partially revert "kfifo: fix kfifo_alloc() and kfifo_init()"
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
[ Upstream commit ab9bb6318b0967671e0c9b6537c1537d51ca4f45 ]
Commit dfe2a77fd243 ("kfifo: fix kfifo_alloc() and kfifo_init()") made the kfifo code round the number of elements up. That was good for __kfifo_alloc(), but it's actually wrong for __kfifo_init().
The difference? __kfifo_alloc() will allocate the rounded-up number of elements, but __kfifo_init() uses an allocation done by the caller. We can't just say "use more elements than the caller allocated", and have to round down.
The good news? All the normal cases will be using power-of-two arrays anyway, and most users of kfifo's don't use kfifo_init() at all, but one of the helper macros to declare a KFIFO that enforce the proper power-of-two behavior. But it looks like at least ibmvscsis might be affected.
The bad news? Will Deacon refers to an old thread and points points out that the memory ordering in kfifo's is questionable. See
https://lore.kernel.org/lkml/[email protected]/
for more.
--- lib/kfifo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/kfifo.c +2 -1
@@ -82,7 +82,8 @@ int __kfifo_init(struct __kfifo *fifo, void *buffer, { size /= esize; - size =roundup_pow_of_two (size); +if (!is_power_of_2 (size)) + size =rounddown_pow_of_two (size); fifo->in =0 ; fifo->out =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/183 power: supply: Init device wakeup after device_add()
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit 8288022284859acbcc3cf1a073a1e2692d6c2543 ]
We may want to use the device pointer in device_init_wakeup() with functions that expect the device to already be added with device_add(). For example, if we were to link the device initializing wakeup to something in sysfs such as a class for wakeups we'll run into an error. It looks like this code was written with the assumption that the device would be added before initializing wakeup due to the order of operations in power_supply_unregister().
Let's change the order of operations so we don't run into problems here.
--- drivers/power/power_supply_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/power/power_supply_core.c +5 -5
@@ -755,14 +755,14 @@ __power_supply_register(struct device *parent, }spin_lock_init (&psy->changed_lock); - rc =device_init_wakeup (dev, ws); -if (rc) - goto wakeup_init_failed; - rc =device_add (dev);if (rc) goto device_add_failed; + rc =device_init_wakeup (dev, ws); +if (rc) + goto wakeup_init_failed; + rc =psy_register_thermal (psy);if (rc) goto register_thermal_failed;
@@ -798,8 +798,8 @@ register_cooler_failed:psy_unregister_thermal (psy); register_thermal_failed:device_del (dev); -device_add_failed: wakeup_init_failed: +device_add_failed: check_supplies_failed: dev_set_name_failed:put_device (dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/183 usb: host: xhci-hub: fix extra endianness conversion
In reply to Greg Kroah-HartmanFrom: Ruslan Bilovol <[email protected]>
[ Upstream commit 6269e4c76eacabaea0d0099200ae1a455768d208 ]
Don't do extra cpu_to_le32 conversion for put_unaligned_le32 because it is already implemented in this function.
Fixes sparse error:
xhci-hub.c:1152:44: warning: incorrect type in argument 1 (different base types)
xhci-hub.c:1152:44: expected unsigned int [usertype] val
xhci-hub.c:1152:44: got restricted __le32 [usertype]
--- drivers/usb/host/xhci-hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -965,7 +965,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, } port_li =readl (port_array[wIndex] +PORTLI ); status =xhci_get_ext_port_status (temp, port_li); -put_unaligned_le32 (cpu_to_le32 (status), &buf[4 ]); +put_unaligned_le32 (status, &buf[4 ]); }break ;case SetPortFeature:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/183 x86, perf: Fix the dependency of the x86 insn decoder selftest
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 7720804a2ae46c90265a32c81c45fb6f8d2f4e8b ]
Since x86 instruction decoder is not only for kprobes, it should be tested when the insn.c is compiled. (e.g. perf is enabled but kprobes is disabled)
--- arch/x86/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig.debug +1 -1
@@ -221,7 +221,7 @@ config HAVE_MMIOTRACE_SUPPORT config X86_DECODER_SELFTEST bool "x86 instruction decoder selftest" - depends on DEBUG_KERNEL && KPROBES + depends on DEBUG_KERNEL && INSTRUCTION_DECODER depends on !COMPILE_TEST ---help--- Perform x86 instruction decoder selftests at build time.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/183 bcma: fix incorrect update of BCMA_CORE_PCI_MDIO_DATA
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 420c20be08a4597404d272ae9793b642401146eb ]
An earlier commit re-worked the setting of the bitmask and is now assigning v with some bit flags rather than bitwise or-ing them into v, consequently the earlier bit-settings of v are being lost. Fix this by replacing an assignment with the bitwise or instead.
Addresses-Coverity: ("Unused value")
--- drivers/bcma/driver_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bcma/driver_pci.c +2 -2
@@ -78,7 +78,7 @@ static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u16 device, u8 address) v |= (address <<BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD ); } - v =BCMA_CORE_PCI_MDIODATA_START ; + v |=BCMA_CORE_PCI_MDIODATA_START ; v |=BCMA_CORE_PCI_MDIODATA_READ ; v |=BCMA_CORE_PCI_MDIODATA_TA ;
@@ -121,7 +121,7 @@ static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device, v |= (address <<BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD ); } - v =BCMA_CORE_PCI_MDIODATA_START ; + v |=BCMA_CORE_PCI_MDIODATA_START ; v |=BCMA_CORE_PCI_MDIODATA_WRITE ; v |=BCMA_CORE_PCI_MDIODATA_TA ; v |= data;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 132/183 iio: dac: ad5380: fix incorrect assignment to val
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit b1e18768ef1214c0a8048327918a182cabe09f9d ]
Currently the pointer val is being incorrectly incremented instead of the value pointed to by val. Fix this by adding in the missing * indirection operator.
Addresses-Coverity: ("Unused value")
--- drivers/iio/dac/ad5380.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5380.c +1 -1
@@ -221,7 +221,7 @@ static int ad5380_read_raw(struct iio_dev *indio_dev,if (ret)return ret; *val >>= chan->scan_type.shift; - val -= (1 << chan->scan_type.realbits) /2 ; + *val -= (1 << chan->scan_type.realbits) /2 ;return IIO_VAL_INT ;case IIO_CHAN_INFO_SCALE : *val =2 * st->vref;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/183 ath9k: dynack: fix possible deadlock in ath_dynack_node_{de}init
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit e1aa1a1db3b01c9890e82cf065cee99962ba1ed9 ]
Fix following lockdep warning disabling bh in
ath_dynack_node_init/ath_dynack_node_deinit
[ 75.955878] --------------------------------
[ 75.955880] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
[ 75.955884] swapper/0/0 [HC0[0]:SC1[3]:HE1:SE0] takes:
[ 75.955888] 00000000792a7ee0 (&(&da->qlock)->rlock){+.?.}, at: ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.955905] {SOFTIRQ-ON-W} state was registered at:
[ 75.955912] lock_acquire+0x9a/0x160
[ 75.955917] _raw_spin_lock+0x2c/0x70
[ 75.955927] ath_dynack_node_init+0x2a/0x60 [ath9k_hw]
[ 75.955934] ath9k_sta_state+0xec/0x160 [ath9k]
[ 75.955976] drv_sta_state+0xb2/0x740 [mac80211]
[ 75.956008] sta_info_insert_finish+0x21a/0x420 [mac80211]
[ 75.956039] sta_info_insert_rcu+0x12b/0x2c0 [mac80211]
[ 75.956069] sta_info_insert+0x7/0x70 [mac80211]
[ 75.956093] ieee80211_prep_connection+0x42e/0x730 [mac80211]
[ 75.956120] ieee80211_mgd_auth.cold+0xb9/0x15c [mac80211]
[ 75.956152] cfg80211_mlme_auth+0x143/0x350 [cfg80211]
[ 75.956169] nl80211_authenticate+0x25e/0x2b0 [cfg80211]
[ 75.956172] genl_family_rcv_msg+0x198/0x400
[ 75.956174] genl_rcv_msg+0x42/0x90
[ 75.956176] netlink_rcv_skb+0x35/0xf0
[ 75.956178] genl_rcv+0x1f/0x30
[ 75.956180] netlink_unicast+0x154/0x200
[ 75.956182] netlink_sendmsg+0x1bf/0x3d0
[ 75.956186] ___sys_sendmsg+0x2c2/0x2f0
[ 75.956187] __sys_sendmsg+0x44/0x80
[ 75.956190] do_syscall_64+0x55/0x1a0
[ 75.956192] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 75.956194] irq event stamp: 2357092
[ 75.956196] hardirqs last enabled at (2357092): [<ffffffff818c62de>] _raw_spin_unlock_irqrestore+0x3e/0x50
[ 75.956199] hardirqs last disabled at (2357091): [<ffffffff818c60b1>] _raw_spin_lock_irqsave+0x11/0x80
[ 75.956202] softirqs last enabled at (2357072): [<ffffffff8106dc09>] irq_enter+0x59/0x60
[ 75.956204] softirqs last disabled at (2357073): [<ffffffff8106dcbe>] irq_exit+0xae/0xc0
[ 75.956206]
other info that might help us debug this:
[ 75.956207] Possible unsafe locking scenario:[ 75.956208] CPU0
[ 75.956209] ----
[ 75.956210] lock(&(&da->qlock)->rlock);
[ 75.956213] <Interrupt>
[ 75.956214] lock(&(&da->qlock)->rlock);
[ 75.956216]
*** DEADLOCK ***[ 75.956217] 1 lock held by swapper/0/0:
[ 75.956219] #0: 000000003bb5675c (&(&sc->sc_pcu_lock)->rlock){+.-.}, at: ath9k_tasklet+0x55/0x240 [ath9k]
[ 75.956225]
stack backtrace:
[ 75.956228] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.3.0-rc1-wdn+ #13
[ 75.956229] Hardware name: Dell Inc. Studio XPS 1340/0K183D, BIOS A11 09/08/2009
[ 75.956231] Call Trace:
[ 75.956233] <IRQ>
[ 75.956236] dump_stack+0x67/0x90
[ 75.956239] mark_lock+0x4c1/0x640
[ 75.956242] ? check_usage_backwards+0x130/0x130
[ 75.956245] ? sched_clock_local+0x12/0x80
[ 75.956247] __lock_acquire+0x484/0x7a0
[ 75.956250] ? __lock_acquire+0x3b9/0x7a0
[ 75.956252] lock_acquire+0x9a/0x160
[ 75.956259] ? ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956262] _raw_spin_lock_bh+0x34/0x80
[ 75.956268] ? ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956275] ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956280] ath_rx_tasklet+0xd09/0xe90 [ath9k]
[ 75.956286] ath9k_tasklet+0x102/0x240 [ath9k]
[ 75.956288] tasklet_action_common.isra.0+0x6d/0x170
[ 75.956291] __do_softirq+0xcc/0x425
[ 75.956294] irq_exit+0xae/0xc0
[ 75.956296] do_IRQ+0x8a/0x110
[ 75.956298] common_interrupt+0xf/0xf
[ 75.956300] </IRQ>
[ 75.956303] RIP: 0010:cpuidle_enter_state+0xb2/0x400
[ 75.956308] RSP: 0018:ffffffff82203e70 EFLAGS: 00000202 ORIG_RAX: ffffffffffffffd7
[ 75.956310] RAX: ffffffff82219800 RBX: ffffffff822bd0a0 RCX: 0000000000000000
[ 75.956312] RDX: 0000000000000046 RSI: 0000000000000006 RDI: ffffffff82219800
[ 75.956314] RBP: ffff888155a01c00 R08: 00000011af51aabe R09: 0000000000000000
[ 75.956315] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000002
[ 75.956317] R13: 00000011af51aabe R14: 0000000000000003 R15: ffffffff82219800
[ 75.956321] cpuidle_enter+0x24/0x40
[ 75.956323] do_idle+0x1ac/0x220
[ 75.956326] cpu_startup_entry+0x14/0x20
[ 75.956329] start_kernel+0x482/0x489
[ 75.956332] secondary_startup_64+0xa4/0xb0--- drivers/net/wireless/ath/ath9k/dynack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath9k/dynack.c +4 -4
@@ -285,9 +285,9 @@ void ath_dynack_node_init(struct ath_hw *ah, struct ath_node *an) an->ackto = ackto; -spin_lock (&da->qlock); +spin_lock_bh (&da->qlock);list_add_tail (&an->list, &da->nodes); -spin_unlock (&da->qlock); +spin_unlock_bh (&da->qlock); }EXPORT_SYMBOL (ath_dynack_node_init);
@@ -301,9 +301,9 @@ void ath_dynack_node_deinit(struct ath_hw *ah, struct ath_node *an) {struct ath_dynack *da = &ah->dynack; -spin_lock (&da->qlock); +spin_lock_bh (&da->qlock);list_del (&an->list); -spin_unlock (&da->qlock); +spin_unlock_bh (&da->qlock); }EXPORT_SYMBOL (ath_dynack_node_deinit);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/183 Btrfs: fix hang when loading existing inode cache off disk
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 7764d56baa844d7f6206394f21a0e8c1f303c476 ]
If we are able to load an existing inode cache off disk, we set the state of the cache to BTRFS_CACHE_FINISHED, but we don't wake up any one waiting for the cache to be available. This means that anyone waiting for the cache to be available, waiting on the condition that either its state is BTRFS_CACHE_FINISHED or its available free space is greather than zero, can hang forever.
This could be observed running fstests with MOUNT_OPTIONS="-o inode_cache", in particular test case generic/161 triggered it very frequently for me, producing a trace like the following:
[63795.739712] BTRFS info (device sdc): enabling inode map caching [63795.739714] BTRFS info (device sdc): disk space caching is enabled [63795.739716] BTRFS info (device sdc): has skinny extents [64036.653886] INFO: task btrfs-transacti:3917 blocked for more than 120 seconds. [64036.654079] Not tainted 5.2.0-rc4-btrfs-next-50 #1 [64036.654143] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [64036.654232] btrfs-transacti D 0 3917 2 0x80004000 [64036.654239] Call Trace: [64036.654258] ? __schedule+0x3ae/0x7b0 [64036.654271] schedule+0x3a/0xb0 [64036.654325] btrfs_commit_transaction+0x978/0xae0 [btrfs] [64036.654339] ? remove_wait_queue+0x60/0x60 [64036.654395] transaction_kthread+0x146/0x180 [btrfs] [64036.654450] ? btrfs_cleanup_transaction+0x620/0x620 [btrfs] [64036.654456] kthread+0x103/0x140 [64036.654464] ? kthread_create_worker_on_cpu+0x70/0x70 [64036.654476] ret_from_fork+0x3a/0x50 [64036.654504] INFO: task xfs_io:3919 blocked for more than 120 seconds. [64036.654568] Not tainted 5.2.0-rc4-btrfs-next-50 #1 [64036.654617] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [64036.654685] xfs_io D 0 3919 3633 0x00000000 [64036.654691] Call Trace: [64036.654703] ? __schedule+0x3ae/0x7b0 [64036.654716] schedule+0x3a/0xb0 [64036.654756] btrfs_find_free_ino+0xa9/0x120 [btrfs] [64036.654764] ? remove_wait_queue+0x60/0x60 [64036.654809] btrfs_create+0x72/0x1f0 [btrfs] [64036.654822] lookup_open+0x6bc/0x790 [64036.654849] path_openat+0x3bc/0xc00 [64036.654854] ? __lock_acquire+0x331/0x1cb0 [64036.654869] do_filp_open+0x99/0x110 [64036.654884] ? __alloc_fd+0xee/0x200 [64036.654895] ? do_raw_spin_unlock+0x49/0xc0 [64036.654909] ? do_sys_open+0x132/0x220 [64036.654913] do_sys_open+0x132/0x220 [64036.654926] do_syscall_64+0x60/0x1d0 [64036.654933] entry_SYSCALL_64_after_hwframe+0x49/0xbe
Fix this by adding a wake_up() call right after setting the cache state to BTRFS_CACHE_FINISHED, at start_caching(), when we are able to load the cache from disk.
--- fs/btrfs/inode-map.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/inode-map.c +1 -0
@@ -158,6 +158,7 @@ static void start_caching(struct btrfs_root *root)spin_lock (&root->ino_cache_lock); root->ino_cache_state =BTRFS_CACHE_FINISHED ;spin_unlock (&root->ino_cache_lock); +wake_up (&root->ino_cache_wait);return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/183 hwmon: (shtc1) fix shtc1 and shtw1 id mask
In reply to Greg Kroah-HartmanFrom: Dan Robertson <[email protected]>
[ Upstream commit fdc7d8e829ec755c5cfb2f5a8d8c0cdfb664f895 ]
Fix an error in the bitmaskfor the shtc1 and shtw1 bitmask used to retrieve the chip ID from the ID register. See section 5.7 of the shtw1 or shtc1 datasheet for details.
--- drivers/hwmon/shtc1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/shtc1.c +1 -1
@@ -38,7 +38,7 @@ static const unsigned char shtc1_cmd_read_id_reg[] = { 0xef, 0xc8 };/* constants for reading the ID register */ #define SHTC1_ID 0x07 -#define SHTC1_ID_REG_MASK 0x1f +#define SHTC1_ID_REG_MASK 0x3f/* delays for non-blocking i2c commands, both in us */ #define SHTC1_NONBLOCKING_WAIT_TIME_HPM 14400
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/183 net: sonic: replace dev_kfree_skb in sonic_send_packet
In reply to Greg Kroah-HartmanFrom: Mao Wenan <[email protected]>
[ Upstream commit 49f6c90bf6805948b597eabb499e500a47cf24be ]
sonic_send_packet will be processed in irq or non-irq context, so it would better use dev_kfree_skb_any instead of dev_kfree_skb.
--- drivers/net/ethernet/natsemi/sonic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/natsemi/sonic.c +1 -1
@@ -222,7 +222,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) laddr =dma_map_single (lp->device, skb->data, length,DMA_TO_DEVICE );if (!laddr) {pr_err_ratelimited ("%s: failed to map tx DMA buffer.\n" , dev->name); -dev_kfree_skb (skb); +dev_kfree_skb_any (skb);return NETDEV_TX_OK ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/183 net/rds: Fix ib_evt_handler_call element in rds_ib_stat_names
In reply to Greg Kroah-HartmanFrom: Gerd Rausch <[email protected]>
[ Upstream commit 05a82481a3024b94db00b8c816bb3d526b5209e0 ]
All entries in 'rds_ib_stat_names' are stringified versions of the corresponding "struct rds_ib_statistics" element without the "s_"-prefix.
Fix entry 'ib_evt_handler_call' to do the same.
--- net/rds/ib_stats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rds/ib_stats.c +1 -1
@@ -42,7 +42,7 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_ib_statistics, rds_ib_stats);static const char *const rds_ib_stat_names[] = {"ib_connect_raced" ,"ib_listen_closed_stale" , -"s_ib_evt_handler_call" , +"ib_evt_handler_call" ,"ib_tasklet_call" ,"ib_tx_cq_event" ,"ib_tx_ring_full" ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/183 iommu/amd: Wait for completion of IOTLB flush in attach_device
In reply to Greg Kroah-HartmanFrom: Filippo Sironi <[email protected]>
[ Upstream commit 0b15e02f0cc4fb34a9160de7ba6db3a4013dc1b7 ]
To make sure the domain tlb flush completes before the function returns, explicitly wait for its completion.
--- drivers/iommu/amd_iommu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iommu/amd_iommu.c +2 -0
@@ -2184,6 +2184,8 @@ static int attach_device(struct device *dev,*/ domain_flush_tlb_pde (domain); +domain_flush_complete (domain); +return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/183 net: hisilicon: Fix signedness bug in hix5hd2_dev_probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 002dfe8085255b7bf1e0758c3d195c5412d35be9 ]
The "priv->phy_mode" variable is an enum and in this context GCC will treat it as unsigned to the error handling will never trigger.
--- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +1 -1
@@ -951,7 +951,7 @@ static int hix5hd2_dev_probe(struct platform_device *pdev) goto err_free_mdio; priv->phy_mode =of_get_phy_mode (node); -if (priv->phy_mode <0 ) { +if ((int )priv->phy_mode <0 ) {netdev_err (ndev,"not find phy-mode\n" ); ret = -EINVAL ; goto err_mdiobus;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/183 mic: avoid statically declaring a struct device.
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit bc83f79bd2119230888fb8574639d5a51b38f903 ]
Generally, declaring a platform device as a static variable is a bad idea and can cause all kinds of problems, in particular with the DMA configuration and lifetime rules.
A specific problem we hit here is from a bug in clang that warns about certain (otherwise valid) macros when used in static variables:
drivers/misc/mic/card/mic_x100.c:285:27: warning: shift count >= width of type [-Wshift-count-overflow]
static u64 mic_dma_mask = DMA_BIT_MASK(64);
^~~~~~~~~~~~~~~~
include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK'
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
^ ~~~A slightly better way here is to create the platform device dynamically and set the dma mask in the probe function.
This avoids the warning and some other problems, but is still not ideal because the device creation should really be separated from the driver, and the fact that the device has no parent means we have to force the dma mask rather than having it set up from the bus that the device is actually on.
--- drivers/misc/mic/card/mic_x100.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
drivers/misc/mic/card/mic_x100.c +12 -16
@@ -249,6 +249,9 @@ static int __init mic_probe(struct platform_device *pdev) mdrv->dev = &pdev->dev;snprintf (mdrv->name,sizeof (mic_driver_name), mic_driver_name); +/* FIXME: use dma_set_mask_and_coherent() and check result */ +dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (64 )); + mdev->mmio.pa =MIC_X100_MMIO_BASE ; mdev->mmio.len =MIC_X100_MMIO_LEN ; mdev->mmio.va = devm_ioremap(&pdev->dev, MIC_X100_MMIO_BASE,
@@ -294,18 +297,6 @@ static void mic_platform_shutdown(struct platform_device *pdev)mic_remove (pdev); } -static u64 mic_dma_mask =DMA_BIT_MASK (64 ); - -static struct platform_device mic_platform_dev = { - .name = mic_driver_name, - .id =0 , - .num_resources =0 , - .dev = { - .dma_mask = &mic_dma_mask, - .coherent_dma_mask =DMA_BIT_MASK (64 ), - }, -}; -static struct platform_driver __refdata mic_platform_driver = { .probe = mic_probe, .remove = mic_remove,
@@ -315,6 +306,8 @@ static struct platform_driver __refdata mic_platform_driver = { }, }; +static struct platform_device *mic_platform_dev; +static int __init mic_init (void ) {int ret;
@@ -327,9 +320,12 @@ static int __init mic_init(void) }mic_init_card_debugfs (); - ret =platform_device_register (&mic_platform_dev); + + mic_platform_dev =platform_device_register_simple (mic_driver_name, +0 ,NULL ,0 ); + ret =PTR_ERR_OR_ZERO (mic_platform_dev);if (ret) { -pr_err ("platform_device_register ret %d\n" , ret); +pr_err ("platform_device_register_full ret %d\n" , ret); goto cleanup_debugfs; } ret =platform_driver_register (&mic_platform_driver);
@@ -340,7 +336,7 @@ static int __init mic_init(void)return ret; device_unregister: -platform_device_unregister (&mic_platform_dev); +platform_device_unregister (mic_platform_dev); cleanup_debugfs:mic_exit_card_debugfs (); done:
@@ -350,7 +346,7 @@ done: static void __exit mic_exit(void) {platform_driver_unregister (&mic_platform_driver); -platform_device_unregister (&mic_platform_dev); +platform_device_unregister (mic_platform_dev);mic_exit_card_debugfs (); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/183 net: ethernet: stmmac: Fix signedness bug in ipq806x_gmac_of_parse()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 231042181dc9d6122c6faba64e99ccb25f13cc6c ]
The "gmac->phy_mode" variable is an enum and in this context GCC will treat it as an unsigned int so the error handling will never be triggered.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c +1 -1
@@ -203,7 +203,7 @@ static void *ipq806x_gmac_of_parse(struct ipq806x_gmac *gmac)struct device *dev = &gmac->pdev->dev; gmac->phy_mode =of_get_phy_mode (dev->of_node); -if (gmac->phy_mode <0 ) { +if ((int )gmac->phy_mode <0 ) {dev_err (dev,"missing phy mode property\n" );return ERR_PTR (-EINVAL ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/183 llc: fix another potential sk_buff leak in llc_ui_sendmsg()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit fc8d5db10cbe1338a52ebc74e7feab9276721774 ]
All callers of llc_conn_state_process() except llc_build_and_send_pkt() (via llc_ui_sendmsg() -> llc_ui_send_data()) assume that it always consumes a reference to the skb. Fix this caller to do the same.
--- net/llc/af_llc.c | 34 ++++++++++++++++++++-------------- net/llc/llc_conn.c | 2 ++ net/llc/llc_if.c | 12 ++++++++---- 3 files changed, 30 insertions(+), 18 deletions(-)
net/llc/af_llc.c +20 -14
@@ -111,22 +111,26 @@ static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)* * Send data via reliable llc2 connection. * Returns 0 upon success, non-zero if action did not succeed. +* +* This function always consumes a reference to the skb. */ static int llc_ui_send_data (struct sock * sk,struct sk_buff *skb,int noblock) {struct llc_sock * llc =llc_sk (sk); -int rc =0 ;if (unlikely (llc_data_accept_state (llc->state) || llc->remote_busy_flag || llc->p_flag)) {long timeout =sock_sndtimeo (sk, noblock); +int rc; rc =llc_ui_wait_for_busy_core (sk, timeout); +if (rc) { +kfree_skb (skb); +return rc; + } } -if (unlikely (!rc)) - rc =llc_build_and_send_pkt (sk, skb); -return rc; +return llc_build_and_send_pkt (sk, skb); }static void llc_ui_sk_init (struct socket *sock,struct sock *sk)
@@ -896,7 +900,7 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) DECLARE_SOCKADDR(struct sockaddr_llc *, addr, msg->msg_name);int flags = msg->msg_flags;int noblock = flags &MSG_DONTWAIT ; -struct sk_buff *skb; +struct sk_buff *skb =NULL ;size_t size =0 ;int rc = -EINVAL , copied =0 , hdrlen;
@@ -905,10 +909,10 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)lock_sock (sk);if (addr) {if (msg->msg_namelen <sizeof (*addr)) - goto release; + goto out; }else {if (llc_ui_addr_null (&llc->addr)) - goto release; + goto out; addr = &llc->addr; }/* must bind connection to sap if user hasn't done it. */
@@ -916,7 +920,7 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)/* bind to sap with null dev, exclusive. */ rc =llc_ui_autobind (sock, addr);if (rc) - goto release; + goto out; } hdrlen = llc->dev->hard_header_len +llc_ui_header_len (sk, addr); size = hdrlen + len;
@@ -925,12 +929,12 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) copied = size - hdrlen; rc = -EINVAL ;if (copied <0 ) - goto release; + goto out;release_sock (sk); skb =sock_alloc_send_skb (sk, size, noblock, &rc);lock_sock (sk);if (!skb) - goto release; + goto out; skb->dev = llc->dev; skb->protocol =llc_proto_type (addr->sllc_arphrd);skb_reserve (skb, hdrlen);
@@ -940,29 +944,31 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)if (sk->sk_type ==SOCK_DGRAM || addr->sllc_ua) {llc_build_and_send_ui_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; }if (addr->sllc_test) {llc_build_and_send_test_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; }if (addr->sllc_xid) {llc_build_and_send_xid_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; } rc = -ENOPROTOOPT ;if (!(sk->sk_type ==SOCK_STREAM && !addr->sllc_ua)) goto out; rc =llc_ui_send_data (sk, skb, noblock); + skb =NULL ; out: -if (rc) { -kfree_skb (skb); -release: +kfree_skb (skb); +if (rc)dprintk ("%s: failed sending from %02X to %02X: %d\n" , __func__, llc->laddr.lsap, llc->daddr.lsap, rc); - }release_sock (sk);return rc ? : copied; }
net/llc/llc_conn.c +2 -0
@@ -55,6 +55,8 @@ int sysctl_llc2_busy_timeout = LLC2_BUSY_TIME * HZ;* (executing it's actions and changing state), upper layer will be * indicated or confirmed, if needed. Returns 0 for success, 1 for * failure. The socket lock has to be held before calling this function. +* +* This function always consumes a reference to the skb. */ int llc_conn_state_process (struct sock *sk,struct sk_buff *skb) {
net/llc/llc_if.c +8 -4
@@ -38,6 +38,8 @@* closed and -EBUSY when sending data is not permitted in this state or * LLC has send an I pdu with p bit set to 1 and is waiting for it's * response. +* +* This function always consumes a reference to the skb. */ int llc_build_and_send_pkt (struct sock *sk,struct sk_buff *skb) {
@@ -46,20 +48,22 @@ int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)struct llc_sock *llc =llc_sk (sk);if (unlikely (llc->state ==LLC_CONN_STATE_ADM )) - goto out; + goto out_free; rc = -EBUSY ;if (unlikely (llc_data_accept_state (llc->state) ||/* data_conn_refuse */ llc->p_flag)) { llc->failed_data_req =1 ; - goto out; + goto out_free; } ev =llc_conn_ev (skb); ev->type =LLC_CONN_EV_TYPE_PRIM ; ev->prim =LLC_DATA_PRIM ; ev->prim_type =LLC_PRIM_TYPE_REQ ; skb->dev = llc->dev; - rc =llc_conn_state_process (sk, skb); -out: +return llc_conn_state_process (sk, skb); + +out_free: +kfree_skb (skb);return rc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/183 net: stmmac: fix length of PTP clocks name string
In reply to Greg Kroah-HartmanFrom: Antonio Borneo <[email protected]>
[ Upstream commit 5da202c88f8c355ad79bc2e8eb582e6d433060e7 ]
The field "name" in struct ptp_clock_info has a fixed size of 16 chars and is used as zero terminated string by clock_name_show() in drivers/ptp/ptp_sysfs.c
The current initialization value requires 17 chars to fit also the null termination, and this causes overflow to the next bytes in the struct when the string is read as null terminated:
hexdump -C /sys/class/ptp/ptp0/clock_name 00000000 73 74 6d 6d 61 63 5f 70 74 70 5f 63 6c 6f 63 6b |stmmac_ptp_clock| 00000010 a0 ac b9 03 0a |.....|
where the extra 4 bytes (excluding the newline) after the string represent the integer 0x03b9aca0 = 62500000 assigned to the field "max_adj" that follows "name" in the same struct.
There is no strict requirement for the "name" content and in the comment in ptp_clock_kernel.h it's reported it should just be 'A short "friendly name" to identify the clock'.
Replace it with "stmmac ptp".
--- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +1 -1
@@ -157,7 +157,7 @@ static int stmmac_enable(struct ptp_clock_info *ptp,/* structure describing a PTP hardware clock */ static struct ptp_clock_info stmmac_ptp_clock_ops = { .owner =THIS_MODULE , - .name ="stmmac_ptp_clock" , + .name ="stmmac ptp" , .max_adj =62500000 , .n_alarm =0 , .n_ext_ts =0 ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 145/183 llc: fix sk_buff refcounting in llc_conn_state_process()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 36453c852816f19947ca482a595dffdd2efa4965 ]
If llc_conn_state_process() sees that llc_conn_service() put the skb on a list, it will drop one fewer references to it. This is wrong because the current behavior is that llc_conn_service() never consumes a reference to the skb.
The code also makes the number of skb references being dropped conditional on which of ind_prim and cfm_prim are nonzero, yet neither of these affects how many references are *acquired*. So there is extra code that tries to fix this up by sometimes taking another reference.
Remove the unnecessary/broken refcounting logic and instead just add an skb_get() before the only two places where an extra reference is actually consumed.
--- net/llc/llc_conn.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-)
net/llc/llc_conn.c +6 -27
@@ -64,12 +64,6 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)struct llc_sock *llc =llc_sk (skb->sk);struct llc_conn_state_ev *ev =llc_conn_ev (skb); -/* -* We have to hold the skb, because llc_conn_service will kfree it in -* the sending path and we need to look at the skb->cb, where we encode -* llc_conn_state_ev. -*/ -skb_get (skb); ev->ind_prim = ev->cfm_prim =0 ;/* * Send event to state machine
@@ -77,21 +71,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb) rc =llc_conn_service (skb->sk, skb);if (unlikely (rc !=0 )) {printk (KERN_ERR "%s: llc_conn_service failed\n" , __func__); - goto out_kfree_skb; - } - -if (unlikely (!ev->ind_prim && !ev->cfm_prim)) { -/* indicate or confirm not required */ -if (!skb->next) - goto out_kfree_skb; goto out_skb_put; } -if (unlikely (ev->ind_prim && ev->cfm_prim))/* Paranoia */ -skb_get (skb); -switch (ev->ind_prim) {case LLC_DATA_PRIM : +skb_get (skb);llc_save_primitive (sk, skb,LLC_DATA_PRIM );if (unlikely (sock_queue_rcv_skb (sk, skb))) {/*
@@ -108,6 +93,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)* skb->sk pointing to the newly created struct sock in * llc_conn_handler. -acme */ +skb_get (skb);skb_queue_tail (&sk->sk_receive_queue, skb); sk->sk_state_change (sk);break ;
@@ -123,7 +109,6 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb) sk->sk_state_change (sk); } } -kfree_skb (skb);sock_put (sk);break ;case LLC_RESET_PRIM :
@@ -132,14 +117,11 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)* RESET is not being notified to upper layers for now */ printk (KERN_INFO "%s: received a reset ind!\n" , __func__); -kfree_skb (skb);break ;default : -if (ev->ind_prim) { +if (ev->ind_prim)printk (KERN_INFO "%s: received unknown %d prim!\n" , __func__, ev->ind_prim); -kfree_skb (skb); - }/* No indication */ break ; }
@@ -181,15 +163,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)printk (KERN_INFO "%s: received a reset conf!\n" , __func__);break ;default : -if (ev->cfm_prim) { +if (ev->cfm_prim)printk (KERN_INFO "%s: received unknown %d prim!\n" , __func__, ev->cfm_prim); -break ; - } - goto out_skb_put;/* No confirmation */ +/* No confirmation */ +break ; } -out_kfree_skb: -kfree_skb (skb); out_skb_put:kfree_skb (skb);return rc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 149/183 net: qca_spi: Move reset_count to struct qcaspi
In reply to Greg Kroah-HartmanFrom: Stefan Wahren <[email protected]>
[ Upstream commit bc19c32904e36548335b35fdce6ce734e20afc0a ]
The reset counter is specific for every QCA700x chip. So move this into the private driver struct. Otherwise we get unpredictable reset behavior in setups with multiple QCA700x chips.
--- drivers/net/ethernet/qualcomm/qca_spi.c | 9 ++++----- drivers/net/ethernet/qualcomm/qca_spi.h | 1 + 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/qualcomm/qca_spi.c +4 -5
@@ -438,7 +438,6 @@ qcaspi_qca7k_sync(struct qcaspi *qca, int event)u16 signature =0 ;u16 spi_config;u16 wrbuf_space =0 ; -static u16 reset_count;if (event ==QCASPI_EVENT_CPUON ) {/* Read signature twice, if not valid
@@ -491,13 +490,13 @@ qcaspi_qca7k_sync(struct qcaspi *qca, int event) qca->sync =QCASPI_SYNC_RESET ; qca->stats.trig_reset++; - reset_count =0 ; + qca->reset_count =0 ;break ;case QCASPI_SYNC_RESET : - reset_count++; + qca->reset_count++;netdev_dbg (qca->net_dev,"sync: waiting for CPU on, count %u.\n" , - reset_count); -if (reset_count >=QCASPI_RESET_TIMEOUT ) { + qca->reset_count); +if (qca->reset_count >=QCASPI_RESET_TIMEOUT ) {/* reset did not seem to take place, try again */ qca->sync =QCASPI_SYNC_UNKNOWN ; qca->stats.reset_timeout++;
drivers/net/ethernet/qualcomm/qca_spi.h +1 -0
@@ -97,6 +97,7 @@ struct qcaspi {unsigned int intr_req;unsigned int intr_svc; +u16 reset_count;#ifdef CONFIG_DEBUG_FS struct dentry *device_root;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/183 ALSA: aoa: onyx: always initialize register read value
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit f474808acb3c4b30552d9c59b181244e0300d218 ]
A lot of places in the driver use onyx_read_register() without checking the return value, and it's been working OK for ~10 years or so, so probably never fails ... Rather than trying to check the return value everywhere, which would be relatively intrusive, at least make sure we don't use an uninitialized value.
--- sound/aoa/codecs/onyx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/aoa/codecs/onyx.c +3 -1
@@ -74,8 +74,10 @@ static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value)return 0 ; } v =i2c_smbus_read_byte_data (onyx->i2c, reg); -if (v <0 ) +if (v <0 ) { + *value =0 ;return -1 ; + } *value = (u8 )v; onyx->cache[ONYX_REG_CONTROL -FIRSTREGISTER ] = *value;return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 115/183 x86/kgbd: Use NMI_VECTOR not APIC_DM_NMI
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 2591bc4e8d70b4e1330d327fb7e3921f4e070a51 ]
apic->send_IPI_allbutself() takes a vector number as argument.
APIC_DM_NMI is clearly not a vector number. It's defined to 0x400 which is outside the vector space.
Use NMI_VECTOR instead as that's what it is intended to be.
--- arch/x86/kernel/kgdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/kgdb.c +1 -1
@@ -437,7 +437,7 @@ static void kgdb_disable_hw_debug(struct pt_regs *regs)*/ void kgdb_roundup_cpus (unsigned long flags) { - apic->send_IPI_allbutself (APIC_DM_NMI ); + apic->send_IPI_allbutself (NMI_VECTOR ); }#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/183 ext4: set error return correctly when ext4_htree_store_dirent fails
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 7a14826ede1d714f0bb56de8167c0e519041eeda ]
Currently when the call to ext4_htree_store_dirent fails the error return variable 'ret' is is not being set to the error code and variable count is instead, hence the error code is not being returned. Fix this by assigning ret to the error return code.
Addresses-Coverity: ("Unused value")
--- fs/ext4/inline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/inline.c +1 -1
@@ -1418,7 +1418,7 @@ int htree_inlinedir_to_tree(struct file *dir_file, err =ext4_htree_store_dirent (dir_file, hinfo->hash, hinfo->minor_hash, de, &tmp_str);if (err) { - count = err; + ret = err; goto out; } count++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/183 ASoC: es8328: Fix copy-paste error in es8328_right_line_controls
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 630742c296341a8cfe00dfd941392025ba8dd4e8 ]
It seems 'es8328_rline_enum' should be used
in es8328_right_line_controls
--- sound/soc/codecs/es8328.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/es8328.c +1 -1
@@ -210,7 +210,7 @@ static const struct soc_enum es8328_rline_enum =ARRAY_SIZE (es8328_line_texts), es8328_line_texts);static const struct snd_kcontrol_new es8328_right_line_controls = -SOC_DAPM_ENUM ("Route" , es8328_lline_enum); +SOC_DAPM_ENUM ("Route" , es8328_rline_enum);/* Left Mixer */ static const struct snd_kcontrol_new es8328_left_mixer_controls[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/183 scsi: libfc: fix null pointer dereference on a null lport
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 41a6bf6529edd10a6def42e3b2c34a7474bcc2f5 ]
Currently if lport is null then the null lport pointer is dereference when printing out debug via the FC_LPORT_DB macro. Fix this by using the more generic FC_LIBFC_DBG debug macro instead that does not use lport.
Addresses-Coverity: ("Dereference after null check")
--- drivers/scsi/libfc/fc_exch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/libfc/fc_exch.c +1 -1
@@ -2499,7 +2499,7 @@ void fc_exch_recv(struct fc_lport *lport, struct fc_frame *fp)/* lport lock ? */ if (!lport || lport->state ==LPORT_ST_DISABLED ) { -FC_LPORT_DBG (lport,"Receiving frames for an lport that " +FC_LIBFC_DBG ("Receiving frames for an lport that " "has not been initialized correctly\n" );fc_frame_free (fp);return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 151/183 media: ov6650: Fix some format attributes not under control
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 1c6a2b63095154bbf9e8f38d79487a728331bf65 ]
User arguments passed to .get/set_fmt() pad operation callbacks may contain unsupported values. The driver takes control over frame size and pixel code as well as colorspace and field attributes but has never cared for remainig format attributes, i.e., ycbcr_enc, quantization and xfer_func, introduced by commit 11ff030c7365 ("[media]
v4l2-mediabus: improve colorspace support"). Fix it.
Set up a static v4l2_mbus_framefmt structure with attributes initialized to reasonable defaults and use it for updating content of user provided arguments. In case of V4L2_SUBDEV_FORMAT_ACTIVE, postpone frame size update, now performed from inside ov6650_s_fmt() helper, util the user argument is first updated in ov6650_set_fmt() with default frame format content. For V4L2_SUBDEV_FORMAT_TRY, don't copy all attributes to pad config, only those handled by the driver, then fill the response with the default frame format updated with resulting pad config format code and frame size.
--- drivers/media/i2c/soc_camera/ov6650.c | 51 ++++++++++++++++++++------- 1 file changed, 39 insertions(+), 12 deletions(-)
drivers/media/i2c/soc_camera/ov6650.c +39 -12
@@ -215,6 +215,17 @@ static u32 ov6650_codes[] = { MEDIA_BUS_FMT_Y8_1X8, }; +static const struct v4l2_mbus_framefmt ov6650_def_fmt = { + .width =W_CIF , + .height =H_CIF , + .code =MEDIA_BUS_FMT_SBGGR8_1X8 , + .colorspace =V4L2_COLORSPACE_SRGB , + .field =V4L2_FIELD_NONE , + .ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT , + .quantization =V4L2_QUANTIZATION_DEFAULT , + .xfer_func =V4L2_XFER_FUNC_DEFAULT , +}; +/* read a register */ static int ov6650_reg_read (struct i2c_client *client,u8 reg,u8 *val) {
@@ -509,11 +520,13 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd,if (format->pad)return -EINVAL ; +/* initialize response with default media bus frame format */ + *mf = ov6650_def_fmt; + +/* update media bus format code and frame size */ mf->width = priv->rect.width >> priv->half_scale; mf->height = priv->rect.height >> priv->half_scale; mf->code = priv->code; - mf->colorspace =V4L2_COLORSPACE_SRGB ; - mf->field =V4L2_FIELD_NONE ;return 0 ; }
@@ -677,10 +690,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)if (!ret) priv->code = code; -if (!ret) { - mf->width = priv->rect.width >> half_scale; - mf->height = priv->rect.height >> half_scale; - }return ret; }
@@ -699,9 +708,6 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,v4l_bound_align_image (&mf->width,2 ,W_CIF ,1 , &mf->height,2 ,H_CIF ,1 ,0 ); - mf->field =V4L2_FIELD_NONE ; - mf->colorspace =V4L2_COLORSPACE_SRGB ; -switch (mf->code) {case MEDIA_BUS_FMT_Y10_1X10 : mf->code =MEDIA_BUS_FMT_Y8_1X8 ;
@@ -717,10 +723,31 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,break ; } -if (format->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) -return ov6650_s_fmt (sd, mf); - cfg->try_fmt = *mf; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { +/* store media bus format code and frame size in pad config */ + cfg->try_fmt.width = mf->width; + cfg->try_fmt.height = mf->height; + cfg->try_fmt.code = mf->code; +/* return default mbus frame format updated with pad config */ + *mf = ov6650_def_fmt; + mf->width = cfg->try_fmt.width; + mf->height = cfg->try_fmt.height; + mf->code = cfg->try_fmt.code; + + }else { +/* apply new media bus format code and frame size */ +int ret =ov6650_s_fmt (sd, mf); + +if (ret) +return ret; + +/* return default format updated with active size and code */ + *mf = ov6650_def_fmt; + mf->width = priv->rect.width >> priv->half_scale; + mf->height = priv->rect.height >> priv->half_scale; + mf->code = priv->code; + }return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/183 firestream: fix memory leaks
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit fa865ba183d61c1ec8cbcab8573159c3b72b89a4 ]
In fs_open(), 'vcc' is allocated through kmalloc() and assigned to 'atm_vcc->dev_data.' In the following execution, if an error occurs, e.g., there is no more free channel, an error code EBUSY or ENOMEM will be returned. However, 'vcc' is not deallocated, leading to memory leaks. Note that, in normal cases where fs_open() returns 0, 'vcc' will be deallocated in fs_close(). But, if fs_open() fails, there is no guarantee that fs_close() will be invoked.
To fix this issue, deallocate 'vcc' before the error code is returned.
--- drivers/atm/firestream.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/atm/firestream.c +3 -0
@@ -923,6 +923,7 @@ static int fs_open(struct atm_vcc *atm_v }if (!to) {printk ("No more free channels for FS50..\n" ); +kfree (vcc);return -EBUSY ; } vcc->channo = dev->channo;
@@ -933,6 +934,7 @@ static int fs_open(struct atm_vcc *atm_vif (((DO_DIRECTION (rxtp) && dev->atm_vccs[vcc->channo])) || (DO_DIRECTION (txtp) &&test_bit (vcc->channo, dev->tx_inuse))) {printk ("Channel is in use for FS155.\n" ); +kfree (vcc);return -EBUSY ; } }
@@ -946,6 +948,7 @@ static int fs_open(struct atm_vcc *atm_v tc, sizeof (struct fs_transmit_config));if (!tc) {fs_dprintk (FS_DEBUG_OPEN ,"fs: can't alloc transmit_config.\n" ); +kfree (vcc);return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 165/183 net: usb: lan78xx: Add .ndo_features_check
In reply to Greg Kroah-HartmanFrom: James Hughes <[email protected]>
[ Upstream commit ce896476c65d72b4b99fa09c2f33436b4198f034 ]
As reported by Eric Dumazet, there are still some outstanding cases where the driver does not handle TSO correctly when skb's are over a certain size. Most cases have been fixed, this patch should ensure that forwarded SKB's that are greater than MAX_SINGLE_PACKET_SIZE - TX_OVERHEAD are software segmented and handled correctly.
--- drivers/net/usb/lan78xx.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/usb/lan78xx.c +15 -0
@@ -30,6 +30,7 @@#include <linux/ipv6.h> #include <linux/mdio.h> #include <net/ip6_checksum.h> +#include <net/vxlan.h> #include <linux/microchipphy.h> #include "lan78xx.h"
@@ -2893,6 +2894,19 @@ void lan78xx_tx_timeout(struct net_devictasklet_schedule (&dev->bh); } +static netdev_features_t lan78xx_features_check (struct sk_buff *skb, +struct net_device *netdev, +netdev_features_t features) +{ +if (skb->len +TX_OVERHEAD >MAX_SINGLE_PACKET_SIZE ) + features &= ~NETIF_F_GSO_MASK ; + + features =vlan_features_check (skb, features); + features =vxlan_features_check (skb, features); + +return features; +} +static const struct net_device_ops lan78xx_netdev_ops = { .ndo_open = lan78xx_open, .ndo_stop = lan78xx_stop,
@@ -2906,6 +2920,7 @@ static const struct net_device_ops lan78 .ndo_set_features = lan78xx_set_features, .ndo_vlan_rx_add_vid = lan78xx_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = lan78xx_vlan_rx_kill_vid, + .ndo_features_check = lan78xx_features_check, }; static int lan78xx_probe(struct usb_interface *intf,
Greg Kroah-Hartman
maintainerPATCH 163/183 net, ip_tunnel: fix namespaces move
In reply to Greg Kroah-HartmanFrom: William Dauchy <[email protected]>
[ Upstream commit d0f418516022c32ecceaf4275423e5bd3f8743a9 ]
in the same manner as commit 690afc165bb3 ("net: ip6_gre: fix moving ip6gre between namespaces"), fix namespace moving as it was broken since commit 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata."). Indeed, the ip6_gre commit removed the local flag for collect_md condition, so there is no reason to keep it for ip_gre/ip_tunnel.
this patch will fix both ip_tunnel and ip_gre modules.
--- net/ipv4/ip_tunnel.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/ipv4/ip_tunnel.c +1 -3
@@ -1151,10 +1151,8 @@ int ip_tunnel_init(struct net_device *de iph->version =4 ; iph->ihl =5 ; -if (tunnel->collect_md) { - dev->features |=NETIF_F_NETNS_LOCAL ; +if (tunnel->collect_md)netif_keep_dst (dev); - }return 0 ; }EXPORT_SYMBOL_GPL (ip_tunnel_init);
Greg Kroah-Hartman
maintainerPATCH 166/183 hwmon: (adt7475) Make volt2reg return same reg as reg2volt input
In reply to Greg Kroah-HartmanFrom: Luuk Paulussen <[email protected]>
commit cf3ca1877574a306c0207cbf7fdf25419d9229df upstream.
reg2volt returns the voltage that matches a given register value. Converting this back the other way with volt2reg didn't return the same register value because it used truncation instead of rounding.
This meant that values read from sysfs could not be written back to sysfs to set back the same register value.
With this change, volt2reg will return the same value for every voltage previously returned by reg2volt (for the set of possible input values)
--- drivers/hwmon/adt7475.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/hwmon/adt7475.c +3 -2
@@ -268,9 +268,10 @@ static inline u16 volt2reg(int channel,long reg;if (bypass_attn & (1 << channel)) - reg = (volt *1024 ) /2250 ; + reg =DIV_ROUND_CLOSEST (volt *1024 ,2250 );else - reg = (volt * r[1 ] *1024 ) / ((r[0 ] + r[1 ]) *2250 ); + reg =DIV_ROUND_CLOSEST (volt * r[1 ] *1024 , + (r[0 ] + r[1 ]) *2250 );return clamp_val (reg,0 ,1023 ) & (0xff <<2 ); }
Greg Kroah-Hartman
maintainerPATCH 168/183 ARM: 8950/1: ftrace/recordmcount: filter relocation types
In reply to Greg Kroah-HartmanFrom: Alex Sverdlin <[email protected]>
commit 927d780ee371d7e121cea4fc7812f6ef2cea461c upstream.
Scenario 1, ARMv7
=================
If code in arch/arm/kernel/ftrace.c would operate on mcount() pointer the following may be generated:
00000230 <prealloc_fixed_plts>:
230: b5f8 push {r3, r4, r5, r6, r7, lr}
232: b500 push {lr}
234: f7ff fffe bl 0 <__gnu_mcount_nc>
234: R_ARM_THM_CALL __gnu_mcount_nc
238: f240 0600 movw r6, #0
238: R_ARM_THM_MOVW_ABS_NC __gnu_mcount_nc 23c: f8d0 1180 ldr.w r1, [r0, #384] ; 0x180
FTRACE currently is not able to deal with it:
WARNING: CPU: 0 PID: 0 at .../kernel/trace/ftrace.c:1979 ftrace_bug+0x1ad/0x230() ... CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.4.116-... #1
...
[<c0314e3d>] (unwind_backtrace) from [<c03115e9>] (show_stack+0x11/0x14) [<c03115e9>] (show_stack) from [<c051a7f1>] (dump_stack+0x81/0xa8) [<c051a7f1>] (dump_stack) from [<c0321c5d>] (warn_slowpath_common+0x69/0x90) [<c0321c5d>] (warn_slowpath_common) from [<c0321cf3>] (warn_slowpath_null+0x17/0x1c) [<c0321cf3>] (warn_slowpath_null) from [<c038ee9d>] (ftrace_bug+0x1ad/0x230) [<c038ee9d>] (ftrace_bug) from [<c038f1f9>] (ftrace_process_locs+0x27d/0x444) [<c038f1f9>] (ftrace_process_locs) from [<c08915bd>] (ftrace_init+0x91/0xe8) [<c08915bd>] (ftrace_init) from [<c0885a67>] (start_kernel+0x34b/0x358) [<c0885a67>] (start_kernel) from [<00308095>] (0x308095)
---[ end trace cb88537fdc8fa200 ]--- ftrace failed to modify [<c031266c>] prealloc_fixed_plts+0x8/0x60 actual: 44:f2:e1:36
ftrace record flags: 0
(0) expected tramp: c03143e9
Scenario 2, ARMv4T
==================
ftrace: allocating 14435 entries in 43 pages
------------[ cut here ]------------ WARNING: CPU: 0 PID: 0 at kernel/trace/ftrace.c:2029 ftrace_bug+0x204/0x310 CPU: 0 PID: 0 Comm: swapper Not tainted 4.19.5 #1 Hardware name: Cirrus Logic EDB9302 Evaluation Board [<c0010a24>] (unwind_backtrace) from [<c000ecb0>] (show_stack+0x20/0x2c) [<c000ecb0>] (show_stack) from [<c03c72e8>] (dump_stack+0x20/0x30) [<c03c72e8>] (dump_stack) from [<c0021c18>] (__warn+0xdc/0x104) [<c0021c18>] (__warn) from [<c0021d7c>] (warn_slowpath_null+0x4c/0x5c) [<c0021d7c>] (warn_slowpath_null) from [<c0095360>] (ftrace_bug+0x204/0x310) [<c0095360>] (ftrace_bug) from [<c04dabac>] (ftrace_init+0x3b4/0x4d4) [<c04dabac>] (ftrace_init) from [<c04cef4c>] (start_kernel+0x20c/0x410) [<c04cef4c>] (start_kernel) from [<00000000>] ( (null)) ---[ end trace 0506a2f5dae6b341 ]--- ftrace failed to modify [<c000c350>] perf_trace_sys_exit+0x5c/0xe8 actual: 1e:ff:2f:e1
Initializing ftrace call sites
ftrace record flags: 0
(0)
expected tramp: c000fb24
The analysis for this problem has been already performed previously, refer to the link below.
Fix the above problems by allowing only selected reloc types in __mcount_loc. The list itself comes from the legacy recordmcount.pl script.
--- scripts/recordmcount.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
scripts/recordmcount.c +17 -0
@@ -53,6 +53,10 @@#define R_AARCH64_ABS64 257#endif +#define R_ARM_PC24 1 +#define R_ARM_THM_CALL 10 +#define R_ARM_CALL 28 +static int fd_map;/* File descriptor for file being modified. */ static int mmap_failed;/* Boolean flag. */ static char gpfx;/* prefix for global symbol name (sometimes '_') */
@@ -372,6 +376,18 @@ is_mcounted_section_name(char const *con#define RECORD_MCOUNT_64 #include "recordmcount.h" +static int arm_is_fake_mcount (Elf32_Rel const *rp) +{ +switch (ELF32_R_TYPE (w (rp->r_info))) { +case R_ARM_THM_CALL : +case R_ARM_CALL : +case R_ARM_PC24 : +return 0 ; + } + +return 1 ; +} +/* 64-bit EM_MIPS has weird ELF64_Rela.r_info. * http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf * We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40]
@@ -461,6 +477,7 @@ do_file(char const *const fname)break ;case EM_ARM : reltype =R_ARM_ABS32 ; altmcount ="__gnu_mcount_nc" ; + is_fake_mcount32 = arm_is_fake_mcount;break ;case EM_AARCH64 : reltype =R_AARCH64_ABS64 ;
Greg Kroah-Hartman
maintainerPATCH 169/183 mmc: sdhci: fix minimum clock rate for v3 controller
In reply to Greg Kroah-HartmanFrom: Michał Mirosław <[email protected]>
commit 2a187d03352086e300daa2044051db00044cd171 upstream.
For SDHCIv3+ with programmable clock mode, minimal clock frequency is still base clock / max(divider). Minimal programmable clock frequency is always greater than minimal divided clock frequency. Without this patch, SDHCI uses out-of-spec initial frequency when multiplier is big enough:
mmc1: mmc_rescan_try_freq: trying to init card at 468750 Hz [for 480 MHz source clock divided by 1024]
The code in sdhci_calc_clk() already chooses a correct SDCLK clock mode.
--- drivers/mmc/host/sdhci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci.c +6 -4
@@ -3096,11 +3096,13 @@ int sdhci_add_host(struct sdhci_host *hoif (host->ops->get_min_clock) mmc->f_min = host->ops->get_min_clock (host);else if (host->version >=SDHCI_SPEC_300 ) { -if (host->clk_mul) { - mmc->f_min = (host->max_clk * host->clk_mul) /1024 ; +if (host->clk_mul) max_clk = host->max_clk * host->clk_mul; - }else - mmc->f_min = host->max_clk /SDHCI_MAX_DIV_SPEC_300 ; +/* +* Divided Clock Mode minimum clock rate is always less than +* Programmable Clock Mode minimum clock rate. +*/ + mmc->f_min = host->max_clk /SDHCI_MAX_DIV_SPEC_300 ; }else mmc->f_min = host->max_clk /SDHCI_MAX_DIV_SPEC_200 ;
Greg Kroah-Hartman
maintainerPATCH 170/183 Input: sur40 - fix interface sanity checks
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 6b32391ed675827f8425a414abbc6fbd54ea54fe upstream.
Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface.
This in turn could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/input/touchscreen/sur40.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/touchscreen/sur40.c +1 -1
@@ -496,7 +496,7 @@ static int sur40_probe(struct usb_interfint error;/* Check if we really have the right interface. */ - iface_desc = &interface->altsetting[0 ]; + iface_desc = interface->cur_altsetting;if (iface_desc->desc.bInterfaceClass !=0xFF )return -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 171/183 Input: gtco - fix endpoint sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit a8eeb74df5a6bdb214b2b581b14782c5f5a0cf83 upstream.
The driver was checking the number of endpoints of the first alternate setting instead of the current one, something which could lead to the driver binding to an invalid interface.
This in turn could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/input/tablet/gtco.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/input/tablet/gtco.c +3 -7
@@ -876,18 +876,14 @@ static int gtco_probe(struct usb_interfa }/* Sanity check that a device has an endpoint */ -if (usbinterface->altsetting[0 ].desc.bNumEndpoints <1 ) { +if (usbinterface->cur_altsetting->desc.bNumEndpoints <1 ) {dev_err (&usbinterface->dev,"Invalid number of endpoints\n" ); error = -EINVAL ; goto err_free_urb; } -/* -* The endpoint is always altsetting 0, we know this since we know -* this device only has one interrupt endpoint -*/ - endpoint = &usbinterface->altsetting[0 ].endpoint[0 ].desc; + endpoint = &usbinterface->cur_altsetting->endpoint[0 ].desc;/* Some debug */ dev_dbg (&usbinterface->dev,"gtco # interfaces: %d\n" , usbinterface->num_altsetting);
@@ -974,7 +970,7 @@ static int gtco_probe(struct usb_interfa input_dev->dev.parent = &usbinterface->dev;/* Setup the URB, it will be posted later on open of input device */ - endpoint = &usbinterface->altsetting[0 ].endpoint[0 ].desc; + endpoint = &usbinterface->cur_altsetting->endpoint[0 ].desc; usb_fill_int_urb(gtco->urbinfo, gtco->usbdev,
Greg Kroah-Hartman
maintainerPATCH 172/183 Input: aiptek - fix endpoint sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 3111491fca4f01764e0c158c5e0f7ced808eef51 upstream.
The driver was checking the number of endpoints of the first alternate setting instead of the current one, something which could lead to the driver binding to an invalid interface.
This in turn could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/input/tablet/aiptek.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/input/tablet/aiptek.c +3 -3
@@ -1820,14 +1820,14 @@ aiptek_probe(struct usb_interface *intf,input_set_abs_params (inputdev,ABS_WHEEL ,AIPTEK_WHEEL_MIN ,AIPTEK_WHEEL_MAX -1 ,0 ,0 );/* Verify that a device really has an endpoint */ -if (intf->altsetting[0 ].desc.bNumEndpoints <1 ) { +if (intf->cur_altsetting->desc.bNumEndpoints <1 ) {dev_err (&intf->dev,"interface has %d endpoints, but must have minimum 1\n" , - intf->altsetting[0 ].desc.bNumEndpoints); + intf->cur_altsetting->desc.bNumEndpoints); err = -EINVAL ; goto fail3; } - endpoint = &intf->altsetting[0 ].endpoint[0 ].desc; + endpoint = &intf->cur_altsetting->endpoint[0 ].desc;/* Go set up our URB, which is called when the tablet receives * input.
Greg Kroah-Hartman
maintainerPATCH 173/183 hwmon: (nct7802) Fix voltage limits to wrong registers
In reply to Greg Kroah-HartmanFrom: Gilles Buloz <[email protected]>
commit 7713e62c8623c54dac88d1fa724aa487a38c3efb upstream.
in0 thresholds are written to the in2 thresholds registers in2 thresholds to in3 thresholds
in3 thresholds to in4 thresholds
in4 thresholds to in0 thresholds
--- drivers/hwmon/nct7802.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/nct7802.c +2 -2
@@ -32,8 +32,8 @@static const u8 REG_VOLTAGE [5 ] = {0x09 ,0x0a ,0x0c ,0x0d ,0x0e };static const u8 REG_VOLTAGE_LIMIT_LSB [2 ][5 ] = { - {0x40 ,0x00 ,0x42 ,0x44 ,0x46 }, - {0x3f ,0x00 ,0x41 ,0x43 ,0x45 }, + {0x46 ,0x00 ,0x40 ,0x42 ,0x44 }, + {0x45 ,0x00 ,0x3f ,0x41 ,0x43 }, };static const u8 REG_VOLTAGE_LIMIT_MSB [5 ] = {0x48 ,0x00 ,0x47 ,0x47 ,0x48 };
Greg Kroah-Hartman
maintainerPATCH 174/183 scsi: RDMA/isert: Fix a recently introduced regression related to logout
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
commit 04060db41178c7c244f2c7dcd913e7fd331de915 upstream.
iscsit_close_connection() calls isert_wait_conn(). Due to commit e9d3009cb936 both functions call target_wait_for_sess_cmds() although that last function should be called only once. Fix this by removing the target_wait_for_sess_cmds() call from isert_wait_conn() and by only calling isert_wait_conn() after target_wait_for_sess_cmds().
--- drivers/infiniband/ulp/isert/ib_isert.c | 12 ------------ drivers/target/iscsi/iscsi_target.c | 6 +++--- 2 files changed, 3 insertions(+), 15 deletions(-)
drivers/infiniband/ulp/isert/ib_isert.c +0 -12
@@ -3278,17 +3278,6 @@ isert_wait4logout(struct isert_conn *ise }static void -isert_wait4cmds (struct iscsi_conn *conn) -{ -isert_info ("iscsi_conn %p\n" , conn); - -if (conn->sess) { -target_sess_cmd_list_set_waiting (conn->sess->se_sess); -target_wait_for_sess_cmds (conn->sess->se_sess); - } -} - -static void isert_wait4flush (struct isert_conn *isert_conn) {struct ib_recv_wr *bad_wr;
@@ -3361,7 +3350,6 @@ static void isert_wait_conn(struct iscsiisert_wait4flush (isert_conn);isert_put_unsol_pending_cmds (conn); -isert_wait4cmds (conn);isert_wait4logout (isert_conn);queue_work (isert_release_wq, &isert_conn->release_work);
drivers/target/iscsi/iscsi_target.c +3 -3
@@ -4309,9 +4309,6 @@ int iscsit_close_connection(iscsit_stop_nopin_response_timer (conn);iscsit_stop_nopin_timer (conn); -if (conn->conn_transport->iscsit_wait_conn) - conn->conn_transport->iscsit_wait_conn (conn); -/* * During Connection recovery drop unacknowledged out of order * commands for this connection, and prepare the other commands
@@ -4397,6 +4394,9 @@ int iscsit_close_connection(target_sess_cmd_list_set_waiting (sess->se_sess);target_wait_for_sess_cmds (sess->se_sess); +if (conn->conn_transport->iscsit_wait_conn) + conn->conn_transport->iscsit_wait_conn (conn); +if (conn->conn_rx_hash.tfm)crypto_free_hash (conn->conn_rx_hash.tfm);if (conn->conn_tx_hash.tfm)
Greg Kroah-Hartman
maintainerPATCH 175/183 tracing: xen: Ordered comparison of function pointers
In reply to Greg Kroah-HartmanFrom: Changbin Du <[email protected]>
commit d0695e2351102affd8efae83989056bc4b275917 upstream.
Just as commit 0566e40ce7 ("tracing: initcall: Ordered comparison of function pointers"), this patch fixes another remaining one in xen.h found by clang-9.
In file included from arch/x86/xen/trace.c:21:
In file included from ./include/trace/events/xen.h:475:
In file included from ./include/trace/define_trace.h:102:
In file included from ./include/trace/trace_events.h:473:./include/trace/events/xen.h:69:7: warning: ordered comparison of function \
pointers ('xen_mc_callback_fn_t' (aka 'void (*)(void *)') and 'xen_mc_callback_fn_t') [-Wordered-compare-function-pointers]
__field(xen_mc_callback_fn_t, fn)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/trace/trace_events.h:421:29: note: expanded from macro '__field'
^
./include/trace/trace_events.h:407:6: note: expanded from macro '__field_ext'
is_signed_type(type), filter_type); \
^
./include/linux/trace_events.h:554:44: note: expanded from macro 'is_signed_type'
^--- include/trace/events/xen.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/trace/events/xen.h +5 -1
@@ -63,7 +63,11 @@ TRACE_EVENT(xen_mc_callback, TP_PROTO(xen_mc_callback_fn_t fn, void *data),TP_ARGS (fn, data),TP_STRUCT__entry ( - __field(xen_mc_callback_fn_t, fn) +/* +* Use field_struct to avoid is_signed_type() +* comparison of a function pointer. +*/ + __field_struct(xen_mc_callback_fn_t, fn)__field (void *,data ) ), TP_fast_assign(
Greg Kroah-Hartman
maintainerPATCH 176/183 do_last(): fetch directory ->i_mode and ->i_uid before its too late
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit d0cb50185ae942b03c4327be322055d622dc79f6 upstream.
may_create_in_sticky() call is done when we already have dropped the reference to dir.
--- fs/namei.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
fs/namei.c +10 -7
@@ -988,7 +988,8 @@ static int may_linkat(struct path *link)* may_create_in_sticky - Check whether an O_CREAT open in a sticky directory * should be allowed, or not, on files that already * exist. -* @dir: the sticky parent directory +* @dir_mode: mode bits of directory +* @dir_uid: owner of directory * @inode: the inode of the file to open * * Block an O_CREAT open of a FIFO (or a regular file) when:
@@ -1004,18 +1005,18 @@ static int may_linkat(struct path *link)* * Returns 0 if the open is allowed, -ve on error. */ -static int may_create_in_sticky (struct dentry *const dir, +static int may_create_in_sticky (umode_t dir_mode,kuid_t dir_uid,struct inode *const inode) {if ((!sysctl_protected_fifos &&S_ISFIFO (inode->i_mode)) || (!sysctl_protected_regular &&S_ISREG (inode->i_mode)) || -likely (!(dir->d_inode->i_mode &S_ISVTX )) || -uid_eq (inode->i_uid, dir->d_inode->i_uid) || +likely (!(dir_mode &S_ISVTX )) || +uid_eq (inode->i_uid, dir_uid) ||uid_eq (current_fsuid (), inode->i_uid))return 0 ; -if (likely (dir->d_inode->i_mode &0002 ) || - (dir->d_inode->i_mode &0020 && +if (likely (dir_mode &0002 ) || + (dir_mode &0020 && ((sysctl_protected_fifos >=2 &&S_ISFIFO (inode->i_mode)) || (sysctl_protected_regular >=2 &&S_ISREG (inode->i_mode))))) {return -EACCES ;
@@ -3059,6 +3060,8 @@ static int do_last(struct nameidata *nd, int *opened) {struct dentry *dir = nd->path.dentry; +kuid_t dir_uid = dir->d_inode->i_uid; +umode_t dir_mode = dir->d_inode->i_mode;int open_flag = op->open_flag;bool will_truncate = (open_flag &O_TRUNC ) !=0 ;bool got_write = false;
@@ -3211,7 +3214,7 @@ finish_open: error = -EISDIR ;if (d_is_dir (nd->path.dentry)) goto out; - error =may_create_in_sticky (dir, + error =may_create_in_sticky (dir_mode, dir_uid,d_backing_inode (nd->path.dentry));if (unlikely (error)) goto out;
Greg Kroah-Hartman
maintainerPATCH 177/183 iio: buffer: align the size of scan bytes to size of the largest element
In reply to Greg Kroah-HartmanFrom: Lars Möllendorf <[email protected]>
commit 883f616530692d81cb70f8a32d85c0d2afc05f69 upstream.
Previous versions of iio_compute_scan_bytes only aligned each element to its own length (i.e. its own natural alignment). Because multiple consecutive sets of scan elements are buffered this does not work in case the computed scan bytes do not align with the natural alignment of the first scan element in the set.
This commit fixes this by aligning the scan bytes to the natural alignment of the largest scan element in the set.
--- drivers/iio/industrialio-buffer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iio/industrialio-buffer.c +5 -1
@@ -527,7 +527,7 @@ static int iio_compute_scan_bytes(struct {const struct iio_chan_spec *ch;unsigned bytes =0 ; -int length, i; +int length, i, largest =0 ;/* How much space will the demuxed element take? */ for_each_set_bit(i, mask,
@@ -540,6 +540,7 @@ static int iio_compute_scan_bytes(struct length = ch->scan_type.storagebits /8 ; bytes =ALIGN (bytes, length); bytes += length; + largest =max (largest, length); }if (timestamp) { ch = iio_find_channel_from_si(indio_dev,
@@ -551,7 +552,10 @@ static int iio_compute_scan_bytes(struct length = ch->scan_type.storagebits /8 ; bytes =ALIGN (bytes, length); bytes += length; + largest =max (largest, length); } + + bytes =ALIGN (bytes, largest);return bytes; }
Greg Kroah-Hartman
maintainerPATCH 179/183 md: Avoid namespace collision with bitmap API
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
commit e64e4018d572710c44f42c923d4ac059f0a23320 upstream.
bitmap API (include/linux/bitmap.h) has 'bitmap' prefix for its methods.
On the other hand MD bitmap API is special case. Adding 'md' prefix to it to avoid name space collision.
No functional changes intended.
--- drivers/md/bitmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/md/bitmap.c +4 -4
@@ -1671,7 +1671,7 @@ void bitmap_flush(struct mddev *mddev)/* * free memory that was allocated */ -static void bitmap_free (struct bitmap *bitmap) +static void md_bitmap_free (struct bitmap *bitmap) {unsigned long k, pages;struct bitmap_page *bp;
@@ -1721,7 +1721,7 @@ void bitmap_destroy(struct mddev *mddev)if (bitmap->sysfs_can_clear)sysfs_put (bitmap->sysfs_can_clear); -bitmap_free (bitmap); +md_bitmap_free (bitmap); }/*
@@ -1805,7 +1805,7 @@ struct bitmap *bitmap_create(struct mddereturn bitmap; error: -bitmap_free (bitmap); +md_bitmap_free (bitmap);return ERR_PTR (err); }
@@ -1904,7 +1904,7 @@ int bitmap_copy_from_slot(struct mddev * *low = lo; *high = hi; err: -bitmap_free (bitmap); +md_bitmap_free (bitmap);return rv; }EXPORT_SYMBOL_GPL (bitmap_copy_from_slot);
Greg Kroah-Hartman
maintainerPATCH 178/183 scsi: iscsi: Avoid potential deadlock in iscsi_if_rx func
In reply to Greg Kroah-HartmanFrom: Bo Wu <[email protected]>
commit bba340c79bfe3644829db5c852fdfa9e33837d6d upstream.
In iscsi_if_rx func, after receiving one request through iscsi_if_recv_msg func, iscsi_if_send_reply will be called to try to reply to the request in a do-while loop. If the iscsi_if_send_reply function keeps returning -EAGAIN, a deadlock will occur.
For example, a client only send msg without calling recvmsg func, then it will result in the watchdog soft lockup. The details are given as follows:
sock_fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ISCSI);
retval = bind(sock_fd, (struct sock addr*) & src_addr, sizeof(src_addr);
while (1) {
state_msg = sendmsg(sock_fd, &msg, 0);
//Note: recvmsg(sock_fd, &msg, 0) is not processed here.
}
close(sock_fd);watchdog: BUG: soft lockup - CPU#7 stuck for 22s! [netlink_test:253305] Sample time: 4000897528 ns(HZ: 250) Sample stat:
curr: user: 675503481560, nice: 321724050, sys: 448689506750, idle: 4654054240530, iowait: 40885550700, irq: 14161174020, softirq: 8104324140, st: 0
deta: user: 0, nice: 0, sys: 3998210100, idle: 0, iowait: 0, irq: 1547170, softirq: 242870, st: 0 Sample softirq:
TIMER: 992
SCHED: 8
Sample irqstat:
irq 2: delta 1003, curr: 3103802, arch_timer
CPU: 7 PID: 253305 Comm: netlink_test Kdump: loaded Tainted: G OE
Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015
pstate: 40400005 (nZcv daif +PAN -UAO)
pc : __alloc_skb+0x104/0x1b0
lr : __alloc_skb+0x9c/0x1b0sp : ffff000033603a30
x29: ffff000033603a30 x28: 00000000000002dd
x27: ffff800b34ced810 x26: ffff800ba7569f00
x25: 00000000ffffffff x24: 0000000000000000
x23: ffff800f7c43f600 x22: 0000000000480020
x21: ffff0000091d9000 x20: ffff800b34eff200
x19: ffff800ba7569f00 x18: 0000000000000000
x17: 0000000000000000 x16: 0000000000000000
x15: 0000000000000000 x14: 0001000101000100
x13: 0000000101010000 x12: 0101000001010100
x11: 0001010101010001 x10: 00000000000002dd
x9 : ffff000033603d58 x8 : ffff800b34eff400
x7 : ffff800ba7569200 x6 : ffff800b34eff400
x5 : 0000000000000000 x4 : 00000000ffffffff
x3 : 0000000000000000 x2 : 0000000000000001
x1 : ffff800b34eff2c0 x0 : 0000000000000300 Call trace:
__alloc_skb+0x104/0x1b0 iscsi_if_rx+0x144/0x12bc [scsi_transport_iscsi] netlink_unicast+0x1e0/0x258 netlink_sendmsg+0x310/0x378 sock_sendmsg+0x4c/0x70 sock_write_iter+0x90/0xf0 __vfs_write+0x11c/0x190 vfs_write+0xac/0x1c0 ksys_write+0x6c/0xd8 __arm64_sys_write+0x24/0x30 el0_svc_common+0x78/0x130 el0_svc_handler+0x38/0x78 el0_svc+0x8/0xc
--- drivers/scsi/scsi_transport_iscsi.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/scsi/scsi_transport_iscsi.c +7 -0
@@ -37,6 +37,8 @@#define ISCSI_TRANSPORT_VERSION "2.0-870" +#define ISCSI_SEND_MAX_ALLOWED 10 +static int dbg_session;module_param_named (debug_session, dbg_session, int,S_IRUGO |S_IWUSR );
@@ -3695,6 +3697,7 @@ iscsi_if_rx(struct sk_buff *skb)struct nlmsghdr *nlh;struct iscsi_uevent *ev;uint32_t group; +int retries =ISCSI_SEND_MAX_ALLOWED ; nlh =nlmsg_hdr (skb); if (nlh->nlmsg_len < sizeof(*nlh) + sizeof(*ev) ||
@@ -3725,6 +3728,10 @@ iscsi_if_rx(struct sk_buff *skb)break ; err =iscsi_if_send_reply (group, nlh->nlmsg_seq, nlh->nlmsg_type,0 ,0 , ev,sizeof (*ev)); +if (err == -EAGAIN && --retries <0 ) { +printk (KERN_WARNING "Send reply failed, error %d\n" , err); +break ; + } }while (err <0 && err != -ECONNREFUSED && err != -ESRCH );skb_pull (skb, rlen); }
Greg Kroah-Hartman
maintainerPATCH 180/183 bitmap: Add bitmap_alloc(), bitmap_zalloc() and bitmap_free()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
commit c42b65e363ce97a828f81b59033c3558f8fa7f70 upstream.
A lot of code become ugly because of open coding allocations for bitmaps.
Introduce three helpers to allow users be more clear of intention and keep their code neat.
Note, due to multiple circular dependencies we may not provide the helpers as inliners. For now we keep them exported and, perhaps, at some point in the future we will sort out header inclusion and inheritance.
--- include/linux/bitmap.h | 8 ++++++++ lib/bitmap.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+)
include/linux/bitmap.h +8 -0
@@ -84,6 +84,14 @@*/ /* +* Allocation and deallocation of bitmap. +* Provided in lib/bitmap.c to avoid circular dependency. +*/ +extern unsigned long *bitmap_alloc (unsigned int nbits,gfp_t flags); +extern unsigned long *bitmap_zalloc (unsigned int nbits,gfp_t flags); +extern void bitmap_free (const unsigned long *bitmap); + +/* * lib/bitmap.c provides these functions: */
lib/bitmap.c +20 -0
@@ -12,6 +12,7 @@#include <linux/bitmap.h> #include <linux/bitops.h> #include <linux/bug.h> +#include <linux/slab.h> #include <asm/page.h> #include <asm/uaccess.h>
@@ -1081,3 +1082,22 @@ void bitmap_copy_le(unsigned long *dst, }EXPORT_SYMBOL (bitmap_copy_le);#endif + +unsigned long *bitmap_alloc (unsigned int nbits,gfp_t flags) +{ +return kmalloc_array (BITS_TO_LONGS (nbits),sizeof (unsigned long ), + flags); +} +EXPORT_SYMBOL (bitmap_alloc); + +unsigned long *bitmap_zalloc (unsigned int nbits,gfp_t flags) +{ +return bitmap_alloc (nbits, flags | __GFP_ZERO); +} +EXPORT_SYMBOL (bitmap_zalloc); + +void bitmap_free (const unsigned long *bitmap) +{ +kfree (bitmap); +} +EXPORT_SYMBOL (bitmap_free);
Greg Kroah-Hartman
maintainerPATCH 181/183 netfilter: ipset: use bitmap infrastructure completely
In reply to Greg Kroah-HartmanFrom: Kadlecsik József <[email protected]>
commit 32c72165dbd0e246e69d16a3ad348a4851afd415 upstream.
The bitmap allocation did not use full unsigned long sizes when calculating the required size and that was triggered by KASAN as slab-out-of-bounds read in several places. The patch fixes all of them.
--- include/linux/netfilter/ipset/ip_set.h | 7 ------- net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- net/netfilter/ipset/ip_set_bitmap_ip.c | 6 +++--- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 6 +++--- net/netfilter/ipset/ip_set_bitmap_port.c | 6 +++--- 5 files changed, 10 insertions(+), 17 deletions(-)
include/linux/netfilter/ipset/ip_set.h +0 -7
@@ -530,13 +530,6 @@ ip6addrptr(const struct sk_buff *skb, bo sizeof(*addr)); } -/* Calculate the bytes required to store the inclusive range of a-b */ -static inline int -bitmap_bytes (u32 a,u32 b) -{ -return 4 * ((((b - a +8 ) /8 ) +3 ) /4 ); -} -#include <linux/netfilter/ipset/ip_set_timeout.h> #include <linux/netfilter/ipset/ip_set_comment.h>
net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
@@ -81,7 +81,7 @@ mtype_flush(struct ip_set *set)if (set->extensions &IPSET_EXT_DESTROY )mtype_ext_cleanup (set); -memset (map->members,0 , map->memsize); +bitmap_zero (map->members, map->elements); } static int
net/netfilter/ipset/ip_set_bitmap_ip.c +3 -3
@@ -40,7 +40,7 @@ MODULE_ALIAS("ip_set_bitmap:ip");/* Type structure */ struct bitmap_ip { -void *members;/* the set members */ +unsigned long *members;/* the set members */ u32 first_ip;/* host byte order, included in range */ u32 last_ip;/* host byte order, included in range */ u32 elements;/* number of max elements in the set */
@@ -222,7 +222,7 @@ init_map_ip(struct ip_set *set, struct b u32 first_ip, u32 last_ip, u32 elements, u32 hosts, u8 netmask) { - map->members = ip_set_alloc(map->memsize); + map->members = bitmap_zalloc(elements, GFP_KERNEL | __GFP_NOWARN);if (!map->members)return false; map->first_ip = first_ip;
@@ -315,7 +315,7 @@ bitmap_ip_create(struct net *net, structif (!map)return -ENOMEM ; - map->memsize =bitmap_bytes (0 , elements -1 ); + map->memsize =BITS_TO_LONGS (elements) *sizeof (unsigned long ); set->variant = &bitmap_ip;if (!init_map_ip (set, map, first_ip, last_ip, elements, hosts, netmask)) {
net/netfilter/ipset/ip_set_bitmap_ipmac.c +3 -3
@@ -46,7 +46,7 @@ enum {/* Type structure */ struct bitmap_ipmac { -void *members;/* the set members */ +unsigned long *members;/* the set members */ u32 first_ip;/* host byte order, included in range */ u32 last_ip;/* host byte order, included in range */ u32 elements;/* number of max elements in the set */
@@ -297,7 +297,7 @@ static bool init_map_ipmac(struct ip_set *set, struct bitmap_ipmac *map, u32 first_ip, u32 last_ip, u32 elements) { - map->members = ip_set_alloc(map->memsize); + map->members = bitmap_zalloc(elements, GFP_KERNEL | __GFP_NOWARN);if (!map->members)return false; map->first_ip = first_ip;
@@ -361,7 +361,7 @@ bitmap_ipmac_create(struct net *net, strif (!map)return -ENOMEM ; - map->memsize =bitmap_bytes (0 , elements -1 ); + map->memsize =BITS_TO_LONGS (elements) *sizeof (unsigned long ); set->variant = &bitmap_ipmac;if (!init_map_ipmac (set, map, first_ip, last_ip, elements)) {kfree (map);
net/netfilter/ipset/ip_set_bitmap_port.c +3 -3
@@ -34,7 +34,7 @@ MODULE_ALIAS("ip_set_bitmap:port");/* Type structure */ struct bitmap_port { -void *members;/* the set members */ +unsigned long *members;/* the set members */ u16 first_port;/* host byte order, included in range */ u16 last_port;/* host byte order, included in range */ u32 elements;/* number of max elements in the set */
@@ -207,7 +207,7 @@ static bool init_map_port(struct ip_set *set, struct bitmap_port *map, u16 first_port, u16 last_port) { - map->members = ip_set_alloc(map->memsize); + map->members = bitmap_zalloc(map->elements, GFP_KERNEL | __GFP_NOWARN);if (!map->members)return false; map->first_port = first_port;
@@ -250,7 +250,7 @@ bitmap_port_create(struct net *net, strureturn -ENOMEM ; map->elements = elements; - map->memsize =bitmap_bytes (0 , map->elements); + map->memsize =BITS_TO_LONGS (elements) *sizeof (unsigned long ); set->variant = &bitmap_port;if (!init_map_port (set, map, first_port, last_port)) {kfree (map);
Greg Kroah-Hartman
maintainerPATCH 154/183 net: neigh: use long type to store jiffies delta
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 9d027e3a83f39b819e908e4e09084277a2e45e95 ]
A difference of two unsigned long needs long storage.
--- net/core/neighbour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/neighbour.c +2 -2
@@ -1837,8 +1837,8 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl, goto nla_put_failure; {unsigned long now = jiffies; -unsigned int flush_delta = now - tbl->last_flush; -unsigned int rand_delta = now - tbl->last_rand; +long flush_delta = now - tbl->last_flush; +long rand_delta = now - tbl->last_rand;struct neigh_hash_table *nht;struct ndt_config ndc = { .ndtc_key_len = tbl->key_len,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 155/183 packet: fix data-race in fanout_flow_is_huge()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit b756ad928d98e5ef0b74af7546a6a31a8dadde00 ]
KCSAN reported the following data-race [1]
Adding a couple of READ_ONCE()/WRITE_ONCE() should silence it.
Since the report hinted about multiple cpus using the history concurrently, I added a test avoiding writing on it if the victim slot already contains the desired value.
[1]
BUG: KCSAN: data-race in fanout_demux_rollover / fanout_demux_rollover
read to 0xffff8880b01786cc of 4 bytes by task 18921 on cpu 1:
fanout_flow_is_huge net/packet/af_packet.c:1303 [inline] fanout_demux_rollover+0x33e/0x3f0 net/packet/af_packet.c:1353 packet_rcv_fanout+0x34e/0x490 net/packet/af_packet.c:1453 deliver_skb net/core/dev.c:1888 [inline] dev_queue_xmit_nit+0x15b/0x540 net/core/dev.c:1958 xmit_one net/core/dev.c:3195 [inline] dev_hard_start_xmit+0x3f5/0x430 net/core/dev.c:3215 __dev_queue_xmit+0x14ab/0x1b40 net/core/dev.c:3792 dev_queue_xmit+0x21/0x30 net/core/dev.c:3825 neigh_direct_output+0x1f/0x30 net/core/neighbour.c:1530 neigh_output include/net/neighbour.h:511 [inline] ip6_finish_output2+0x7a2/0xec0 net/ipv6/ip6_output.c:116 __ip6_finish_output net/ipv6/ip6_output.c:142 [inline] __ip6_finish_output+0x2d7/0x330 net/ipv6/ip6_output.c:127 ip6_finish_output+0x41/0x160 net/ipv6/ip6_output.c:152 NF_HOOK_COND include/linux/netfilter.h:294 [inline] ip6_output+0xf2/0x280 net/ipv6/ip6_output.c:175 dst_output include/net/dst.h:436 [inline] ip6_local_out+0x74/0x90 net/ipv6/output_core.c:179 ip6_send_skb+0x53/0x110 net/ipv6/ip6_output.c:1795 udp_v6_send_skb.isra.0+0x3ec/0xa70 net/ipv6/udp.c:1173 udpv6_sendmsg+0x1906/0x1c20 net/ipv6/udp.c:1471 inet6_sendmsg+0x6d/0x90 net/ipv6/af_inet6.c:576 sock_sendmsg_nosec net/socket.c:637 [inline] sock_sendmsg+0x9f/0xc0 net/socket.c:657 ___sys_sendmsg+0x2b7/0x5d0 net/socket.c:2311 __sys_sendmmsg+0x123/0x350 net/socket.c:2413 __do_sys_sendmmsg net/socket.c:2442 [inline] __se_sys_sendmmsg net/socket.c:2439 [inline] __x64_sys_sendmmsg+0x64/0x80 net/socket.c:2439 do_syscall_64+0xcc/0x370 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x44/0xa9
write to 0xffff8880b01786cc of 4 bytes by task 18922 on cpu 0:
fanout_flow_is_huge net/packet/af_packet.c:1306 [inline] fanout_demux_rollover+0x3a4/0x3f0 net/packet/af_packet.c:1353 packet_rcv_fanout+0x34e/0x490 net/packet/af_packet.c:1453 deliver_skb net/core/dev.c:1888 [inline] dev_queue_xmit_nit+0x15b/0x540 net/core/dev.c:1958 xmit_one net/core/dev.c:3195 [inline] dev_hard_start_xmit+0x3f5/0x430 net/core/dev.c:3215 __dev_queue_xmit+0x14ab/0x1b40 net/core/dev.c:3792 dev_queue_xmit+0x21/0x30 net/core/dev.c:3825 neigh_direct_output+0x1f/0x30 net/core/neighbour.c:1530 neigh_output include/net/neighbour.h:511 [inline] ip6_finish_output2+0x7a2/0xec0 net/ipv6/ip6_output.c:116 __ip6_finish_output net/ipv6/ip6_output.c:142 [inline] __ip6_finish_output+0x2d7/0x330 net/ipv6/ip6_output.c:127 ip6_finish_output+0x41/0x160 net/ipv6/ip6_output.c:152 NF_HOOK_COND include/linux/netfilter.h:294 [inline] ip6_output+0xf2/0x280 net/ipv6/ip6_output.c:175 dst_output include/net/dst.h:436 [inline] ip6_local_out+0x74/0x90 net/ipv6/output_core.c:179 ip6_send_skb+0x53/0x110 net/ipv6/ip6_output.c:1795 udp_v6_send_skb.isra.0+0x3ec/0xa70 net/ipv6/udp.c:1173 udpv6_sendmsg+0x1906/0x1c20 net/ipv6/udp.c:1471 inet6_sendmsg+0x6d/0x90 net/ipv6/af_inet6.c:576 sock_sendmsg_nosec net/socket.c:637 [inline] sock_sendmsg+0x9f/0xc0 net/socket.c:657 ___sys_sendmsg+0x2b7/0x5d0 net/socket.c:2311 __sys_sendmmsg+0x123/0x350 net/socket.c:2413 __do_sys_sendmmsg net/socket.c:2442 [inline] __se_sys_sendmmsg net/socket.c:2439 [inline] __x64_sys_sendmmsg+0x64/0x80 net/socket.c:2439 do_syscall_64+0xcc/0x370 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 18922 Comm: syz-executor.3 Not tainted 5.4.0-rc6+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
--- net/packet/af_packet.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/packet/af_packet.c +9 -3
@@ -1332,15 +1332,21 @@ static void packet_sock_destruct(struct sock *sk)static bool fanout_flow_is_huge (struct packet_sock *po,struct sk_buff *skb) { -u32 rxhash; +u32 *history = po->rollover->history; +u32 victim, rxhash;int i, count =0 ; rxhash =skb_get_hash (skb);for (i =0 ; i <ROLLOVER_HLEN ; i++) -if (po->rollover->history[i] == rxhash) +if (READ_ONCE (history[i]) == rxhash) count++; - po->rollover->history[prandom_u32 () %ROLLOVER_HLEN ] = rxhash; + victim =prandom_u32 () %ROLLOVER_HLEN ; + +/* Avoid dirtying the cache line if possible */ +if (READ_ONCE (history[victim]) != rxhash) +WRITE_ONCE (history[victim], rxhash); +return count > (ROLLOVER_HLEN >>1 ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/183 dmaengine: ti: edma: fix missed failure handling
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 340049d453682a9fe8d91fe794dd091730f4bb25 ]
When devm_kcalloc fails, it forgets to call edma_free_slot. Replace direct return with failure handler to fix it.
--- drivers/dma/edma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/dma/edma.c +4 -2
@@ -2288,8 +2288,10 @@ static int edma_probe(struct platform_device *pdev) ecc->tc_list =devm_kcalloc (dev, ecc->num_tc,sizeof (*ecc->tc_list),GFP_KERNEL ); -if (!ecc->tc_list) -return -ENOMEM ; +if (!ecc->tc_list) { + ret = -ENOMEM ; + goto err_reg1; + }for (i =0 ;; i++) { ret = of_parse_phandle_with_fixed_args(node, "ti,tptcs",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 158/183 arm64: dts: juno: Fix UART frequency
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit 39a1a8941b27c37f79508426e27a2ec29829d66c ]
Older versions of the Juno *SoC* TRM [1] recommended that the UART clock source should be 7.2738 MHz, whereas the *system* TRM [2] stated a more correct value of 7.3728 MHz. Somehow the wrong value managed to end up in our DT.
Doing a prime factorisation, a modulo divide by 115200 and trying to buy a 7.2738 MHz crystal at your favourite electronics dealer suggest that the old value was actually a typo. The actual UART clock is driven by a PLL, configured via a parameter in some board.txt file in the firmware, which reads 7.37 MHz (sic!).
Fix this to correct the baud rate divisor calculation on the Juno board.
[1] http://infocenter.arm.com/help/topic/com.arm.doc.ddi0515b.b/DDI0515B_b_juno_arm_development_platform_soc_trm.pdf
[2] http://infocenter.arm.com/help/topic/com.arm.doc.100113_0000_07_en/arm_versatile_express_juno_development_platform_(v2m_juno)_technical_reference_manual_100113_0000_07_en.pdf
--- arch/arm64/boot/dts/arm/juno-clocks.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/arm/juno-clocks.dtsi +2 -2
@@ -8,10 +8,10 @@ */ /* SoC fixed clocks */ - soc_uartclk: refclk7273800hz { + soc_uartclk: refclk7372800hz { compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = <7273800>; + clock-frequency = <7372800>; clock-output-names = "juno:uartclk"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/183 m68k: Call timer_interrupt() with interrupts disabled
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
[ Upstream commit 1efdd4bd254311498123a15fa0acd565f454da97 ]
Some platforms execute their timer handler with the interrupt priority level set below 6. That means the handler could be interrupted by another driver and this could lead to re-entry of the timer core.
Avoid this by use of local_irq_save/restore for timer interrupt dispatch. This provides mutual exclusion around the timer interrupt flag access which is needed later in this series for the clocksource conversion.
--- arch/m68k/amiga/cia.c | 9 +++++++++ arch/m68k/atari/ataints.c | 4 ++-- arch/m68k/atari/time.c | 15 ++++++++++++++- arch/m68k/bvme6000/config.c | 20 ++++++++++---------- arch/m68k/hp300/time.c | 10 ++++++++-- arch/m68k/mac/via.c | 17 +++++++++++++++++ arch/m68k/mvme147/config.c | 18 ++++++++++-------- arch/m68k/mvme16x/config.c | 21 +++++++++++---------- arch/m68k/q40/q40ints.c | 19 +++++++++++-------- arch/m68k/sun3/sun3ints.c | 3 +++ arch/m68k/sun3x/time.c | 16 ++++++++++------ 11 files changed, 105 insertions(+), 47 deletions(-)
arch/m68k/amiga/cia.c +9 -0
@@ -88,10 +88,19 @@ static irqreturn_t cia_handler(int irq, void *dev_id)struct ciabase *base = dev_id;int mach_irq;unsigned char ints; +unsigned long flags; +/* Interrupts get disabled while the timer irq flag is cleared and +* the timer interrupt serviced. +*/ mach_irq = base->cia_irq; +local_irq_save (flags); ints =cia_set_irq (base,CIA_ICR_ALL ); amiga_custom.intreq = base->int_mask; +if (ints &1 ) +generic_handle_irq (mach_irq); +local_irq_restore (flags); + mach_irq++, ints >>=1 ;for (; ints; mach_irq++, ints >>=1 ) {if (ints &1 )generic_handle_irq (mach_irq);
arch/m68k/atari/ataints.c +2 -2
@@ -142,7 +142,7 @@ struct mfptimerbase { .name = "MFP Timer D" }; -static irqreturn_t mfptimer_handler (int irq,void *dev_id) +static irqreturn_t mfp_timer_d_handler (int irq,void *dev_id) {struct mfptimerbase *base = dev_id;int mach_irq;
@@ -344,7 +344,7 @@ void __init atari_init_IRQ(void) st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd &0xf0 ) |0x6 ;/* request timer D dispatch handler */ -if (request_irq (IRQ_MFP_TIMD , mfptimer_handler,IRQF_SHARED , +if (request_irq (IRQ_MFP_TIMD , mfp_timer_d_handler,IRQF_SHARED , stmfp_base.name, &stmfp_base))pr_err ("Couldn't register %s interrupt\n" , stmfp_base.name);
arch/m68k/atari/time.c +14 -1
@@ -24,6 +24,18 @@DEFINE_SPINLOCK (rtc_lock);EXPORT_SYMBOL_GPL (rtc_lock); +static irqreturn_t mfp_timer_c_handler (int irq,void *dev_id) +{ +irq_handler_t timer_routine = dev_id; +unsigned long flags; + +local_irq_save (flags); +timer_routine (0 ,NULL ); +local_irq_restore (flags); + +return IRQ_HANDLED ; +} +void __init atari_sched_init (irq_handler_t timer_routine) {
@@ -32,7 +44,8 @@ atari_sched_init(irq_handler_t timer_routine)/* start timer C, div = 1:100 */ st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd &15 ) |0x60 ;/* install interrupt service routine for MFP Timer C */ -if (request_irq (IRQ_MFP_TIMC , timer_routine,0 ,"timer" , timer_routine)) +if (request_irq (IRQ_MFP_TIMC , mfp_timer_c_handler,0 ,"timer" , + timer_routine))pr_err ("Couldn't register timer interrupt\n" ); }
arch/m68k/bvme6000/config.c +10 -10
@@ -46,11 +46,6 @@ extern int bvme6000_set_clock_mmss (unsigned long);extern void bvme6000_reset (void );void bvme6000_set_vectors (void ); -/* Save tick handler routine pointer, will point to xtime_update() in -* kernel/timer/timekeeping.c, called via bvme6000_process_int() */ - -static irq_handler_t tick_handler; -int __init bvme6000_parse_bootinfo (const struct bi_record *bi) {
@@ -160,12 +155,18 @@ irqreturn_t bvme6000_abort_int (int irq, void *dev_id)static irqreturn_t bvme6000_timer_int (int irq,void *dev_id) { +irq_handler_t timer_routine = dev_id; +unsigned long flags;volatile RtcPtr_t rtc = (RtcPtr_t )BVME_RTC_BASE ; -unsigned char msr = rtc->msr &0xc0 ; +unsigned char msr; +local_irq_save (flags); + msr = rtc->msr &0xc0 ; rtc->msr = msr |0x20 ;/* Ack the interrupt */ +timer_routine (0 ,NULL ); +local_irq_restore (flags); -return tick_handler (irq, dev_id); +return IRQ_HANDLED ; }/*
@@ -184,9 +185,8 @@ void bvme6000_sched_init (irq_handler_t timer_routine) rtc->msr =0 ;/* Ensure timer registers accessible */ - tick_handler = timer_routine; -if (request_irq (BVME_IRQ_RTC , bvme6000_timer_int,0 , -"timer" , bvme6000_timer_int)) +if (request_irq (BVME_IRQ_RTC , bvme6000_timer_int,0 ,"timer" , + timer_routine))panic ("Couldn't register timer int" ); rtc->t1cr_omr =0x04 ;/* Mode 2, ext clk */
arch/m68k/hp300/time.c +8 -2
@@ -37,13 +37,19 @@static irqreturn_t hp300_tick (int irq,void *dev_id) { +irq_handler_t timer_routine = dev_id; +unsigned long flags;unsigned long tmp; -irq_handler_t vector = dev_id; + +local_irq_save (flags);in_8 (CLOCKBASE +CLKSR ); asmvolatile ("movpw %1@(5),%0" :"=d" (tmp) :"a" (CLOCKBASE )); +timer_routine (0 ,NULL ); +local_irq_restore (flags); +/* Turn off the network and SCSI leds */ blinken_leds (0 ,0xe0 ); -return vector (irq,NULL ); +return IRQ_HANDLED ; }u32 hp300_gettimeoffset (void )
arch/m68k/mac/via.c +17 -0
@@ -397,6 +397,8 @@ void via_nubus_irq_shutdown(int irq)* via6522.c :-), disable/pending masks added. */ +#define VIA_TIMER_1_INT BIT(6) +void via1_irq (struct irq_desc *desc) {int irq_num;
@@ -406,6 +408,21 @@ void via1_irq(struct irq_desc *desc)if (!events)return ; + irq_num =IRQ_MAC_TIMER_1 ; + irq_bit =VIA_TIMER_1_INT ; +if (events & irq_bit) { +unsigned long flags; + +local_irq_save (flags); + via1[vIFR] = irq_bit; +generic_handle_irq (irq_num); +local_irq_restore (flags); + + events &= ~irq_bit; +if (!events) +return ; + } + irq_num =VIA1_SOURCE_BASE ; irq_bit =1 ; do {
arch/m68k/mvme147/config.c +10 -8
@@ -47,11 +47,6 @@ extern void mvme147_reset (void);static int bcd2int (unsigned char b); -/* Save tick handler routine pointer, will point to xtime_update() in -* kernel/time/timekeeping.c, called via mvme147_process_int() */ - -irq_handler_t tick_handler; -int __init mvme147_parse_bootinfo (const struct bi_record *bi) {
@@ -107,16 +102,23 @@ void __init config_mvme147(void)static irqreturn_t mvme147_timer_int (int irq,void *dev_id) { +irq_handler_t timer_routine = dev_id; +unsigned long flags; + +local_irq_save (flags); m147_pcc->t1_int_cntrl =PCC_TIMER_INT_CLR ; m147_pcc->t1_int_cntrl =PCC_INT_ENAB |PCC_LEVEL_TIMER1 ; -return tick_handler (irq, dev_id); +timer_routine (0 ,NULL ); +local_irq_restore (flags); + +return IRQ_HANDLED ; }void mvme147_sched_init (irq_handler_t timer_routine) { - tick_handler = timer_routine; -if (request_irq (PCC_IRQ_TIMER1 , mvme147_timer_int,0 ,"timer 1" ,NULL )) +if (request_irq (PCC_IRQ_TIMER1 , mvme147_timer_int,0 ,"timer 1" , + timer_routine))pr_err ("Couldn't register timer interrupt\n" );/* Init the clock with a value */
arch/m68k/mvme16x/config.c +11 -10
@@ -52,11 +52,6 @@ extern void mvme16x_reset (void);int bcd2int (unsigned char b); -/* Save tick handler routine pointer, will point to xtime_update() in -* kernel/time/timekeeping.c, called via mvme16x_process_int() */ - -static irq_handler_t tick_handler; -unsigned short mvme16x_config;EXPORT_SYMBOL (mvme16x_config);
@@ -355,8 +350,15 @@ static irqreturn_t mvme16x_abort_int (int irq, void *dev_id)static irqreturn_t mvme16x_timer_int (int irq,void *dev_id) { - *(volatile unsigned char *)0xfff4201b |=8 ; -return tick_handler (irq, dev_id); +irq_handler_t timer_routine = dev_id; +unsigned long flags; + +local_irq_save (flags); + *(volatile unsigned char *)0xfff4201b |=8 ; +timer_routine (0 ,NULL ); +local_irq_restore (flags); + +return IRQ_HANDLED ; }void mvme16x_sched_init (irq_handler_t timer_routine)
@@ -364,14 +366,13 @@ void mvme16x_sched_init (irq_handler_t timer_routine)uint16_t brdno =be16_to_cpu (mvme_bdid.brdno);int irq; - tick_handler = timer_routine;/* Using PCCchip2 or MC2 chip tick timer 1 */ *(volatile unsigned long *)0xfff42008 =0 ; *(volatile unsigned long *)0xfff42004 =10000 ;/* 10ms */ *(volatile unsigned char *)0xfff42017 |=3 ; *(volatile unsigned char *)0xfff4201b =0x16 ; -if (request_irq (MVME16x_IRQ_TIMER, mvme16x_timer_int,0 , -"timer" , mvme16x_timer_int)) +if (request_irq (MVME16x_IRQ_TIMER, mvme16x_timer_int,0 ,"timer" , + timer_routine))panic ("Couldn't register timer int" );if (brdno ==0x0162 || brdno ==0x172 )
arch/m68k/q40/q40ints.c +11 -8
@@ -126,10 +126,10 @@ void q40_mksound(unsigned int hz, unsigned int ticks) sound_ticks = ticks <<1 ; } -static irq_handler_t q40_timer_routine; - -static irqreturn_t q40_timer_int (int irq,void * dev) +static irqreturn_t q40_timer_int (int irq,void *dev_id) { +irq_handler_t timer_routine = dev_id; + ql_ticks = ql_ticks ?0 :1 ;if (sound_ticks) {unsigned char sval=(sound_ticks &1 ) ?128 -SVOL :128 +SVOL ;
@@ -138,8 +138,13 @@ static irqreturn_t q40_timer_int (int irq, void * dev) *DAC_RIGHT =sval; } -if (!ql_ticks) -q40_timer_routine (irq, dev); +if (!ql_ticks) { +unsigned long flags; + +local_irq_save (flags); +timer_routine (0 ,NULL ); +local_irq_restore (flags); + }return IRQ_HANDLED ; }
@@ -147,11 +152,9 @@ void q40_sched_init (irq_handler_t timer_routine) {int timer_irq; - q40_timer_routine = timer_routine; timer_irq =Q40_IRQ_FRAME ; -if (request_irq (timer_irq, q40_timer_int,0 , -"timer" , q40_timer_int)) +if (request_irq (timer_irq, q40_timer_int,0 ,"timer" , timer_routine))panic ("Couldn't register timer int" );master_outb (-1 ,FRAME_CLEAR_REG );
arch/m68k/sun3/sun3ints.c +3 -0
@@ -61,8 +61,10 @@ static irqreturn_t sun3_int7(int irq, void *dev_id)static irqreturn_t sun3_int5 (int irq,void *dev_id) { +unsigned long flags;unsigned int cnt; +local_irq_save (flags);#ifdef CONFIG_SUN3 intersil_clear ();#endif
@@ -76,6 +78,7 @@ static irqreturn_t sun3_int5(int irq, void *dev_id) cnt =kstat_irqs_cpu (irq,0 );if (!(cnt %20 ))sun3_leds (led_pattern[cnt %160 /20 ]); +local_irq_restore (flags);return IRQ_HANDLED ; }
arch/m68k/sun3x/time.c +10 -6
@@ -77,15 +77,19 @@ u32 sun3x_gettimeoffset(void) }#if 0 -static void sun3x_timer_tick (int irq,void *dev_id,struct pt_regs *regs) +static irqreturn_t sun3x_timer_tick (int irq,void *dev_id) { -void (*vector)(int ,void *,struct pt_regs *) = dev_id; +irq_handler_t timer_routine = dev_id; +unsigned long flags; -/* Clear the pending interrupt - pulse the enable line low */ -disable_irq (5 ); -enable_irq (5 ); +local_irq_save (flags); +/* Clear the pending interrupt - pulse the enable line low */ +disable_irq (5 ); +enable_irq (5 ); +timer_routine (0 ,NULL ); +local_irq_restore (flags); -vector (irq,NULL , regs); +return IRQ_HANDLED ; }#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/183 drm/radeon: fix bad DMA from INTERRUPT_CNTL2
In reply to Greg Kroah-HartmanFrom: Sam Bobroff <[email protected]>
[ Upstream commit 62d91dd2851e8ae2ca552f1b090a3575a4edf759 ]
The INTERRUPT_CNTL2 register expects a valid DMA address, but is currently set with a GPU MC address. This can cause problems on systems that detect the resulting DMA read from an invalid address (found on a Power8 guest).
Instead, use the DMA address of the dummy page because it will always be safe.
--- drivers/gpu/drm/radeon/cik.c | 4 ++-- drivers/gpu/drm/radeon/r600.c | 4 ++-- drivers/gpu/drm/radeon/si.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/cik.c +2 -2
@@ -7372,8 +7372,8 @@ static int cik_irq_init(struct radeon_device *rdev) }/* setup interrupt control */ -/* XXX this should actually be a bus address, not an MC address. same on older asics */ -WREG32 (INTERRUPT_CNTL2 , rdev->ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , rdev->dummy_page.addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL );/* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN
drivers/gpu/drm/radeon/r600.c +2 -2
@@ -3647,8 +3647,8 @@ int r600_irq_init(struct radeon_device *rdev) }/* setup interrupt control */ -/* set dummy read address to ring address */ -WREG32 (INTERRUPT_CNTL2 , rdev->ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , rdev->dummy_page.addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL );/* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN
drivers/gpu/drm/radeon/si.c +2 -2
@@ -6013,8 +6013,8 @@ static int si_irq_init(struct radeon_device *rdev) }/* setup interrupt control */ -/* set dummy read address to ring address */ -WREG32 (INTERRUPT_CNTL2 , rdev->ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , rdev->dummy_page.addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL );/* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 150/183 media: ov6650: Fix incorrect use of JPEG colorspace
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 12500731895ef09afc5b66b86b76c0884fb9c7bf ]
Since its initial submission, the driver selects V4L2_COLORSPACE_JPEG for supported formats other than V4L2_MBUS_FMT_SBGGR8_1X8. According to v4l2-compliance test program, V4L2_COLORSPACE_JPEG applies exclusively to V4L2_PIX_FMT_JPEG. Since the sensor does not support JPEG format, fix it to always select V4L2_COLORSPACE_SRGB.
--- drivers/media/i2c/soc_camera/ov6650.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/media/i2c/soc_camera/ov6650.c +2 -11
@@ -203,7 +203,6 @@ struct ov6650 {unsigned long pclk_max;/* from resolution and format */ struct v4l2_fract tpf;/* as requested with s_parm */ u32 code; -enum v4l2_colorspace colorspace; };
@@ -513,7 +512,7 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd, mf->width = priv->rect.width >> priv->half_scale; mf->height = priv->rect.height >> priv->half_scale; mf->code = priv->code; - mf->colorspace = priv->colorspace; + mf->colorspace =V4L2_COLORSPACE_SRGB ; mf->field =V4L2_FIELD_NONE ;return 0 ;
@@ -623,11 +622,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) priv->pclk_max =8000000 ; } -if (code ==MEDIA_BUS_FMT_SBGGR8_1X8 ) - priv->colorspace =V4L2_COLORSPACE_SRGB ; -else if (code !=0 ) - priv->colorspace =V4L2_COLORSPACE_JPEG ; -if (half_scale) {dev_dbg (&client->dev,"max resolution: QCIF\n" ); coma_set |=COMA_QCIF ;
@@ -684,7 +678,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) priv->code = code;if (!ret) { - mf->colorspace = priv->colorspace; mf->width = priv->rect.width >> half_scale; mf->height = priv->rect.height >> half_scale; }
@@ -707,6 +700,7 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd, &mf->height, 2, H_CIF, 1, 0); mf->field =V4L2_FIELD_NONE ; + mf->colorspace =V4L2_COLORSPACE_SRGB ;switch (mf->code) {case MEDIA_BUS_FMT_Y10_1X10 :
@@ -716,12 +710,10 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,case MEDIA_BUS_FMT_YUYV8_2X8 :case MEDIA_BUS_FMT_VYUY8_2X8 :case MEDIA_BUS_FMT_UYVY8_2X8 : - mf->colorspace =V4L2_COLORSPACE_JPEG ;break ;default : mf->code =MEDIA_BUS_FMT_SBGGR8_1X8 ;case MEDIA_BUS_FMT_SBGGR8_1X8 : - mf->colorspace =V4L2_COLORSPACE_SRGB ;break ; }
@@ -1048,7 +1040,6 @@ static int ov6650_probe(struct i2c_client *client, priv->rect.height =H_CIF ; priv->half_scale = false; priv->code =MEDIA_BUS_FMT_YUYV8_2X8 ; - priv->colorspace =V4L2_COLORSPACE_JPEG ; ret =ov6650_video_probe (client);if (ret)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/183 media: davinci-isif: avoid uninitialized variable use
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 0e633f97162c1c74c68e2eb20bbd9259dce87cd9 ]
clang warns about a possible variable use that gcc never complained about:
drivers/media/platform/davinci/isif.c:982:32: error: variable 'frame_size' is uninitialized when used here
[-Werror,-Wuninitialized]
dm365_vpss_set_pg_frame_size(frame_size);
^~~~~~~~~~
drivers/media/platform/davinci/isif.c:887:2: note: variable 'frame_size' is declared here
struct vpss_pg_frame_size frame_size;
^1 error generated.
There is no initialization for this variable at all, and there has never been one in the mainline kernel, so we really should not put that stack data into an mmio register.
On the other hand, I suspect that gcc checks the condition more closely and notices that the global isif_cfg.bayer.config_params.test_pat_gen flag is initialized to zero and never written to from any code path, so anything depending on it can be eliminated.
To shut up the clang warning, just remove the dead code manually, it has probably never been used because any attempt to do so would have resulted in undefined behavior.
--- drivers/media/platform/davinci/isif.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/media/platform/davinci/isif.c +0 -9
@@ -890,9 +890,7 @@ static int isif_set_hw_if_params(struct vpfe_hw_if_param *params)static int isif_config_ycbcr (void ) {struct isif_ycbcr_config *params = &isif_cfg.ycbcr; -struct vpss_pg_frame_size frame_size;u32 modeset =0 , ccdcfg =0 ; -struct vpss_sync_pol sync;dev_dbg (isif_cfg.dev,"\nStarting isif_config_ycbcr..." );
@@ -980,13 +978,6 @@ static int isif_config_ycbcr(void)/* two fields are interleaved in memory */ regw (0x00000249 ,SDOFST ); -/* Setup test pattern if enabled */ -if (isif_cfg.bayer.config_params.test_pat_gen) { - sync.ccdpg_hdpol = params->hd_pol; - sync.ccdpg_vdpol = params->vd_pol; -dm365_vpss_set_sync_pol (sync); -dm365_vpss_set_pg_frame_size (frame_size); - }return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/183 media: ov2659: fix unbalanced mutex_lock/unlock
In reply to Greg Kroah-HartmanFrom: Akinobu Mita <[email protected]>
[ Upstream commit 384538bda10913e5c94ec5b5d34bd3075931bcf4 ]
Avoid returning with mutex locked.
--- drivers/media/i2c/ov2659.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov2659.c +1 -1
@@ -1137,7 +1137,7 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd, mf =v4l2_subdev_get_try_format (sd, cfg, fmt->pad); *mf = fmt->format;#else -return -ENOTTY ; + ret = -ENOTTY ;#endif }else {s64 val;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 183/183 libertas: Fix two buffer overflows at parsing bss descriptor
In reply to Greg Kroah-HartmanFrom: Wen Huang <[email protected]>
commit e5e884b42639c74b5b57dc277909915c0aefc8bb upstream.
add_ie_rates() copys rates without checking the length in bss descriptor from remote AP.when victim connects to remote attacker, this may trigger buffer overflow. lbs_ibss_join_existing() copys rates without checking the length in bss descriptor from remote IBSS node.when victim connects to remote attacker, this may trigger buffer overflow.
Fix them by putting the length check before performing copy.
This fix addresses CVE-2019-14896 and CVE-2019-14897. This also fix build warning of mixed declarations and code.
--- drivers/net/wireless/libertas/cfg.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/net/wireless/libertas/cfg.c +13 -3
@@ -272,6 +272,10 @@ add_ie_rates(u8 *tlv, const u8 *ie, intint hw, ap, ap_max = ie[1 ];u8 hw_rate; +if (ap_max >MAX_RATES ) { +lbs_deb_assoc ("invalid rates\n" ); +return tlv; + }/* Advance past IE header */ ie +=2 ;
@@ -1783,6 +1787,9 @@ static int lbs_ibss_join_existing(structstruct cmd_ds_802_11_ad_hoc_join cmd;u8 preamble =RADIO_PREAMBLE_SHORT ;int ret =0 ; +int hw, i; +u8 rates_max; +u8 *rates;lbs_deb_enter (LBS_DEB_CFG80211 );
@@ -1843,9 +1850,12 @@ static int lbs_ibss_join_existing(structif (!rates_eid) {lbs_add_rates (cmd.bss.rates); }else { -int hw, i; -u8 rates_max = rates_eid[1 ]; -u8 *rates = cmd.bss.rates; + rates_max = rates_eid[1 ]; +if (rates_max >MAX_RATES ) { +lbs_deb_join ("invalid rates" ); + goto out; + } + rates = cmd.bss.rates;for (hw =0 ; hw <ARRAY_SIZE (lbs_rates); hw++) {u8 hw_rate = lbs_rates[hw].bitrate /5 ;for (i =0 ; i < rates_max; i++) {
Greg Kroah-Hartman
maintainerPATCH 182/183 net/x25: fix nonblocking connect
In reply to Greg Kroah-HartmanFrom: Martin Schiller <[email protected]>
commit e21dba7a4df4d93da237da65a096084b4f2e87b4 upstream.
This patch fixes 2 issues in x25_connect():
1. It makes absolutely no sense to reset the neighbour and the connection state after a (successful) nonblocking call of x25_connect. This prevents any connection from being established, since the response (call accept) cannot be processed.
2. Any further calls to x25_connect() while a call is pending should simply return, instead of creating new Call Request (on different logical channels).
This patch should also fix the "KASAN: null-ptr-deref Write in x25_connect" and "BUG: unable to handle kernel NULL pointer dereference in x25_connect" bugs reported by syzbot.
--- net/x25/af_x25.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/x25/af_x25.c +5 -1
@@ -764,6 +764,10 @@ static int x25_connect(struct socket *soif (sk->sk_state ==TCP_ESTABLISHED ) goto out; + rc = -EALREADY ;/* Do nothing if call is already in progress */ +if (sk->sk_state ==TCP_SYN_SENT ) + goto out; + sk->sk_state =TCP_CLOSE ; sock->state =SS_UNCONNECTED ;
@@ -810,7 +814,7 @@ static int x25_connect(struct socket *so/* Now the loop */ rc = -EINPROGRESS ;if (sk->sk_state !=TCP_ESTABLISHED && (flags &O_NONBLOCK )) - goto out_put_neigh; + goto out; rc =x25_wait_for_connection_establishment (sk);if (rc)
Greg Kroah-Hartman
maintainerPATCH 153/183 MIPS: Loongson: Fix return value of loongson_hwmon_init
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit dece3c2a320b0a6d891da6ff774ab763969b6860 ]
When call function hwmon_device_register failed, use the actual return value instead of always -ENOMEM.
--- drivers/platform/mips/cpu_hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/mips/cpu_hwmon.c +1 -1
@@ -155,7 +155,7 @@ static int __init loongson_hwmon_init(void) cpu_hwmon_dev =hwmon_device_register (NULL );if (IS_ERR (cpu_hwmon_dev)) { - ret = -ENOMEM ; + ret =PTR_ERR (cpu_hwmon_dev);pr_err ("hwmon_device_register fail!\n" ); goto fail_hwmon_device_register; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 152/183 media: ov6650: Fix .get_fmt() V4L2_SUBDEV_FORMAT_TRY support
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 39034bb0c26b76a2c3abc54aa28c185f18b40c2f ]
Commit da298c6d98d5 ("[media] v4l2: replace video op g_mbus_fmt by pad op get_fmt") converted a former ov6650_g_fmt() video operation callback to an ov6650_get_fmt() pad operation callback. However, the converted function disregards a format->which flag that pad operations should obey and always returns active frame format settings.
That can be fixed by always responding to V4L2_SUBDEV_FORMAT_TRY with -EINVAL, or providing the response from a pad config argument, likely updated by a former user call to V4L2_SUBDEV_FORMAT_TRY .set_fmt(). Since implementation of the latter is trivial, go for it.
--- drivers/media/i2c/soc_camera/ov6650.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/media/i2c/soc_camera/ov6650.c +9 -3
@@ -524,10 +524,16 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd, *mf = ov6650_def_fmt;/* update media bus format code and frame size */ - mf->width = priv->rect.width >> priv->half_scale; - mf->height = priv->rect.height >> priv->half_scale; - mf->code = priv->code; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { + mf->width = cfg->try_fmt.width; + mf->height = cfg->try_fmt.height; + mf->code = cfg->try_fmt.code; + }else { + mf->width = priv->rect.width >> priv->half_scale; + mf->height = priv->rect.height >> priv->half_scale; + mf->code = priv->code; + }return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 167/183 Input: keyspan-remote - fix control-message timeouts
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit ba9a103f40fc4a3ec7558ec9b0b97d4f92034249 upstream.
The driver was issuing synchronous uninterruptible control requests without using a timeout. This could lead to the driver hanging on probe due to a malfunctioning (or malicious) device until the device is physically disconnected. While sleeping in probe the driver prevents other devices connected to the same hub from being added to (or removed from) the bus.
The USB upper limit of five seconds per request should be more than enough.
--- drivers/input/misc/keyspan_remote.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/input/misc/keyspan_remote.c +6 -3
@@ -344,7 +344,8 @@ static int keyspan_setup(struct usb_deviint retval =0 ; retval =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ), -0x11 ,0x40 ,0x5601 ,0x0 ,NULL ,0 ,0 ); +0x11 ,0x40 ,0x5601 ,0x0 ,NULL ,0 , +USB_CTRL_SET_TIMEOUT );if (retval) {dev_dbg (&dev->dev,"%s - failed to set bit rate due to error: %d\n" , __func__, retval);
@@ -352,7 +353,8 @@ static int keyspan_setup(struct usb_devi } retval =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ), -0x44 ,0x40 ,0x0 ,0x0 ,NULL ,0 ,0 ); +0x44 ,0x40 ,0x0 ,0x0 ,NULL ,0 , +USB_CTRL_SET_TIMEOUT );if (retval) {dev_dbg (&dev->dev,"%s - failed to set resume sensitivity due to error: %d\n" , __func__, retval);
@@ -360,7 +362,8 @@ static int keyspan_setup(struct usb_devi } retval =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ), -0x22 ,0x40 ,0x0 ,0x0 ,NULL ,0 ,0 ); +0x22 ,0x40 ,0x0 ,0x0 ,NULL ,0 , +USB_CTRL_SET_TIMEOUT );if (retval) {dev_dbg (&dev->dev,"%s - failed to turn receive on due to error: %d\n" , __func__, retval);
Greg Kroah-Hartman
maintainerPATCH 164/183 net_sched: fix datalen for ematch
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 61678d28d4a45ef376f5d02a839cc37509ae9281 ]
syzbot reported an out-of-bound access in em_nbyte. As initially analyzed by Eric, this is because em_nbyte sets its own em->datalen in em_nbyte_change() other than the one specified by user, but this value gets overwritten later by its caller tcf_em_validate(). We should leave em->datalen untouched to respect their choices.
I audit all the in-tree ematch users, all of those implement ->change() set em->datalen, so we can just avoid setting it twice in this case.
--- net/sched/ematch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/ematch.c +1 -1
@@ -267,12 +267,12 @@ static int tcf_em_validate(struct tcf_pr } em->data = (unsigned long ) v; } + em->datalen = data_len; } } em->matchid = em_hdr->matchid; em->flags = em_hdr->flags; - em->datalen = data_len; em->net = net; err =0 ;
Greg Kroah-Hartman
maintainerPATCH 162/183 net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 3546d8f1bbe992488ed91592cf6bf76e7114791a =
The cxgb3 driver for "Chelsio T3-based gigabit and 10Gb Ethernet adapters" implements a custom ioctl as SIOCCHIOCTL/SIOCDEVPRIVATE in cxgb_extension_ioctl().
One of the subcommands of the ioctl is CHELSIO_GET_MEM, which appears to read memory directly out of the adapter and return it to userspace. It's not entirely clear what the contents of the adapter memory contains, but the assumption is that it shouldn't be accessible to all users.
So add a CAP_NET_ADMIN check to the CHELSIO_GET_MEM case. Put it after the is_offload() check, which matches two of the other subcommands in the same function which also check for is_offload() and CAP_NET_ADMIN.
Found by Ilja by code inspection, not tested as I don't have the required hardware.
--- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +2 -0
@@ -2437,6 +2437,8 @@ static int cxgb_extension_ioctl(struct nif (!is_offload (adapter))return -EOPNOTSUPP ; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ;if (!(adapter->flags &FULL_INIT_DONE ))return -EIO ;/* need the memory controllers */ if (copy_from_user (&t, useraddr,sizeof (t)))
Greg Kroah-Hartman
maintainerPATCH 118/183 crypto: caam - free resources in case caam_rng registration failed
In reply to Greg Kroah-HartmanFrom: Iuliana Prodan <[email protected]>
[ Upstream commit c59a1d41672a89b5cac49db1a472ff889e35a2d2 ]
Check the return value of the hardware registration for caam_rng and free resources in case of failure.
--- drivers/crypto/caam/caamrng.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/caam/caamrng.c +4 -1
@@ -361,7 +361,10 @@ static int __init caam_rng_init(void) goto free_rng_ctx;dev_info (dev,"registering rng-caam\n" ); -return hwrng_register (&caam_rng); + + err =hwrng_register (&caam_rng); +if (!err) +return err; free_rng_ctx:kfree (rng_ctx);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/183 cifs: fix rmmod regression in cifs.ko caused by force_sig changes
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
[ Upstream commit 247bc9470b1eeefc7b58cdf2c39f2866ba651509 ]
The global change from force_sig caused module unloading of cifs.ko to fail (since the cifsd process could not be killed, "rmmod cifs" now would always fail)
--- fs/cifs/connect.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/connect.c +1 -0
@@ -939,6 +939,7 @@ cifs_demultiplex_thread(void *p)mempool_resize (cifs_req_poolp, length + cifs_min_rcv);set_freezable (); +allow_signal (SIGKILL );while (server->tcpStatus != CifsExiting) {if (try_to_freeze ())continue ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/183 drm/msm/dsi: Implement reset correctly
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit 78e31c42261779a01bc73472d0f65f15378e9de3 ]
On msm8998, vblank timeouts are observed because the DSI controller is not reset properly, which ends up stalling the MDP. This is because the reset logic is not correct per the hardware documentation.
The documentation states that after asserting reset, software should wait some time (no indication of how long), or poll the status register until it returns 0 before deasserting reset.
wmb() is insufficient for this purpose since it just ensures ordering, not timing between writes. Since asserting and deasserting reset occurs on the same register, ordering is already guaranteed by the architecture, making the wmb extraneous.
Since we would define a timeout for polling the status register to avoid a possible infinite loop, lets just use a static delay of 20 ms, since 16.666 ms is the time available to process one frame at 60 fps.
--- drivers/gpu/drm/msm/dsi/dsi_host.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_host.c +4 -2
@@ -30,6 +30,8 @@#include "dsi.xml.h" #include "dsi_cfg.h" +#define DSI_RESET_TOGGLE_DELAY_MS 20 +static int dsi_get_version (const void __iomem *base,u32 *major,u32 *minor) {u32 ver;
@@ -764,7 +766,7 @@ static void dsi_sw_reset(struct msm_dsi_host *msm_host)wmb ();/* clocks need to be enabled before reset */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (DSI_RESET_TOGGLE_DELAY_MS );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 ); }
@@ -1111,7 +1113,7 @@ static void dsi_sw_reset_restore(struct msm_dsi_host *msm_host)/* dsi controller can only be reset while clocks are running */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (DSI_RESET_TOGGLE_DELAY_MS );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 );wmb ();/* controller out of reset */ dsi_write (msm_host,REG_DSI_CTRL , data0);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 148/183 dmaengine: imx-sdma: fix size check for sdma script_number
In reply to Greg Kroah-HartmanFrom: Robin Gong <[email protected]>
[ Upstream commit bd73dfabdda280fc5f05bdec79b6721b4b2f035f ]
Illegal memory will be touch if SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3
(41) exceed the size of structure sdma_script_start_addrs(40), thus cause memory corrupt such as slob block header so that kernel trap into while() loop forever in slob_free(). Please refer to below code piece in imx-sdma.c:
for (i = 0; i < sdma->script_number; i++)
if (addr_arr[i] > 0) saddr_arr[i] = addr_arr[i]; /* memory corrupt here */
That issue was brought by commit a572460be9cf ("dmaengine: imx-sdma: Add support for version 3 firmware") because SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3 (38->41 3 scripts added) not align with script number added in sdma_script_start_addrs(2 scripts).
--- drivers/dma/imx-sdma.c | 8 ++++++++ include/linux/platform_data/dma-imx-sdma.h | 3 +++ 2 files changed, 11 insertions(+)
drivers/dma/imx-sdma.c +8 -0
@@ -1411,6 +1411,14 @@ static void sdma_add_scripts(struct sdma_engine *sdma,if (!sdma->script_number) sdma->script_number =SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 ; +if (sdma->script_number >sizeof (struct sdma_script_start_addrs ) + /sizeof (s32)) { +dev_err (sdma->dev, +"SDMA script number %d not match with firmware.\n" , + sdma->script_number); +return ; + } +for (i =0 ; i < sdma->script_number; i++)if (addr_arr[i] >0 ) saddr_arr[i] = addr_arr[i];
include/linux/platform_data/dma-imx-sdma.h +3 -0
@@ -50,7 +50,10 @@ struct sdma_script_start_addrs {/* End of v2 array */ s32 zcanfd_2_mcu_addr;s32 zqspi_2_mcu_addr; +s32 mcu_2_ecspi_addr;/* End of v3 array */ +s32 mcu_2_zqspi_addr; +/* End of v4 array */ };/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 143/183 mac80211: accept deauth frames in IBSS mode
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 95697f9907bfe3eab0ef20265a766b22e27dde64 ]
We can process deauth frames and all, but we drop them very early in the RX path today - this could never have worked.
--- net/mac80211/rx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/mac80211/rx.c +10 -1
@@ -3040,9 +3040,18 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)case cpu_to_le16 (IEEE80211_STYPE_PROBE_RESP ):/* process for all: mesh, mlme, ibss */ break ; +case cpu_to_le16 (IEEE80211_STYPE_DEAUTH ): +if (is_multicast_ether_addr (mgmt->da) && + !is_broadcast_ether_addr (mgmt->da)) +return RX_DROP_MONITOR ; + +/* process only for station/IBSS */ +if (sdata->vif.type !=NL80211_IFTYPE_STATION && + sdata->vif.type !=NL80211_IFTYPE_ADHOC ) +return RX_DROP_MONITOR ; +break ;case cpu_to_le16 (IEEE80211_STYPE_ASSOC_RESP ):case cpu_to_le16 (IEEE80211_STYPE_REASSOC_RESP ): -case cpu_to_le16 (IEEE80211_STYPE_DEAUTH ):case cpu_to_le16 (IEEE80211_STYPE_DISASSOC ):if (is_multicast_ether_addr (mgmt->da) && !is_broadcast_ether_addr (mgmt->da))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/183 net: broadcom/bcmsysport: Fix signedness in bcm_sysport_probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 25a584955f020d6ec499c513923fb220f3112d2b ]
The "priv->phy_interface" variable is an enum and in this context GCC will treat it as unsigned so the error handling will never be triggered.
--- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bcmsysport.c +1 -1
@@ -1794,7 +1794,7 @@ static int bcm_sysport_probe(struct platform_device *pdev) priv->phy_interface =of_get_phy_mode (dn);/* Default to GMII interface mode */ -if (priv->phy_interface <0 ) +if ((int )priv->phy_interface <0 ) priv->phy_interface =PHY_INTERFACE_MODE_GMII ;/* In the case of a fixed PHY, the DT node associated
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/183 net: sonic: return NETDEV_TX_OK if failed to map buffer
In reply to Greg Kroah-HartmanFrom: Mao Wenan <[email protected]>
[ Upstream commit 6e1cdedcf0362fed3aedfe051d46bd7ee2a85fe1 ]
NETDEV_TX_BUSY really should only be used by drivers that call netif_tx_stop_queue() at the wrong moment. If dma_map_single() is failed to map tx DMA buffer, it might trigger an infinite loop. This patch use NETDEV_TX_OK instead of NETDEV_TX_BUSY, and change printk to pr_err_ratelimited.
--- drivers/net/ethernet/natsemi/sonic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/natsemi/sonic.c +2 -2
@@ -221,9 +221,9 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) laddr =dma_map_single (lp->device, skb->data, length,DMA_TO_DEVICE );if (!laddr) { -printk (KERN_ERR "%s: failed to map tx DMA buffer.\n" , dev->name); +pr_err_ratelimited ("%s: failed to map tx DMA buffer.\n" , dev->name);dev_kfree_skb (skb); -return NETDEV_TX_BUSY ; +return NETDEV_TX_OK ; }sonic_tda_put (dev, entry,SONIC_TD_STATUS ,0 );/* clear status */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/183 ahci: Do not export local variable ahci_em_messages
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 60fc35f327e0a9e60b955c0f3c3ed623608d1baa ]
The commit ed08d40cdec4
("ahci: Changing two module params with static and __read_mostly")
moved ahci_em_messages to be static while missing the fact of exporting it.
WARNING: "ahci_em_messages" [vmlinux] is a static EXPORT_SYMBOL_GPL
Drop export for the local variable ahci_em_messages.
--- drivers/ata/libahci.c | 1 - 1 file changed, 1 deletion(-)
drivers/ata/libahci.c +0 -1
@@ -187,7 +187,6 @@ struct ata_port_operations ahci_pmp_retry_srst_ops = {EXPORT_SYMBOL_GPL (ahci_pmp_retry_srst_ops);static bool ahci_em_messages__read_mostly = true; -EXPORT_SYMBOL_GPL (ahci_em_messages);module_param (ahci_em_messages, bool,0444 );/* add other LED protocol types when they become supported */ MODULE_PARM_DESC(ahci_em_messages,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/183 libertas_tf: Use correct channel range in lbtf_geo_init
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 2ec4ad49b98e4a14147d04f914717135eca7c8b1 ]
It seems we should use 'range' instead of 'priv->range' in lbtf_geo_init(), because 'range' is the corret one related to current regioncode.
--- drivers/net/wireless/libertas_tf/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/libertas_tf/cmd.c +1 -1
@@ -69,7 +69,7 @@ static void lbtf_geo_init(struct lbtf_private *priv)break ; } -for (ch = priv->range.start; ch < priv->range.end; ch++) +for (ch = range->start; ch < range->end; ch++) priv->channels[CHAN_TO_IDX (ch)].flags =0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/183 ARM: pxa: ssp: Fix "WARNING: invalid free of devm_ allocated data"
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 9ee8578d953023cc57e7e736ae48502c707c0210 ]
Since commit 1c459de1e645 ("ARM: pxa: ssp: use devm_ functions") kfree, iounmap, clk_put etc are not needed anymore in remove path.
--- arch/arm/plat-pxa/ssp.c | 6 ------ 1 file changed, 6 deletions(-)
arch/arm/plat-pxa/ssp.c +0 -6
@@ -231,18 +231,12 @@ static int pxa_ssp_probe(struct platform_device *pdev)static int pxa_ssp_remove (struct platform_device *pdev) { -struct resource *res;struct ssp_device *ssp; ssp =platform_get_drvdata (pdev);if (ssp ==NULL )return -ENODEV ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -release_mem_region (res->start,resource_size (res)); - -clk_put (ssp->clk); -mutex_lock (&ssp_lock);list_del (&ssp->node);mutex_unlock (&ssp_lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/183 iommu/amd: Make iommu_disable safer
In reply to Greg Kroah-HartmanFrom: Kevin Mitchell <[email protected]>
[ Upstream commit 3ddbe913e55516d3e2165d43d4d5570761769878 ]
Make it safe to call iommu_disable during early init error conditions before mmio_base is set, but after the struct amd_iommu has been added to the amd_iommu_list. For example, this happens if firmware fails to fill in mmio_phys in the ACPI table leading to a NULL pointer dereference in iommu_feature_disable.
--- drivers/iommu/amd_iommu_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/amd_iommu_init.c +3 -0
@@ -360,6 +360,9 @@ static void iommu_enable(struct amd_iommu *iommu)static void iommu_disable (struct amd_iommu *iommu) { +if (!iommu->mmio_base) +return ; +/* Disable command buffer */ iommu_feature_disable (iommu,CONTROL_CMDBUF_EN );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/183 devres: allow const resource arguments
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 9dea44c91469512d346e638694c22c30a5273992 ]
devm_ioremap_resource() does not currently take 'const' arguments, which results in a warning from the first driver trying to do it anyway:
drivers/gpio/gpio-amd-fch.c: In function 'amd_fch_gpio_probe':drivers/gpio/gpio-amd-fch.c:171:49: error: passing argument 2 of 'devm_ioremap_resource' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
priv->base = devm_ioremap_resource(&pdev->dev, &amd_fch_gpio_iores);
^~~~~~~~~~~~~~~~~~~Change the prototype to allow it, as there is no real reason not to.
--- include/linux/device.h | 3 ++- lib/devres.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
include/linux/device.h +2 -1
@@ -677,7 +677,8 @@ extern unsigned long devm_get_free_pages(struct device *dev, gfp_t gfp_mask, unsigned int order);extern void devm_free_pages (struct device *dev,unsigned long addr); -void __iomem *devm_ioremap_resource (struct device *dev,struct resource *res); +void __iomem *devm_ioremap_resource (struct device *dev, +const struct resource *res);/* allows to add/remove a custom action to devres stack */ int devm_add_action (struct device *dev,void (*action)(void *),void *data);
lib/devres.c +2 -1
@@ -131,7 +131,8 @@ EXPORT_SYMBOL(devm_iounmap);* if (IS_ERR(base)) * return PTR_ERR(base); */ -void __iomem *devm_ioremap_resource (struct device *dev,struct resource *res) +void __iomem *devm_ioremap_resource (struct device *dev, +const struct resource *res) {resource_size_t size;const char *name;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/183 rtc: pcf8563: Clear event flags and disable interrupts before requesting irq
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 3572e8aea3bf925dac1dbf86127657c39fe5c254 ]
Besides the alarm, the PCF8563 also has a timer triggered interrupt. In cases where the previous system left the timer and interrupts on, or somehow the bits got enabled, the interrupt would keep triggering as the kernel doesn't know about it.
Clear both the alarm and timer event flags, and disable the interrupts, before requesting the interrupt line.
--- drivers/rtc/rtc-pcf8563.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/rtc/rtc-pcf8563.c +5 -6
@@ -568,7 +568,6 @@ static int pcf8563_probe(struct i2c_client *client,struct pcf8563 *pcf8563;int err;unsigned char buf; -unsigned char alm_pending;dev_dbg (&client->dev,"%s\n" , __func__);
@@ -594,13 +593,13 @@ static int pcf8563_probe(struct i2c_client *client,return err; } - err =pcf8563_get_alarm_mode (client,NULL , &alm_pending); -if (err) { -dev_err (&client->dev,"%s: read error\n" , __func__); +/* Clear flags and disable interrupts */ + buf =0 ; + err =pcf8563_write_block_data (client,PCF8563_REG_ST2 ,1 , &buf); +if (err <0 ) { +dev_err (&client->dev,"%s: write error\n" , __func__);return err; } -if (alm_pending) -pcf8563_set_alarm_mode (client,0 ); pcf8563->rtc = devm_rtc_device_register(&client->dev, pcf8563_driver.driver.name,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/183 drm/msm/mdp5: Fix mdp5_cfg_init error return
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit fc19cbb785d7bbd1a1af26229b5240a3ab332744 ]
If mdp5_cfg_init fails because of an unknown major version, a null pointer dereference occurs. This is because the caller of init expects error pointers, but init returns NULL on error. Fix this by returning the expected values on error.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c +1 -1
@@ -547,7 +547,7 @@ fail:if (cfg_handler)mdp5_cfg_destroy (cfg_handler); -return NULL ; +return ERR_PTR (ret); }static struct mdp5_cfg_platform *mdp5_get_config (struct platform_device *dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/183 iommu: Use right function to get group for device
In reply to Greg Kroah-HartmanFrom: Lu Baolu <[email protected]>
[ Upstream commit 57274ea25736496ee019a5c40479855b21888839 ]
The iommu_group_get_for_dev() will allocate a group for a device if it isn't in any group. This isn't the use case in iommu_request_dm_for_dev(). Let's use iommu_group_get() instead.
--- drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/iommu.c +3 -3
@@ -1594,9 +1594,9 @@ int iommu_request_dm_for_dev(struct device *dev)int ret;/* Device must already be in a group before calling this function */ - group =iommu_group_get_for_dev (dev); -if (IS_ERR (group)) -return PTR_ERR (group); + group =iommu_group_get (dev); +if (!group) +return -EINVAL ;mutex_lock (&group->mutex);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/183 ehea: Fix a copy-paste err in ehea_init_port_res
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit c8f191282f819ab4e9b47b22a65c6c29734cefce ]
pr->tx_bytes should be assigned to tx_bytes other than rx_bytes.
--- drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ibm/ehea/ehea_main.c +1 -1
@@ -1477,7 +1477,7 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr,memset (pr,0 ,sizeof (struct ehea_port_res )); - pr->tx_bytes = rx_bytes; + pr->tx_bytes = tx_bytes; pr->tx_packets = tx_packets; pr->rx_bytes = rx_bytes; pr->rx_packets = rx_packets;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/183 iommu/vt-d: Make kernel parameter igfx_off work with vIOMMU
In reply to Greg Kroah-HartmanFrom: Lu Baolu <[email protected]>
[ Upstream commit 5daab58043ee2bca861068e2595564828f3bc663 ]
The kernel parameter igfx_off is used by users to disable DMA remapping for the Intel integrated graphic device. It was designed for bare metal cases where a dedicated IOMMU is used for graphic. This doesn't apply to virtual IOMMU case where an include-all IOMMU is used. This makes the kernel parameter work with virtual IOMMU as well.
--- drivers/iommu/intel-iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +4 -1
@@ -3259,9 +3259,12 @@ static int __init init_dmars(void) iommu_identity_mapping |=IDENTMAP_ALL ;#ifdef CONFIG_INTEL_IOMMU_BROKEN_GFX_WA - iommu_identity_mapping |=IDENTMAP_GFX ; + dmar_map_gfx =0 ;#endif +if (!dmar_map_gfx) + iommu_identity_mapping |=IDENTMAP_GFX ; +check_tylersburg_isoch ();if (iommu_identity_mapping) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/183 media: davinci/vpbe: array underflow in vpbe_enum_outputs()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b72845ee5577b227131b1fef23f9d9a296621d7b ]
In vpbe_enum_outputs() we check if (temp_index >= cfg->num_outputs) but the problem is that "temp_index" can be negative. This patch changes the types to unsigned to address this array underflow bug.
--- drivers/media/platform/davinci/vpbe.c | 2 +- include/media/davinci/vpbe.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/davinci/vpbe.c +1 -1
@@ -130,7 +130,7 @@ static int vpbe_enum_outputs(struct vpbe_device *vpbe_dev, struct v4l2_output *output) {struct vpbe_config *cfg = vpbe_dev->cfg; -int temp_index = output->index; +unsigned int temp_index = output->index;if (temp_index >= cfg->num_outputs)return -EINVAL ;
include/media/davinci/vpbe.h +1 -1
@@ -96,7 +96,7 @@ struct vpbe_config {struct encoder_config_info *ext_encoders;/* amplifier information goes here */ struct amp_config_info *amp; -int num_outputs; +unsigned int num_outputs;/* Order is venc outputs followed by LCD and then external encoders */ struct vpbe_output *outputs; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/183 ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 328e9f6973be2ee67862cb17bf6c0c5c5918cd72 ]
The error from snd_usb_mixer_apply_create_quirk() is ignored in the current usb-audio driver code, which will continue the probing even after the error. Let's take it more serious.
--- sound/usb/mixer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/usb/mixer.c +3 -1
@@ -2552,7 +2552,9 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, (err = snd_usb_mixer_status_create(mixer)) < 0) goto _error; -snd_usb_mixer_apply_create_quirk (mixer); + err =snd_usb_mixer_apply_create_quirk (mixer); +if (err <0 ) + goto _error; err =snd_device_new (chip->card,SNDRV_DEV_CODEC , mixer, &dev_ops);if (err <0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/183 dmaengine: axi-dmac: Dont check the number of frames for alignment
In reply to Greg Kroah-HartmanFrom: Alexandru Ardelean <[email protected]>
[ Upstream commit 648865a79d8ee3d1aa64aab5eb2a9d12eeed14f9 ]
In 2D transfers (for the AXI DMAC), the number of frames (numf) represents Y_LENGTH, and the length of a frame is X_LENGTH. 2D transfers are useful for video transfers where screen resolutions ( X * Y ) are typically aligned for X, but not for Y.
There is no requirement for Y_LENGTH to be aligned to the bus-width (or anything), and this is also true for AXI DMAC.
Checking the Y_LENGTH for alignment causes false errors when initiating DMA transfers. This change fixes this by checking only that the Y_LENGTH is non-zero.
--- drivers/dma/dma-axi-dmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dma-axi-dmac.c +1 -1
@@ -441,7 +441,7 @@ static struct dma_async_tx_descriptor *axi_dmac_prep_interleaved(if (chan->hw_2d) {if (!axi_dmac_check_len (chan, xt->sgl[0 ].size) || - !axi_dmac_check_len (chan, xt->numf)) + xt->numf ==0 )return NULL ;if (xt->sgl[0 ].size + dst_icg > chan->max_length || xt->sgl[0 ].size + src_icg > chan->max_length)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/183 ASoC: imx-sgtl5000: put of nodes if finding codec fails
In reply to Greg Kroah-HartmanFrom: Stefan Agner <[email protected]>
[ Upstream commit d9866572486802bc598a3e8576a5231378d190de ]
Make sure to properly put the of node in case finding the codec fails.
--- sound/soc/fsl/imx-sgtl5000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/fsl/imx-sgtl5000.c +2 -1
@@ -119,7 +119,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) codec_dev =of_find_i2c_device_by_node (codec_np);if (!codec_dev) {dev_err (&pdev->dev,"failed to find codec platform device\n" ); -return -EPROBE_DEFER ; + ret = -EPROBE_DEFER ; + goto fail; } data =devm_kzalloc (&pdev->dev,sizeof (*data),GFP_KERNEL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/183 m68k: mac: Fix VIA timer counter accesses
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
[ Upstream commit 0ca7ce7db771580433bf24454f7a1542bd326078 ]
This resolves some bugs that affect VIA timer counter accesses. Avoid lost interrupts caused by reading the counter low byte register. Make allowance for the fact that the counter will be decremented to 0xFFFF before being reloaded.
--- arch/m68k/mac/via.c | 102 +++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 49 deletions(-)
arch/m68k/mac/via.c +53 -49
@@ -53,16 +53,6 @@ static __u8 rbv_clear;static int gIER,gIFR,gBufA,gBufB; -/* -* Timer defs. -*/ - -#define TICK_SIZE 10000 -#define MAC_CLOCK_TICK (783300/HZ)/* ticks per HZ */ -#define MAC_CLOCK_LOW (MAC_CLOCK_TICK&0xFF) -#define MAC_CLOCK_HIGH (MAC_CLOCK_TICK>>8) - -/* * On Macs with a genuine VIA chip there is no way to mask an individual slot * interrupt. This limitation also seems to apply to VIA clone logic cores in
@@ -277,22 +267,6 @@ void __init via_init(void) } } -/* -* Start the 100 Hz clock -*/ - -void __init via_init_clock (irq_handler_t func) -{ - via1[vACR] |=0x40 ; - via1[vT1LL] =MAC_CLOCK_LOW ; - via1[vT1LH] =MAC_CLOCK_HIGH ; - via1[vT1CL] =MAC_CLOCK_LOW ; - via1[vT1CH] =MAC_CLOCK_HIGH ; - -if (request_irq (IRQ_MAC_TIMER_1 , func,0 ,"timer" , func)) -pr_err ("Couldn't register %s interrupt\n" ,"timer" ); -} -/* * Debugging dump, used in various places to see what's going on. */
@@ -320,29 +294,6 @@ void via_debug_dump(void) } } -/* -* This is always executed with interrupts disabled. -* -* TBI: get time offset between scheduling timer ticks -*/ - -u32 mac_gettimeoffset (void ) -{ -unsigned long ticks, offset =0 ; - -/* read VIA1 timer 2 current value */ - ticks = via1[vT1CL] | (via1[vT1CH] <<8 ); -/* The probability of underflow is less than 2% */ -if (ticks >MAC_CLOCK_TICK -MAC_CLOCK_TICK /50 ) -/* Check for pending timer interrupt in VIA1 IFR */ -if (via1[vIFR] &0x40 ) offset =TICK_SIZE ; - - ticks =MAC_CLOCK_TICK - ticks; - ticks = ticks *10000L /MAC_CLOCK_TICK ; - -return (ticks + offset) *1000 ; -} -/* * Flush the L2 cache on Macs that have it by flipping * the system into 24-bit mode for an instant.
@@ -619,3 +570,56 @@ int via2_scsi_drq_pending(void)return via2[gIFR] & (1 <<IRQ_IDX (IRQ_MAC_SCSIDRQ )); }EXPORT_SYMBOL (via2_scsi_drq_pending); + +/* timer and clock source */ + +#define VIA_CLOCK_FREQ 783360/* VIA "phase 2" clock in Hz */ +#define VIA_TIMER_INTERVAL (1000000 / HZ)/* microseconds per jiffy */ +#define VIA_TIMER_CYCLES (VIA_CLOCK_FREQ / HZ)/* clock cycles per jiffy */ + +#define VIA_TC (VIA_TIMER_CYCLES - 2)/* including 0 and -1 */ +#define VIA_TC_LOW (VIA_TC & 0xFF) +#define VIA_TC_HIGH (VIA_TC >> 8) + +void __init via_init_clock (irq_handler_t timer_routine) +{ +if (request_irq (IRQ_MAC_TIMER_1 , timer_routine,0 ,"timer" ,NULL )) { +pr_err ("Couldn't register %s interrupt\n" ,"timer" ); +return ; + } + + via1[vT1LL] =VIA_TC_LOW ; + via1[vT1LH] =VIA_TC_HIGH ; + via1[vT1CL] =VIA_TC_LOW ; + via1[vT1CH] =VIA_TC_HIGH ; + via1[vACR] |=0x40 ; +} + +u32 mac_gettimeoffset (void ) +{ +unsigned long flags; +u8 count_high; +u16 count, offset =0 ; + +/* +* Timer counter wrap-around is detected with the timer interrupt flag +* but reading the counter low byte (vT1CL) would reset the flag. +* Also, accessing both counter registers is essentially a data race. +* These problems are avoided by ignoring the low byte. Clock accuracy +* is 256 times worse (error can reach 0.327 ms) but CPU overhead is +* reduced by avoiding slow VIA register accesses. +*/ + +local_irq_save (flags); + count_high = via1[vT1CH]; +if (count_high ==0xFF ) + count_high =0 ; +if (count_high >0 && (via1[vIFR] &VIA_TIMER_1_INT )) + offset =VIA_TIMER_CYCLES ; +local_irq_restore (flags); + + count = count_high <<8 ; + count =VIA_TIMER_CYCLES - count + offset; + +return ((count *VIA_TIMER_INTERVAL ) /VIA_TIMER_CYCLES ) *1000 ; +}
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/183 xen, cpu_hotplug: Prevent an out of bounds access
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 201676095dda7e5b31a5e1d116d10fc22985075e ]
The "cpu" variable comes from the sscanf() so Smatch marks it as untrusted data. We can't pass a higher value than "nr_cpu_ids" to cpu_possible() or it results in an out of bounds access.
--- drivers/xen/cpu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/xen/cpu_hotplug.c +1 -1
@@ -53,7 +53,7 @@ static int vcpu_online(unsigned int cpu) }static void vcpu_hotplug (unsigned int cpu) { -if (!cpu_possible (cpu)) +if (cpu >= nr_cpu_ids || !cpu_possible (cpu))return ;switch (vcpu_online (cpu)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/183 fs/nfs: Fix nfs_parse_devname to not modify its argument
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 40cc394be1aa18848b8757e03bd8ed23281f572e ]
In the rare and unsupported case of a hostname list nfs_parse_devname will modify dev_name. There is no need to modify dev_name as the all that is being computed is the length of the hostname, so the computed length can just be shorted.
--- fs/nfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/super.c +1 -1
@@ -1901,7 +1901,7 @@ static int nfs_parse_devname(const char *dev_name,/* kill possible hostname list: not supported */ comma =strchr (dev_name,',' );if (comma !=NULL && comma < end) - *comma =0 ; + len = comma - dev_name; }if (len > maxnamlen)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/183 nios2: ksyms: Add missing symbol exports
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 0f8ed994575429d6042cf5d7ef70081c94091587 ]
Building nios2:allmodconfig fails as follows (each symbol is only listed once).
ERROR: "__ashldi3" [drivers/md/dm-writecache.ko] undefined!
ERROR: "__ashrdi3" [fs/xfs/xfs.ko] undefined!
ERROR: "__ucmpdi2" [drivers/media/i2c/adv7842.ko] undefined!
ERROR: "__lshrdi3" [drivers/md/dm-zoned.ko] undefined!
ERROR: "flush_icache_range" [drivers/misc/lkdtm/lkdtm.ko] undefined!
ERROR: "empty_zero_page" [drivers/md/dm-mod.ko] undefined!
The problem is seen with gcc 7.3.0.
Export the missing symbols.
--- arch/nios2/kernel/nios2_ksyms.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/nios2/kernel/nios2_ksyms.c +12 -0
@@ -9,12 +9,20 @@#include <linux/export.h> #include <linux/string.h> +#include <asm/cacheflush.h> +#include <asm/pgtable.h> +/* string functions */ EXPORT_SYMBOL (memcpy);EXPORT_SYMBOL (memset);EXPORT_SYMBOL (memmove); +/* memory management */ + +EXPORT_SYMBOL (empty_zero_page); +EXPORT_SYMBOL (flush_icache_range); +/* * libgcc functions - functions that are used internally by the * compiler... (prototypes are not correct though, but that
@@ -31,3 +39,7 @@ DECLARE_EXPORT(__udivsi3);DECLARE_EXPORT (__umoddi3);DECLARE_EXPORT (__umodsi3);DECLARE_EXPORT (__muldi3); +DECLARE_EXPORT (__ucmpdi2); +DECLARE_EXPORT (__lshrdi3); +DECLARE_EXPORT (__ashldi3); +DECLARE_EXPORT (__ashrdi3);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/183 regulator: wm831x-dcdc: Fix list of wm831x_dcdc_ilim from mA to uA
In reply to Greg Kroah-HartmanFrom: Axel Lin <[email protected]>
[ Upstream commit c25d47888f0fb3d836d68322d4aea2caf31a75a6 ]
The wm831x_dcdc_ilim entries needs to be uA because it is used to compare with min_uA and max_uA.
While at it also make the array const and change to use unsigned int.
--- drivers/regulator/wm831x-dcdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/wm831x-dcdc.c +2 -2
@@ -327,8 +327,8 @@ static int wm831x_buckv_get_voltage_sel(struct regulator_dev *rdev) }/* Current limit options */ -static u16 wm831x_dcdc_ilim[] = { -125 ,250 ,375 ,500 ,625 ,750 ,875 ,1000 +static const unsigned int wm831x_dcdc_ilim[] = { +125000 ,250000 ,375000 ,500000 ,625000 ,750000 ,875000 ,1000000 }; static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/183 cdc-wdm: pass return value of recover_from_urb_loss
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 0742a338f5b3446a26de551ad8273fb41b2787f2 ]
'rv' is the correct return value, pass it upstream instead of 0
--- drivers/usb/class/cdc-wdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +1 -1
@@ -1098,7 +1098,7 @@ static int wdm_post_reset(struct usb_interface *intf) rv =recover_from_urb_loss (desc);mutex_unlock (&desc->wlock);mutex_unlock (&desc->rlock); -return 0 ; +return rv; }static struct usb_driver wdm_driver = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/183 ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 8d1667200850f8753c0265fa4bd25c9a6e5f94ce ]
The apq8016 driver leaves the of-node refcount at aborting from the loop of for_each_child_of_node() in the error path. Not only the iterator node of for_each_child_of_node(), the children nodes referred from it for codec and cpu have to be properly unreferenced.
--- sound/soc/qcom/apq8016_sbc.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
sound/soc/qcom/apq8016_sbc.c +16 -5
@@ -98,13 +98,15 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)if (!cpu || !codec) {dev_err (dev,"Can't find cpu/codec DT node\n" ); -return ERR_PTR (-EINVAL ); + ret = -EINVAL ; + goto error; } link->cpu_of_node =of_parse_phandle (cpu,"sound-dai" ,0 );if (!link->cpu_of_node) {dev_err (card->dev,"error getting cpu phandle\n" ); -return ERR_PTR (-EINVAL ); + ret = -EINVAL ; + goto error; } link->codec_of_node =of_parse_phandle (codec,"sound-dai" ,0 );
@@ -116,13 +118,13 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) ret =snd_soc_of_get_dai_name (cpu, &link->cpu_dai_name);if (ret) {dev_err (card->dev,"error getting cpu dai name\n" ); -return ERR_PTR (ret); + goto error; } ret =snd_soc_of_get_dai_name (codec, &link->codec_dai_name);if (ret) {dev_err (card->dev,"error getting codec dai name\n" ); -return ERR_PTR (ret); + goto error; } link->platform_of_node = link->cpu_of_node;
@@ -132,15 +134,24 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) ret =of_property_read_string (np,"link-name" , &link->name);if (ret) {dev_err (card->dev,"error getting codec dai_link name\n" ); -return ERR_PTR (ret); + goto error; } link->stream_name = link->name; link->init = apq8016_sbc_dai_init; link++; + +of_node_put (cpu); +of_node_put (codec); }return data; + + error: +of_node_put (np); +of_node_put (cpu); +of_node_put (codec); +return ERR_PTR (ret); }static int apq8016_sbc_platform_probe (struct platform_device *pdev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/183 pinctrl: sh-pfc: r8a7791: Fix scifb2_data_c pin group
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit a4b0350047f1b10207e25e72d7cd3f7826e93769 ]
The entry for "scifb2_data_c" in the SCIFB2 pin group array contains a typo, thus the group cannot be selected.
--- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-r8a7791.c +1 -1
@@ -4967,7 +4967,7 @@ static const char * const scifb2_groups[] = {"scifb2_data_b" ,"scifb2_clk_b" ,"scifb2_ctrl_b" , -"scifb0_data_c" , +"scifb2_data_c" ,"scifb2_clk_c" , "scifb2_data_d", };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/183 pinctrl: sh-pfc: emev2: Add missing pinmux functions
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 1ecd8c9cb899ae277e6986ae134635cb1a50f5de ]
The err_rst_reqb, ext_clki, lowpwr, and ref_clko pin groups are present, but no pinmux functions refer to them, hence they can not be selected.
--- drivers/pinctrl/sh-pfc/pfc-emev2.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/pinctrl/sh-pfc/pfc-emev2.c +20 -0
@@ -1263,6 +1263,14 @@ static const char * const dtv_groups[] = { "dtv_b", }; +static const char *const err_rst_reqb_groups[] = { +"err_rst_reqb" , +}; + +static const char *const ext_clki_groups[] = { +"ext_clki" , +}; +static const char *const iic0_groups[] = {"iic0" , };
@@ -1285,6 +1293,10 @@ static const char * const lcd_groups[] = { "yuv3", }; +static const char *const lowpwr_groups[] = { +"lowpwr" , +}; +static const char *const ntsc_groups[] = {"ntsc_clk" ,"ntsc_data" ,
@@ -1298,6 +1310,10 @@ static const char * const pwm1_groups[] = { "pwm1", }; +static const char *const ref_clko_groups[] = { +"ref_clko" , +}; +static const char *const sd_groups[] = {"sd_cki" , };
@@ -1391,13 +1407,17 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (cam),SH_PFC_FUNCTION (cf),SH_PFC_FUNCTION (dtv), +SH_PFC_FUNCTION (err_rst_reqb), +SH_PFC_FUNCTION (ext_clki),SH_PFC_FUNCTION (iic0),SH_PFC_FUNCTION (iic1),SH_PFC_FUNCTION (jtag),SH_PFC_FUNCTION (lcd), +SH_PFC_FUNCTION (lowpwr),SH_PFC_FUNCTION (ntsc),SH_PFC_FUNCTION (pwm0),SH_PFC_FUNCTION (pwm1), +SH_PFC_FUNCTION (ref_clko),SH_PFC_FUNCTION (sd),SH_PFC_FUNCTION (sdi0), SH_PFC_FUNCTION(sdi1),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/183 fbdev: chipsfb: remove set but not used variable size
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 8e71fa5e4d86bedfd26df85381d65d6b4c860020 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/video/fbdev/chipsfb.c: In function 'chipsfb_pci_init':drivers/video/fbdev/chipsfb.c:352:22: warning:
variable 'size' set but not used [-Wunused-but-set-variable]
--- drivers/video/fbdev/chipsfb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/chipsfb.c +1 -2
@@ -350,7 +350,7 @@ static void init_chips(struct fb_info *p, unsigned long addr)static int chipsfb_pci_init (struct pci_dev *dp,const struct pci_device_id *ent) {struct fb_info *p; -unsigned long addr, size; +unsigned long addr;unsigned short cmd;int rc = -ENODEV ;
@@ -362,7 +362,6 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)if ((dp->resource[0 ].flags &IORESOURCE_MEM ) ==0 ) goto err_disable; addr =pci_resource_start (dp,0 ); - size =pci_resource_len (dp,0 );if (addr ==0 ) goto err_disable;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/183 ALSA: hda: fix unused variable warning
In reply to Greg Kroah-HartmanFrom: Anders Roxell <[email protected]>
[ Upstream commit 5b03006d5c58ddd31caf542eef4d0269bcf265b3 ]
When CONFIG_X86=n function azx_snoop doesn't use the variable chip it only returns true.
sound/pci/hda/hda_intel.c: In function ‘dma_alloc_pages’:sound/pci/hda/hda_intel.c:2002:14: warning: unused variable ‘chip’ [-Wunused-variable]
struct azx *chip = bus_to_azx(bus);
^~~~Create a inline function of azx_snoop.
--- sound/pci/hda/hda_controller.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
sound/pci/hda/hda_controller.h +4 -5
@@ -164,11 +164,10 @@ struct azx {#define azx_bus (chip) (&(chip)->bus.core)#define bus_to_azx (_bus) container_of(_bus, struct azx, bus.core) -#ifdef CONFIG_X86 -#define azx_snoop (chip) ((chip)->snoop) -#else -#define azx_snoop (chip) true -#endif +static inline bool azx_snoop (struct azx *chip) +{ +return !IS_ENABLED (CONFIG_X86 ) || chip->snoop; +}/* * macros for easy use
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/183 clk: vf610: fix refcount leak in vf610_clocks_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 567177024e0313e4f0dcba7ba10c0732e50e655d ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/imx/clk-vf610.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/imx/clk-vf610.c +1 -0
@@ -155,6 +155,7 @@ static void __init vf610_clocks_init(struct device_node *ccm_node) np =of_find_compatible_node (NULL ,NULL ,"fsl,vf610-anatop" ); anatop_base =of_iomap (np,0 );BUG_ON (!anatop_base); +of_node_put (np); np = ccm_node; ccm_base =of_iomap (np,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/183 clk: qoriq: fix refcount leak in clockgen_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 70af6c5b5270e8101f318c4b69cc98a726edfab9 ]
The of_find_compatible_node() returns a node pointer with refcount incremented, but there is the lack of use of the of_node_put() when done. Add the missing of_node_put() to release the refcount.
--- drivers/clk/clk-qoriq.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk-qoriq.c +1 -0
@@ -1244,6 +1244,7 @@ static void __init clockgen_init(struct device_node *np)pr_err ("%s: Couldn't map %s regs\n" , __func__, guts->full_name); } +of_node_put (guts); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/183 powerpc/archrandom: fix arch_get_random_seed_int()
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit b6afd1234cf93aa0d71b4be4788c47534905f0be upstream.
Commit 01c9348c7620ec65
powerpc: Use hardware RNG for arch_get_random_seed_* not arch_get_random_*
updated arch_get_random_[int|long]() to be NOPs, and moved the hardware RNG backing to arch_get_random_seed_[int|long]() instead. However, it failed to take into account that arch_get_random_int() was implemented in terms of arch_get_random_long(), and so we ended up with a version of the former that is essentially a NOP as well.
Fix this by calling arch_get_random_seed_long() from arch_get_random_seed_int() instead.
--- arch/powerpc/include/asm/archrandom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/archrandom.h +1 -1
@@ -27,7 +27,7 @@ static inline int arch_get_random_seed_iunsigned long val;int rc; - rc =arch_get_random_long (&val); + rc =arch_get_random_seed_long (&val);if (rc) *v = val;
Greg Kroah-Hartman
maintainerPATCH 10/183 drm/dp_mst: Skip validating ports during destruction, just ref
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
[ Upstream commit c54c7374ff44de5e609506aca7c0deae4703b6d1 ]
Jerry Zuo pointed out a rather obscure hotplugging issue that it seems I accidentally introduced into DRM two years ago.
Pretend we have a topology like this:
|- DP-1: mst_primary
|- DP-4: active display
|- DP-5: disconnected
|- DP-6: active hub
|- DP-7: active display
|- DP-8: disconnected
|- DP-9: disconnectedIf we unplug DP-6, the topology starting at DP-7 will be destroyed but it's payloads will live on in DP-1's VCPI allocations and thus require removal. However, this removal currently fails because drm_dp_update_payload_part1() will (rightly so) try to validate the port before accessing it, fail then abort. If we keep going, eventually we run the MST hub out of bandwidth and all new allocations will start to fail (or in my case; all new displays just start flickering a ton).
We could just teach drm_dp_update_payload_part1() not to drop the port ref in this case, but then we also need to teach drm_dp_destroy_payload_step1() to do the same thing, then hope no one ever adds anything to the that requires a validated port reference in drm_dp_destroy_connector_work(). Kind of sketchy.
So let's go with a more clever solution: any port that drm_dp_destroy_connector_work() interacts with is guaranteed to still exist in memory until we say so. While said port might not be valid we don't really care: that's the whole reason we're destroying it in the first place! So, teach drm_dp_get_validated_port_ref() to use the all mighty current_work() function to avoid attempting to validate ports from the context of mgr->destroy_connector_work. I can't see any situation where this wouldn't be safe, and this avoids having to play whack-a-mole in the future of trying to work around port validation.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +13 -2
@@ -975,9 +975,20 @@ static struct drm_dp_mst_port *drm_dp_mst_get_port_ref_locked(struct drm_dp_mst_static struct drm_dp_mst_port *drm_dp_get_validated_port_ref (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port) {struct drm_dp_mst_port *rport =NULL ; +mutex_lock (&mgr->lock); -if (mgr->mst_primary) - rport =drm_dp_mst_get_port_ref_locked (mgr->mst_primary, port); +/* +* Port may or may not be 'valid' but we don't care about that when +* destroying the port and we are guaranteed that the port pointer +* will be valid until we've finished +*/ +if (current_work () == &mgr->destroy_connector_work) { +kref_get (&port->kref); + rport = port; + }else if (mgr->mst_primary) { + rport =drm_dp_mst_get_port_ref_locked (mgr->mst_primary, + port); + }mutex_unlock (&mgr->lock);return rport; }
Signature · 1 line
2.20.1
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.212 release. There are 183 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 Thu, 30 Jan 2020 13:57:09 +0000. Anything received after that time might be too late.
v4.4.211-184-gc4e686398655:
arch/powerpc/kernel/cacheinfo.c: In function ‘cacheinfo_teardown’:arch/powerpc/kernel/cacheinfo.c:875:2: error: implicit declaration of function ‘lockdep_assert_cpus_held’;
Guenter
Greg Kroah-Hartman
maintainerQuoted 6 lines · Guenter Roeck
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.212 release. There are 183 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.
Quoted 8 lines
Quoted 3 lines
Responses should be made by Thu, 30 Jan 2020 13:57:09 +0000. Anything received after that time might be too late.
v4.4.211-184-gc4e686398655:
arch/powerpc/kernel/cacheinfo.c: In function ‘cacheinfo_teardown’:arch/powerpc/kernel/cacheinfo.c:875:2: error: implicit declaration of function ‘lockdep_assert_cpus_held’;
Ugh :(
Will go fix this in 4.4.y and 4.9.y and push out new -rc2 trees with that resolved, thanks for the quick turn-around.
greg k-h