4.9.212-stable review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 234/271 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/271 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 10/271 pwm: lpss: Release runtime-pm reference from the drivers remove callback
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 42885551cedb45961879d2fc3dc3c4dc545cc23e ]
For each pwm output which gets enabled through pwm_lpss_apply(), we do a pm_runtime_get_sync().
This commit adds pm_runtime_put() calls to pwm_lpss_remove() to balance these when the driver gets removed with some of the outputs still enabled.
--- drivers/pwm/pwm-lpss.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/pwm/pwm-lpss.c +6 -0
@@ -205,6 +205,12 @@ EXPORT_SYMBOL_GPL(pwm_lpss_probe);int pwm_lpss_remove (struct pwm_lpss_chip *lpwm) { +int i; + +for (i =0 ; i < lpwm->info->npwm; i++) { +if (pwm_is_enabled (&lpwm->chip.pwms[i])) +pm_runtime_put (lpwm->chip.dev); + }return pwmchip_remove (&lpwm->chip); }EXPORT_SYMBOL_GPL (pwm_lpss_remove);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/271 mlxsw: reg: QEEC: Add minimum shaper fields
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit 8b931821aa04823e2e5df0ae93937baabbd23286 ]
Add QEEC.mise (minimum shaper enable) and QEEC.min_shaper_rate to enable configuration of minimum shaper.
Increase the QEEC length to 0x20 as well: that's the length that the register has had for a long time now, but with the configurations that mlxsw typically exercises, the firmware tolerated 0x1C-sized packets. With mise=true however, FW rejects packets unless they have the full required length.
--- drivers/net/ethernet/mellanox/mlxsw/reg.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/reg.h +21 -1
@@ -1873,7 +1873,7 @@ static inline void mlxsw_reg_qtct_pack(char *payload, u8 local_port,* Configures the ETS elements. */ #define MLXSW_REG_QEEC_ID 0x400D -#define MLXSW_REG_QEEC_LEN 0x1C +#define MLXSW_REG_QEEC_LEN 0x20static const struct mlxsw_reg_info mlxsw_reg_qeec = { .id =MLXSW_REG_QEEC_ID ,
@@ -1918,6 +1918,15 @@ MLXSW_ITEM32(reg, qeec, element_index, 0x04, 0, 8);*/ MLXSW_ITEM32 (reg, qeec, next_element_index,0x08 ,0 ,8 ); +/* reg_qeec_mise +* Min shaper configuration enable. Enables configuration of the min +* shaper on this ETS element +* 0 - Disable +* 1 - Enable +* Access: RW +*/ +MLXSW_ITEM32 (reg, qeec, mise,0x0C ,31 ,1 ); +enum {MLXSW_REG_QEEC_BYTES_MODE ,MLXSW_REG_QEEC_PACKETS_MODE ,
@@ -1934,6 +1943,17 @@ enum {*/ MLXSW_ITEM32 (reg, qeec, pb,0x0C ,28 ,1 ); +/* The smallest permitted min shaper rate. */ +#define MLXSW_REG_QEEC_MIS_MIN 200000/* Kbps */ + +/* reg_qeec_min_shaper_rate +* Min shaper information rate. +* For CPU port, can only be configured for port hierarchy. +* When in bytes mode, value is specified in units of 1000bps. +* Access: RW +*/ +MLXSW_ITEM32 (reg, qeec, min_shaper_rate,0x0C ,0 ,28 ); +/* reg_qeec_mase * Max shaper configuration enable. Enables configuration of the max * shaper on this ETS element.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/271 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
@@ -146,6 +146,7 @@ static struct dentry *reconnect_one(struct vfsmount *mnt, tmp =lookup_one_len_unlocked (nbuf, parent,strlen (nbuf));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
maintainerPATCH 14/271 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
@@ -980,9 +980,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
Greg Kroah-Hartman
maintainerPATCH 15/271 net: phy: Fix not to call phy_resume() if PHY is not attached
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
[ Upstream commit ef1b5bf506b1f0ee3edc98533e1f3ecb105eb46a ]
This patch fixes an issue that mdio_bus_phy_resume() doesn't call phy_resume() if the PHY is not attached.
--- drivers/net/phy/phy_device.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/phy/phy_device.c +6 -5
@@ -80,7 +80,7 @@ static LIST_HEAD(phy_fixup_list);static DEFINE_MUTEX (phy_fixup_lock);#ifdef CONFIG_PM -static bool mdio_bus_phy_may_suspend (struct phy_device *phydev) +static bool mdio_bus_phy_may_suspend (struct phy_device *phydev,bool suspend) {struct device_driver *drv = phydev->mdio.dev.driver;struct phy_driver *phydrv =to_phy_driver (drv);
@@ -92,10 +92,11 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)/* PHY not attached? May suspend if the PHY has not already been * suspended as part of a prior call to phy_disconnect() -> * phy_detach() -> phy_suspend() because the parent netdev might be the -* MDIO bus driver and clock gated at this point. +* MDIO bus driver and clock gated at this point. Also may resume if +* PHY is not attached. */ if (!netdev) -return !phydev->suspended; +return suspend ? !phydev->suspended : phydev->suspended;/* Don't suspend PHY if the attached netdev parent may wakeup. * The parent may point to a PCI device, as in tg3 driver.
@@ -125,7 +126,7 @@ static int mdio_bus_phy_suspend(struct device *dev)if (phydev->attached_dev && phydev->adjust_link)phy_stop_machine (phydev); -if (!mdio_bus_phy_may_suspend (phydev)) +if (!mdio_bus_phy_may_suspend (phydev, true))return 0 ;return phy_suspend (phydev);
@@ -136,7 +137,7 @@ static int mdio_bus_phy_resume(struct device *dev)struct phy_device *phydev =to_phy_device (dev);int ret; -if (!mdio_bus_phy_may_suspend (phydev)) +if (!mdio_bus_phy_may_suspend (phydev, false)) goto no_resume; ret =phy_resume (phydev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/271 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 17/271 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
@@ -2154,6 +2154,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 16/271 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
@@ -1982,7 +1982,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 19/271 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
@@ -4264,17 +4264,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 2/271 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 21/271 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
@@ -4826,7 +4826,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 22/271 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
@@ -2237,7 +2237,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 23/271 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 24/271 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
@@ -2231,7 +2231,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 25/271 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 26/271 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
@@ -293,6 +293,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 27/271 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
@@ -1245,6 +1245,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 3/271 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
@@ -221,7 +221,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 4/271 drm/sti: do not remove the drm_bridge that was never added
In reply to Greg Kroah-HartmanFrom: Peter Rosin <[email protected]>
[ Upstream commit 66e31a72dc38543b2d9d1ce267dc78ba9beebcfd ]
Removing the drm_bridge_remove call should avoid a NULL dereference during list processing in drm_bridge_remove if the error path is ever taken.
The more natural approach would perhaps be to add a drm_bridge_add, but there are several other bridges that never call drm_bridge_add. Just removing the drm_bridge_remove is the easier fix.
--- drivers/gpu/drm/sti/sti_hda.c | 1 - drivers/gpu/drm/sti/sti_hdmi.c | 1 - 2 files changed, 2 deletions(-)
drivers/gpu/drm/sti/sti_hda.c +0 -1
@@ -740,7 +740,6 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)return 0 ; err_sysfs: -drm_bridge_remove (bridge);return -EINVAL ; }
drivers/gpu/drm/sti/sti_hdmi.c +0 -1
@@ -1352,7 +1352,6 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)return 0 ; err_sysfs: -drm_bridge_remove (bridge); hdmi->drm_connector =NULL ;return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/271 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 7/271 IB/rxe: replace kvfree with vfree
In reply to Greg Kroah-HartmanFrom: Zhu Yanjun <[email protected]>
[ Upstream commit 721ad7e643f7002efa398838693f90284ea216d1 ]
The buf is allocated by vmalloc_user in the function rxe_queue_init. So it is better to free it by vfree.
--- drivers/infiniband/sw/rxe/rxe_cq.c | 4 ++-- drivers/infiniband/sw/rxe/rxe_qp.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/infiniband/sw/rxe/rxe_cq.c +2 -2
@@ -30,7 +30,7 @@* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - +#include <linux/vmalloc.h> #include "rxe.h" #include "rxe_loc.h" #include "rxe_queue.h"
@@ -89,7 +89,7 @@ int rxe_cq_from_init(struct rxe_dev *rxe, struct rxe_cq *cq, int cqe, err =do_mmap_info (rxe, udata, false, context, cq->queue->buf, cq->queue->buf_size, &cq->queue->ip);if (err) { -kvfree (cq->queue->buf); +vfree (cq->queue->buf);kfree (cq->queue);return err; }
drivers/infiniband/sw/rxe/rxe_qp.c +3 -2
@@ -34,6 +34,7 @@#include <linux/skbuff.h> #include <linux/delay.h> #include <linux/sched.h> +#include <linux/vmalloc.h> #include "rxe.h" #include "rxe_loc.h"
@@ -255,7 +256,7 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp, qp->sq.queue->buf_size, &qp->sq.queue->ip);if (err) { -kvfree (qp->sq.queue->buf); +vfree (qp->sq.queue->buf);kfree (qp->sq.queue);return err; }
@@ -312,7 +313,7 @@ static int rxe_qp_init_resp(struct rxe_dev *rxe, struct rxe_qp *qp, qp->rq.queue->buf_size, &qp->rq.queue->ip);if (err) { -kvfree (qp->rq.queue->buf); +vfree (qp->rq.queue->buf);kfree (qp->rq.queue);return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 6/271 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
@@ -171,11 +171,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 8/271 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 9/271 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
@@ -4945,7 +4945,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 ;
@@ -4966,11 +4969,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 ; }
@@ -4986,12 +4996,12 @@ static unsigned int ni_get_rtsi_routing(struct comedi_device *dev, }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
maintainercover 4.9.212-stable review
This is the start of the stable review cycle for the 4.9.212 release. There are 271 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.9.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.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.212-rc1
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
Dan Carpenter <[email protected]>
bcache: silence static checker warning
Wen Huang <[email protected]>
libertas: Fix two buffer overflows at parsing bss descriptor
Suzuki K Poulose <[email protected]>
coresight: tmc-etf: Do not call smp_processor_id from preemptible
Suzuki K Poulose <[email protected]>
coresight: etb10: Do not call smp_processor_id from preemptible
Will Deacon <[email protected]>
arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field
Jeremy Linton <[email protected]>
Documentation: Document arm64 kpti control
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
Chuhong Yuan <[email protected]>
Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register
Johan Hovold <[email protected]>
Input: pegasus_notetaker - fix endpoint sanity check
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
Michał Mirosław <[email protected]>
mmc: tegra: fix SDR50 tuning override
Alex Sverdlin <[email protected]>
ARM: 8950/1: ftrace/recordmcount: filter relocation types
Johan Hovold <[email protected]>
Input: keyspan-remote - fix control-message timeouts
Guenter Roeck <[email protected]>
hwmon: (core) Do not use device managed functions for memory allocations
Dmitry Osipenko <[email protected]>
hwmon: (core) Fix double-free in __hwmon_device_register()
Linus Walleij <[email protected]>
hwmon: Deal with errors from the thermal subsystem
Guenter Roeck <[email protected]>
hwmon: (core) Simplify sysfs attribute name allocation
Luuk Paulussen <[email protected]>
hwmon: (adt7475) Make volt2reg return same reg as reg2volt input
Eric Dumazet <[email protected]>
gtp: make sure only SOCK_DGRAM UDP sockets are accepted
James Hughes <[email protected]>
net: usb: lan78xx: Add .ndo_features_check
Wen Yang <[email protected]>
tcp_bbr: improve arithmetic division in bbr_update_bw()
Cong Wang <[email protected]>
net_sched: fix datalen for ematch
William Dauchy <[email protected]>
net, ip_tunnel: fix namespaces move
William Dauchy <[email protected]>
net, ip6_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
Florian Fainelli <[email protected]>
net: phy: Keep reporting transceiver type
Florian Fainelli <[email protected]>
net: ethtool: Add back transceiver type
Finn Thain <[email protected]>
m68k: Call timer_interrupt() with interrupts disabled
Max Gurtovoy <[email protected]>
IB/iser: Fix dma_nents type definition
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
Marc Dionne <[email protected]>
afs: Fix large file support
Stefan Wahren <[email protected]>
net: qca_spi: Move reset_count to struct qcaspi
Jakub Kicinski <[email protected]>
net: netem: correct the parent's backlog when corrupted packet was dropped
Jakub Kicinski <[email protected]>
net: netem: fix error path for corrupted GSO frames
Robin Gong <[email protected]>
dmaengine: imx-sdma: fix size check for sdma script_number
Jeffrey Hugo <[email protected]>
drm/msm/dsi: Implement reset correctly
YueHaibing <[email protected]>
act_mirred: Fix mirred_init_module error handling
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
Jose Abreu <[email protected]>
net: stmmac: gmac4+: Not all Unicast addresses may be available
Ard Biesheuvel <[email protected]>
nvme: retain split access workaround for capability reads
Dan Carpenter <[email protected]>
net: ethernet: stmmac: Fix signedness bug in ipq806x_gmac_of_parse()
Dan Carpenter <[email protected]>
of: mdio: Fix a signedness bug in of_phy_get_and_connect()
Dan Carpenter <[email protected]>
net: stmmac: dwmac-meson8b: Fix signedness bug in probe
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
Dan Carpenter <[email protected]>
staging: greybus: light: fix a couple double frees
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()
Guenter Roeck <[email protected]>
hwmon: (lm75) Fix write operations for negative temperatures
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()
Maxime Ripard <[email protected]>
ASoC: sun4i-i2s: RX and TX counter registers are swapped
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
Mark Zhang <[email protected]>
net/mlx5: Fix mlx5_ifc_query_lag_out_bits
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
Arnd Bergmann <[email protected]>
qed: reduce maximum stack frame size
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()
Xi Wang <[email protected]>
RDMA/hns: Fixs hw access invalid dma memory error
Arnd Bergmann <[email protected]>
devres: allow const resource arguments
David Howells <[email protected]>
rxrpc: Fix uninitialized error code in rxrpc_send_data_packet()
Andy Shevchenko <[email protected]>
mfd: intel-lpss: Release IDA resources
Kevin Mitchell <[email protected]>
iommu/amd: Make iommu_disable safer
Nathan Huckleberry <[email protected]>
clk: qcom: Fix -Wunused-const-variable
Andy Shevchenko <[email protected]>
dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
Ravi Bangoria <[email protected]>
perf/ioctl: Add check for the sample_period value
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
Jakub Kicinski <[email protected]>
net: netem: fix backlog accounting for corrupted GSO frames
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
Erwan Le Ray <[email protected]>
serial: stm32: fix transmit_chars when tx is stopped
Hook, Gary <[email protected]>
crypto: ccp - fix AES CFB error exposed by new test vectors
Christophe Leroy <[email protected]>
spi: spi-fsl-spi: call spi_finalize_current_message() at the end
Jon Hunter <[email protected]>
dmaengine: tegra210-adma: Fix crash during probe
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
Bichao Zheng <[email protected]>
pwm: meson: Don't disable PWM when setting duty repeatedly
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()
YueHaibing <[email protected]>
l2tp: Fix possible NULL pointer dereference
Sameer Pujar <[email protected]>
dmaengine: tegra210-adma: restore channel status
Sameeh Jubran <[email protected]>
net: ena: fix ena_com_fill_hash_function() implementation
Sameeh Jubran <[email protected]>
net: ena: fix incorrect test of supported hash function
Sameeh Jubran <[email protected]>
net: ena: fix: Free napi resources when ena_up() fails
Sameeh Jubran <[email protected]>
net: ena: fix swapped parameters when calling ena_com_indirect_table_fill_entry
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
Arnd Bergmann <[email protected]>
usb: gadget: fsl: fix link error against usb-gadget module
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
Vladimir Oltean <[email protected]>
ARM: dts: ls1021: Fix SGMII PCS link remaining down after PHY disconnect
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
YueHaibing <[email protected]>
media: tw5864: Fix possible NULL pointer dereference in tw5864_handle_frame
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
Jon Maloy <[email protected]>
tipc: tipc clang warning
Arnd Bergmann <[email protected]>
jfs: fix bogus variable self-initialization
Axel Lin <[email protected]>
regulator: tps65086: Fix tps65086_ldoa1_ranges for selector 0xB
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
Dan Carpenter <[email protected]>
drivers/rapidio/rio_cm.c: fix potential oops in riocm_ch_listen()
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
Vladimir Murzin <[email protected]>
ARM: 8848/1: virt: Align GIC version check with arm64 counterpart
Marek Szyprowski <[email protected]>
ARM: 8847/1: pm: fix HYP/SVC mode mismatch when MCPM is used
Stefan Wahren <[email protected]>
mmc: sdhci-brcmstb: handle mmc_of_parse() errors during probe
Marek Szyprowski <[email protected]>
clocksource/drivers/exynos_mct: Fix error path in timer resources initialization
Chen-Yu Tsai <[email protected]>
clocksource/drivers/sun5i: Fail gracefully when clock rate is unavailable
Trond Myklebust <[email protected]>
NFS: Fix a soft lockup in the delegation recovery code
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
Vinod Koul <[email protected]>
net: dsa: qca8k: Enable delay for RGMII_ID mode
Axel Lin <[email protected]>
regulator: pv88090: Fix array out-of-bounds access
Axel Lin <[email protected]>
regulator: pv88080: Fix array out-of-bounds access
Axel Lin <[email protected]>
regulator: pv88060: Fix array out-of-bounds access
YueHaibing <[email protected]>
cdc-wdm: pass return value of recover_from_urb_loss
Robin Murphy <[email protected]>
dmaengine: mv_xor: Use correct device for DMA API
Eric Auger <[email protected]>
vfio_pci: Enable memory accesses before calling pci_map_rom
David Howells <[email protected]>
keys: Timestamp new keys
Ming Lei <[email protected]>
block: don't use bio->bi_vcnt to figure out segment number
Sven Van Asbroeck <[email protected]>
usb: phy: twl6030-usb: fix possible use-after-free on remove
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh73a0: Fix fsic_spdif pin groups
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: r8a7792: Fix vin1_data18_b pin group
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
Steve Wise <[email protected]>
iw_cxgb4: use tos when finding ipv6 routes
Steve Wise <[email protected]>
iw_cxgb4: use tos when importing the endpoint
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
Moritz Fischer <[email protected]>
net: phy: fixed_phy: Fix fixed_phy not checking GPIO
Michael Kao <[email protected]>
thermal: mediatek: fix register index error
Colin Ian King <[email protected]>
rtc: ds1672: fix unintended sign extension
Colin Ian King <[email protected]>
staging: most: cdev: add missing check for cdev_add failure
Sara Sharon <[email protected]>
iwlwifi: mvm: fix RSS config command
Vladimir Zapolskiy <[email protected]>
ARM: dts: lpc32xx: phy3250: fix SD card regulator voltage
Vladimir Zapolskiy <[email protected]>
ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller clocks property
Vladimir Zapolskiy <[email protected]>
ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller variant
Vladimir Zapolskiy <[email protected]>
ARM: dts: lpc32xx: reparent keypad controller to SIC1
Vladimir Zapolskiy <[email protected]>
ARM: dts: lpc32xx: add required clocks property to keypad device node
Corentin Labbe <[email protected]>
crypto: crypto4xx - Fix wrong ppc4xx_trng_probe()/ppc4xx_trng_remove() arguments
YueHaibing <[email protected]>
tty: ipwireless: Fix potential NULL pointer dereference
Johannes Berg <[email protected]>
iwlwifi: mvm: fix A-MPDU reference assignment
Chen-Yu Tsai <[email protected]>
clk: sunxi-ng: sun8i-a23: Enable PLL-MIPI LDOs when ungating it
Eric Wong <[email protected]>
rtc: cmos: ignore bogus century byte
Israel Rukshin <[email protected]>
IB/iser: Pass the correct number of entries for dma mapped SGL
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
Dan Carpenter <[email protected]>
drm/etnaviv: NULL vs IS_ERR() buf in etnaviv_core_dump()
Loic Poulain <[email protected]>
arm64: dts: apq8016-sbc: Increase load on l11 for SDCARD
Gal Pressman <[email protected]>
RDMA/qedr: Fix out of bounds index check in query pkey
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: dove: fix refcount leak in dove_clk_init()
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
Yoshihiro Shimoda <[email protected]>
net: phy: Fix not to call phy_resume() if PHY is not attached
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
Petr Machata <[email protected]>
mlxsw: reg: QEEC: Add minimum shaper fields
Hans de Goede <[email protected]>
pwm: lpss: Release runtime-pm reference from the driver's remove callback
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
Zhu Yanjun <[email protected]>
IB/rxe: replace kvfree with vfree
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()
Peter Rosin <[email protected]>
drm/sti: do not remove the drm_bridge that was never added
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:
Documentation/kernel-parameters.txt | 6 ++ Makefile | 4 +- arch/arm/boot/dts/lpc3250-phy3250.dts | 4 +- arch/arm/boot/dts/lpc32xx.dtsi | 10 +- arch/arm/boot/dts/ls1021a-twr.dts | 9 +- arch/arm/boot/dts/ls1021a.dtsi | 11 +- arch/arm/common/mcpm_entry.c | 2 +- arch/arm/include/asm/suspend.h | 1 + arch/arm/kernel/hyp-stub.S | 4 +- 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/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 + arch/arm64/kernel/cpufeature.c | 5 + 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/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/dove.c | 8 +- drivers/clk/mvebu/kirkwood.c | 2 + drivers/clk/qcom/gcc-msm8996.c | 36 ------- drivers/clk/samsung/clk-exynos4.c | 1 + drivers/clk/socfpga/clk-pll-a10.c | 1 + drivers/clk/socfpga/clk-pll.c | 1 + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 2 +- drivers/clocksource/exynos_mct.c | 14 ++- drivers/clocksource/timer-sun5i.c | 10 ++ drivers/crypto/amcc/crypto4xx_trng.h | 4 +- drivers/crypto/caam/caamrng.c | 5 +- drivers/crypto/ccp/ccp-crypto-aes.c | 8 +- drivers/dma/dma-axi-dmac.c | 2 +- drivers/dma/dw/platform.c | 14 ++- drivers/dma/edma.c | 6 +- drivers/dma/hsu/hsu.c | 4 +- drivers/dma/imx-sdma.c | 8 ++ drivers/dma/mv_xor.c | 2 +- drivers/dma/tegra210-adma.c | 72 ++++++++++--- drivers/gpu/drm/drm_dp_mst_topology.c | 15 ++- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 2 +- 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/sti/sti_hda.c | 1 - drivers/gpu/drm/sti/sti_hdmi.c | 1 - drivers/gpu/drm/virtio/virtgpu_vq.c | 5 +- drivers/hwmon/adt7475.c | 5 +- drivers/hwmon/hwmon.c | 98 +++++++++++------ drivers/hwmon/lm75.c | 2 +- drivers/hwmon/nct7802.c | 4 +- drivers/hwmon/shtc1.c | 2 +- drivers/hwmon/w83627hf.c | 42 +++++++- drivers/hwtracing/coresight/coresight-etb10.c | 4 +- drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +- drivers/iio/dac/ad5380.c | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 7 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 1 - drivers/infiniband/hw/mlx5/qp.c | 21 ++++ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- drivers/infiniband/hw/qedr/verbs.c | 2 +- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- drivers/infiniband/sw/rxe/rxe_cq.c | 4 +- drivers/infiniband/sw/rxe/rxe_qp.c | 5 +- drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +- drivers/infiniband/ulp/iser/iser_memory.c | 10 +- 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/tablet/pegasus_notetaker.c | 2 +- drivers/input/touchscreen/sun4i-ts.c | 6 +- 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/bcache/super.c | 3 - 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/pci/tw5864/tw5864-video.c | 4 +- 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-brcmstb.c | 4 +- drivers/mmc/host/sdhci-tegra.c | 2 +- drivers/mmc/host/sdhci.c | 10 +- drivers/net/can/slcan.c | 12 ++- drivers/net/dsa/qca8k.c | 12 +++ drivers/net/dsa/qca8k.h | 1 + drivers/net/ethernet/amazon/ena/ena_com.c | 3 +- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 1 + 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/mellanox/mlxsw/reg.h | 22 +++- drivers/net/ethernet/natsemi/sonic.c | 6 +- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_l2.c | 34 +++--- 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 +- .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- drivers/net/gtp.c | 4 +- drivers/net/phy/fixed_phy.c | 6 +- drivers/net/phy/phy.c | 3 +- drivers/net/phy/phy_device.c | 11 +- drivers/net/slip/slip.c | 12 ++- drivers/net/usb/lan78xx.c | 15 +++ drivers/net/wireless/ath/ath9k/dynack.c | 8 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 12 +-- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 2 +- drivers/net/wireless/marvell/libertas/cfg.c | 16 ++- drivers/net/wireless/marvell/libertas_tf/cmd.c | 2 +- drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +- drivers/nvme/host/pci.c | 2 +- drivers/of/of_mdio.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-r8a7792.c | 1 + 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/supply/power_supply_core.c | 10 +- drivers/pwm/pwm-lpss.c | 6 ++ drivers/pwm/pwm-meson.c | 5 - drivers/rapidio/rio_cm.c | 4 +- drivers/regulator/pv88060-regulator.c | 2 +- drivers/regulator/pv88080-regulator.c | 2 +- drivers/regulator/pv88090-regulator.c | 2 +- drivers/regulator/tps65086-regulator.c | 4 +- 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-mc146818-lib.c | 2 +- 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/soc/fsl/qe/gpio.c | 4 +- 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/staging/greybus/light.c | 12 +-- drivers/staging/most/aim-cdev/cdev.c | 5 +- drivers/target/iscsi/iscsi_target.c | 6 +- drivers/thermal/cpu_cooling.c | 2 +- drivers/thermal/mtk_thermal.c | 6 +- drivers/tty/ipwireless/hardware.c | 2 + drivers/tty/serial/stm32-usart.c | 11 +- drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/phy/Kconfig | 2 +- drivers/usb/phy/phy-twl6030-usb.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/afs/super.c | 1 + 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/delegation.c | 20 ++-- fs/nfs/delegation.h | 1 + fs/nfs/super.c | 2 +- fs/xfs/xfs_quotaops.c | 3 + include/linux/bitmap.h | 8 ++ include/linux/device.h | 3 +- include/linux/mlx5/mlx5_ifc.h | 2 - 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 +- include/uapi/linux/ethtool.h | 6 +- kernel/debug/kdb/kdb_main.c | 2 +- kernel/events/core.c | 3 + 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/ethtool.c | 2 + net/core/neighbour.c | 4 +- net/ieee802154/6lowpan/reassembly.c | 2 +- net/ipv4/ip_tunnel.c | 4 +- net/ipv4/tcp_bbr.c | 3 +- net/ipv6/ip6_tunnel.c | 4 +- net/ipv6/reassembly.c | 2 +- net/iucv/af_iucv.c | 27 +++-- net/l2tp/l2tp_core.c | 3 +- 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/rxrpc/output.c | 3 + net/sched/act_mirred.c | 6 +- net/sched/ematch.c | 2 +- net/sched/sch_netem.c | 18 +++- net/tipc/node.c | 7 +- net/tipc/sysctl.c | 8 +- net/x25/af_x25.c | 6 +- scripts/recordmcount.c | 17 +++ security/keys/key.c | 1 + 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/soc/sunxi/sun4i-i2s.c | 4 +- sound/usb/mixer.c | 4 +- sound/usb/quirks-table.h | 9 +- 287 files changed, 1451 insertions(+), 803 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 29/271 clk: samsung: exynos4: fix refcount leak in exynos4_get_xom()
From: 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
@@ -1225,6 +1225,7 @@ static unsigned long __init 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 39/271 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 40/271 RDMA/qedr: Fix out of bounds index check in query pkey
In reply to Greg Kroah-HartmanFrom: Gal Pressman <[email protected]>
[ Upstream commit dbe30dae487e1a232158c24b432d45281c2805b7 ]
The pkey table size is QEDR_ROCE_PKEY_TABLE_LEN, index should be tested for >= QEDR_ROCE_PKEY_TABLE_LEN instead of > QEDR_ROCE_PKEY_TABLE_LEN.
--- drivers/infiniband/hw/qedr/verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/qedr/verbs.c +1 -1
@@ -54,7 +54,7 @@int qedr_query_pkey (struct ib_device *ibdev,u8 port,u16 index,u16 *pkey) { -if (index >QEDR_ROCE_PKEY_TABLE_LEN ) +if (index >=QEDR_ROCE_PKEY_TABLE_LEN )return -EINVAL ; *pkey =QEDR_ROCE_PKEY_DEFAULT ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/271 arm64: dts: apq8016-sbc: Increase load on l11 for SDCARD
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
[ Upstream commit af61bef513ba179559e56908b8c465e587bc3890 ]
In the same way as for msm8974-hammerhead, l11 load, used for SDCARD VMMC, needs to be increased in order to prevent any voltage drop issues (due to limited current) happening with some SDCARDS or during specific operations (e.g. write).
Tested on Dragonboard-410c and DART-SD410 boards.
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +2 -0
@@ -355,6 +355,8 @@ l11 { regulator-min-microvolt = <1750000>; regulator-max-microvolt = <3337000>; + regulator-allow-set-load; + regulator-system-load = <200000>; }; l12 {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/271 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
@@ -1963,7 +1963,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 45/271 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 47/271 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.
--- drivers/rtc/rtc-mc146818-lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-mc146818-lib.c +1 -1
@@ -82,7 +82,7 @@ unsigned int mc146818_get_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 30/271 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
@@ -174,6 +174,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 48/271 clk: sunxi-ng: sun8i-a23: Enable PLL-MIPI LDOs when ungating it
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 108a459ef4cd17a28711d81092044e597b5c7618 ]
The PLL-MIPI clock is somewhat special as it has its own LDOs which need to be turned on for this PLL to actually work and output a clock signal.
Add the 2 LDO enable bits to the gate bits.
--- drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sunxi-ng/ccu-sun8i-a23.c +1 -1
@@ -132,7 +132,7 @@ static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_mipi_clk, "pll-mipi",8 ,4 ,/* N */ 4 ,2 ,/* K */ 0 ,4 ,/* M */ -BIT (31 ),/* gate */ +BIT (31 ) |BIT (23 ) |BIT (22 ),/* gate */ BIT (28 ),/* lock */ CLK_SET_RATE_UNGATE);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/271 iwlwifi: mvm: fix A-MPDU reference assignment
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 1f7698abedeeb3fef3cbcf78e16f925df675a179 ]
The current code assigns the reference, and then goes to increment it if the toggle bit has changed. That way, we get
Toggle 0 0 0 0 1 1 1 1 ID 1 1 1 1 1 2 2 2
Fix that by assigning the post-toggle ID to get
Toggle 0 0 0 0 1 1 1 1 ID 1 1 1 1 2 2 2 2
--- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +1 -1
@@ -810,12 +810,12 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,bool toggle_bit = phy_info &IWL_RX_MPDU_PHY_AMPDU_TOGGLE ; rx_status->flag |=RX_FLAG_AMPDU_DETAILS ; - rx_status->ampdu_reference = mvm->ampdu_ref;/* toggle is switched whenever new aggregation starts */ if (toggle_bit != mvm->ampdu_toggle) { mvm->ampdu_ref++; mvm->ampdu_toggle = toggle_bit; } + rx_status->ampdu_reference = mvm->ampdu_ref; }rcu_read_lock ();
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/271 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 51/271 crypto: crypto4xx - Fix wrong ppc4xx_trng_probe()/ppc4xx_trng_remove() arguments
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit 6e88098ca43a3d80ae86908f7badba683c8a0d84 ]
When building without CONFIG_HW_RANDOM_PPC4XX, I hit the following build failure:drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_probe':drivers/crypto/amcc/crypto4xx_core.c:1407:20: error: passing argument 1 of 'ppc4xx_trng_probe' from incompatible pointer type [-Werror=incompatible-pointer-types] In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:drivers/crypto/amcc/crypto4xx_trng.h:28:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *' drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_remove':drivers/crypto/amcc/crypto4xx_core.c:1434:21: error: passing argument 1 of 'ppc4xx_trng_remove' from incompatible pointer type [-Werror=incompatible-pointer-types] In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:drivers/crypto/amcc/crypto4xx_trng.h:30:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *'
This patch fix the needed argument of ppc4xx_trng_probe()/ppc4xx_trng_remove() in that case.
--- drivers/crypto/amcc/crypto4xx_trng.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/amcc/crypto4xx_trng.h +2 -2
@@ -26,9 +26,9 @@ void ppc4xx_trng_probe(struct crypto4xx_core_device *core_dev);void ppc4xx_trng_remove (struct crypto4xx_core_device *core_dev);#else static inline void ppc4xx_trng_probe ( -struct crypto4xx_device *dev__maybe_unused ) { } +struct crypto4xx_core_device *dev__maybe_unused ) { }static inline void ppc4xx_trng_remove ( -struct crypto4xx_device *dev__maybe_unused ) { } +struct crypto4xx_core_device *dev__maybe_unused ) { }#endif #endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/271 ARM: dts: lpc32xx: add required clocks property to keypad device node
In reply to Greg Kroah-HartmanFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 3e88bc38b9f6fe4b69cecf81badd3c19fde97f97 ]
NXP LPC32xx keypad controller requires a clock property to be defined.
The change fixes the driver initialization problem:
lpc32xx_keys 40050000.key: failed to get clock
lpc32xx_keys: probe of 40050000.key failed with error -2
--- arch/arm/boot/dts/lpc32xx.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/lpc32xx.dtsi +1 -0
@@ -462,6 +462,7 @@ key: key@40050000 { compatible = "nxp,lpc3220-key"; reg = <0x40050000 0x1000>; + clocks = <&clk LPC32XX_CLK_KEY>; interrupts = <54 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/271 ARM: dts: lpc32xx: reparent keypad controller to SIC1
In reply to Greg Kroah-HartmanFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 489261c45f0ebbc1c2813f337bbdf858267f5033 ]
After switching to a new interrupt controller scheme by separating SIC1 and SIC2 from MIC interrupt controller just one SoC keypad controller was not taken into account, fix it now:
WARNING: CPU: 0 PID: 1 at kernel/irq/irqdomain.c:524 irq_domain_associate+0x50/0x1b0 error: hwirq 0x36 is too large for interrupt-controller@40008000 ... lpc32xx_keys 40050000.key: failed to get platform irq lpc32xx_keys: probe of 40050000.key failed with error -22
--- arch/arm/boot/dts/lpc32xx.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/lpc32xx.dtsi +2 -1
@@ -463,7 +463,8 @@ compatible = "nxp,lpc3220-key"; reg = <0x40050000 0x1000>; clocks = <&clk LPC32XX_CLK_KEY>; - interrupts = <54 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&sic1>; + interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/271 ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller clocks property
In reply to Greg Kroah-HartmanFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 30fc01bae3cda747e7d9c352b1aa51ca113c8a9d ]
The originally added ARM PrimeCell PL111 clocks property misses the required "clcdclk" clock, which is the same as a clock to enable the LCD controller on NXP LPC3230 and NXP LPC3250 SoCs.
--- arch/arm/boot/dts/lpc32xx.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/lpc32xx.dtsi +2 -2
@@ -142,8 +142,8 @@ compatible = "arm,pl111", "arm,primecell"; reg = <0x31040000 0x1000>; interrupts = <14 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clk LPC32XX_CLK_LCD>; - clock-names = "apb_pclk"; + clocks = <&clk LPC32XX_CLK_LCD>, <&clk LPC32XX_CLK_LCD>; + clock-names = "clcdclk", "apb_pclk"; status = "disabled"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/271 ARM: dts: lpc32xx: phy3250: fix SD card regulator voltage
In reply to Greg Kroah-HartmanFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit dc141b99fc36cf910a1d8d5ee30f43f2442fd1bd ]
The fixed voltage regulator on Phytec phyCORE-LPC3250 board, which supplies SD/MMC card's power, has a constant output voltage level of either 3.15V or 3.3V, the actual value depends on JP4 position, the power rail is referenced as VCC_SDIO in the board hardware manual.
--- arch/arm/boot/dts/lpc3250-phy3250.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/lpc3250-phy3250.dts +2 -2
@@ -49,8 +49,8 @@ sd_reg: regulator@2 { compatible = "regulator-fixed"; regulator-name = "sd_reg"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; gpio = <&gpio 5 5 0>; enable-active-high; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/271 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
@@ -164,6 +164,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 57/271 iwlwifi: mvm: fix RSS config command
In reply to Greg Kroah-HartmanFrom: Sara Sharon <[email protected]>
[ Upstream commit 608dce95db10b8ee1a26dbce3f60204bb69812a5 ]
The hash mask is a bitmap, so we should use BIT() on the enum values.
--- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +6 -6
@@ -106,12 +106,12 @@ static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm)int i;struct iwl_rss_config_cmd cmd = { .flags =cpu_to_le32 (IWL_RSS_ENABLE ), - .hash_mask =IWL_RSS_HASH_TYPE_IPV4_TCP | -IWL_RSS_HASH_TYPE_IPV4_UDP | -IWL_RSS_HASH_TYPE_IPV4_PAYLOAD | -IWL_RSS_HASH_TYPE_IPV6_TCP | -IWL_RSS_HASH_TYPE_IPV6_UDP | -IWL_RSS_HASH_TYPE_IPV6_PAYLOAD , + .hash_mask =BIT (IWL_RSS_HASH_TYPE_IPV4_TCP ) | +BIT (IWL_RSS_HASH_TYPE_IPV4_UDP ) | +BIT (IWL_RSS_HASH_TYPE_IPV4_PAYLOAD ) | +BIT (IWL_RSS_HASH_TYPE_IPV6_TCP ) | +BIT (IWL_RSS_HASH_TYPE_IPV6_UDP ) | +BIT (IWL_RSS_HASH_TYPE_IPV6_PAYLOAD ), };if (mvm->trans->num_rx_queues ==1 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/271 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
@@ -58,7 +58,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 60/271 thermal: mediatek: fix register index error
In reply to Greg Kroah-HartmanFrom: Michael Kao <[email protected]>
[ Upstream commit eb9aecd90d1a39601e91cd08b90d5fee51d321a6 ]
The index of msr and adcpnp should match the sensor which belongs to the selected bank in the for loop.
--- drivers/thermal/mtk_thermal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/thermal/mtk_thermal.c +4 -2
@@ -348,7 +348,8 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank)u32 raw;for (i =0 ; i < conf->bank_data[bank->id].num_sensors; i++) { - raw =readl (mt->thermal_base + conf->msr[i]); + raw =readl (mt->thermal_base + + conf->msr[conf->bank_data[bank->id].sensors[i]]); temp = raw_to_mcelsius(mt, conf->bank_data[bank->id].sensors[i],
@@ -485,7 +486,8 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num,for (i =0 ; i < conf->bank_data[num].num_sensors; i++)writel (conf->sensor_mux_values[conf->bank_data[num].sensors[i]], - mt->thermal_base + conf->adcpnp[i]); + mt->thermal_base + + conf->adcpnp[conf->bank_data[num].sensors[i]]);writel ((1 << conf->bank_data[num].num_sensors) -1 , mt->thermal_base +TEMP_MONCTL0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/271 net: phy: fixed_phy: Fix fixed_phy not checking GPIO
In reply to Greg Kroah-HartmanFrom: Moritz Fischer <[email protected]>
[ Upstream commit 8f289805616e81f7c1690931aa8a586c76f4fa88 ]
Fix fixed_phy not checking GPIO if no link_update callback is registered.
In the original version all users registered a link_update callback so the issue was masked.
--- drivers/net/phy/fixed_phy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/phy/fixed_phy.c +3 -3
@@ -67,11 +67,11 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num)do { s =read_seqcount_begin (&fp->seqcount);/* Issue callback if user registered it. */ -if (fp->link_update) { +if (fp->link_update) fp->link_update (fp->phydev->attached_dev, &fp->status); -fixed_phy_update (fp); - } +/* Check the GPIO for change in status */ +fixed_phy_update (fp); state = fp->status; }while (read_seqcount_retry (&fp->seqcount, s));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/271 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 62/271 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 66/271 iw_cxgb4: use tos when importing the endpoint
In reply to Greg Kroah-HartmanFrom: Steve Wise <[email protected]>
[ Upstream commit cb3ba0bde881f0cb7e3945d2a266901e2bd18c92 ]
import_ep() is passed the correct tos, but doesn't use it correctly.
--- drivers/infiniband/hw/cxgb4/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/cxgb4/cm.c +1 -1
@@ -2044,7 +2044,7 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, }else { pdev =get_real_dev (n->dev); ep->l2t =cxgb4_l2t_get (cdev->rdev.lldi.l2t, - n, pdev,0 ); + n, pdev,rt_tos2priority (tos));if (!ep->l2t) goto out; ep->mtu =dst_mtu (dst);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/271 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
@@ -203,6 +203,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 34/271 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 36/271 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 28/271 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 clk * __init __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 69/271 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
@@ -5078,7 +5078,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 35/271 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
@@ -333,6 +333,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 37/271 clk: dove: fix refcount leak in dove_clk_init()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 8d726c5128298386b907963033be93407b0c4275 ]
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/dove.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/clk/mvebu/dove.c +6 -2
@@ -190,10 +190,14 @@ static void __init dove_clk_init(struct device_node *np)mvebu_coreclk_setup (np, &dove_coreclks); -if (ddnp) +if (ddnp) {dove_divider_clk_init (ddnp); +of_node_put (ddnp); + } -if (cgnp) +if (cgnp) {mvebu_clk_gating_setup (cgnp, dove_gating_desc); +of_node_put (cgnp); + } }CLK_OF_DECLARE (dove_clk,"marvell,dove-core-clock" , dove_clk_init);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/271 net: dsa: qca8k: Enable delay for RGMII_ID mode
In reply to Greg Kroah-HartmanFrom: Vinod Koul <[email protected]>
[ Upstream commit a968b5e9d5879f9535d6099505f9e14abcafb623 ]
RGMII_ID specifies that we should have internal delay, so resurrect the delay addition routine but under the RGMII_ID mode.
--- drivers/net/dsa/qca8k.c | 12 ++++++++++++ drivers/net/dsa/qca8k.h | 1 + 2 files changed, 13 insertions(+)
drivers/net/dsa/qca8k.c +12 -0
@@ -460,6 +460,18 @@ qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode)qca8k_write (priv,QCA8K_REG_PORT5_PAD_CTRL ,QCA8K_PORT_PAD_RGMII_RX_DELAY_EN );break ; +case PHY_INTERFACE_MODE_RGMII_ID : +/* RGMII_ID needs internal delay. This is enabled through +* PORT5_PAD_CTRL for all ports, rather than individual port +* registers +*/ +qca8k_write (priv, reg, +QCA8K_PORT_PAD_RGMII_EN | +QCA8K_PORT_PAD_RGMII_TX_DELAY (QCA8K_MAX_DELAY ) | +QCA8K_PORT_PAD_RGMII_RX_DELAY (QCA8K_MAX_DELAY )); +qca8k_write (priv,QCA8K_REG_PORT5_PAD_CTRL , +QCA8K_PORT_PAD_RGMII_RX_DELAY_EN ); +break ;case PHY_INTERFACE_MODE_SGMII :qca8k_write (priv, reg,QCA8K_PORT_PAD_SGMII_EN );break ;
drivers/net/dsa/qca8k.h +1 -0
@@ -40,6 +40,7 @@ ((0x8 + (x & 0x3)) << 22)#define QCA8K_PORT_PAD_RGMII_RX_DELAY (x) \ ((0x10 + (x & 0x3)) << 20) +#define QCA8K_MAX_DELAY 3#define QCA8K_PORT_PAD_RGMII_RX_DELAY_EN BIT(24)#define QCA8K_PORT_PAD_SGMII_EN BIT(7)#define QCA8K_REG_MODULE_EN 0x030
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/271 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 83/271 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 85/271 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
@@ -1928,7 +1928,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 87/271 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 70/271 pinctrl: sh-pfc: r8a7792: Fix vin1_data18_b pin group
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit b9fd50488b4939ce5b3a026d29e752e17c2d1800 ]
The vin1_data18_b pin group itself is present, but it is not listed in the VIN1 pin group array, and thus cannot be selected.
--- drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/sh-pfc/pfc-r8a7792.c +1 -0
@@ -1863,6 +1863,7 @@ static const char * const vin1_groups[] = {"vin1_data8" ,"vin1_data24_b" ,"vin1_data20_b" , +"vin1_data18_b" ,"vin1_data16_b" ,"vin1_sync" , "vin1_field",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/271 mmc: sdhci-brcmstb: handle mmc_of_parse() errors during probe
In reply to Greg Kroah-HartmanFrom: Stefan Wahren <[email protected]>
[ Upstream commit 1e20186e706da8446f9435f2924cd65ab1397e73 ]
We need to handle mmc_of_parse() errors during probe otherwise the MMC driver could start without proper initialization (e.g. power sequence).
--- drivers/mmc/host/sdhci-brcmstb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-brcmstb.c +3 -1
@@ -90,7 +90,9 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev) host->mmc->caps2 |=MMC_CAP2_HC_ERASE_SZ ;sdhci_get_of_property (pdev); -mmc_of_parse (host->mmc); + res =mmc_of_parse (host->mmc); +if (res) + goto err;/* * Supply the existing CAPS, but clear the UHS modes. This
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/271 ARM: 8848/1: virt: Align GIC version check with arm64 counterpart
In reply to Greg Kroah-HartmanFrom: Vladimir Murzin <[email protected]>
[ Upstream commit 9db043d36bd379f4cc99054c079de0dabfc38d03 ]
arm64 has got relaxation on GIC version check at early boot stage due to update of the GIC architecture let's align ARM with that.
To help backports (even though the code was correct at the time of writing)
--- arch/arm/kernel/hyp-stub.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/hyp-stub.S +2 -2
@@ -179,8 +179,8 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE @ Check whether GICv3 system registers are available mrc p15, 0, r7, c0, c1, 1 @ ID_PFR1 ubfx r7, r7, #28, #4 - cmp r7, #1 - bne 2f + teq r7, #0 + beq 2f @ Enable system register accesses mrc p15, 4, r7, c12, c9, 5 @ ICC_HSRE
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/271 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 93/271 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 94/271 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
@@ -3694,12 +3694,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 96/271 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 95/271 drivers/rapidio/rio_cm.c: fix potential oops in riocm_ch_listen()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 5ac188b12e7cbdd92dee60877d1fac913fc1d074 ]
If riocm_get_channel() fails, then we should just return -EINVAL. Calling riocm_put_channel() will trigger a NULL dereference and generally we should call put() if the get() didn't succeed.
--- drivers/rapidio/rio_cm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/rapidio/rio_cm.c +3 -1
@@ -1215,7 +1215,9 @@ static int riocm_ch_listen(u16 ch_id)riocm_debug (CHOP ,"(ch_%d)" , ch_id); ch =riocm_get_channel (ch_id); -if (!ch || !riocm_cmp_exch (ch,RIO_CM_CHAN_BOUND ,RIO_CM_LISTEN )) +if (!ch) +return -EINVAL ; +if (!riocm_cmp_exch (ch,RIO_CM_CHAN_BOUND ,RIO_CM_LISTEN )) ret = -EINVAL ;riocm_put_channel (ch);return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/271 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
@@ -2929,12 +2929,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 99/271 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 100/271 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 101/271 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
@@ -1471,8 +1471,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 102/271 regulator: tps65086: Fix tps65086_ldoa1_ranges for selector 0xB
In reply to Greg Kroah-HartmanFrom: Axel Lin <[email protected]>
[ Upstream commit e69b394703e032e56a140172440ec4f9890b536d ]
selector 0xB (1011) should be 2.6V rather than 2.7V, fit ix.
Table 5-4. LDOA1 Output Voltage Options
VID Bits VOUT VID Bits VOUT VID Bits VOUT VID Bits VOUT
0000 1.35 0100 1.8 1000 2.3 1100 2.85 0001 1.5 0101 1.9 1001 2.4 1101 3.0 0010 1.6 0110 2.0 1010 2.5 1110 3.3 0011 1.7 0111 2.1 1011 2.6 1111 Not Used
--- drivers/regulator/tps65086-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/tps65086-regulator.c +2 -2
@@ -89,8 +89,8 @@ static const struct regulator_linear_range tps65086_buck345_25mv_ranges[] = {static const struct regulator_linear_range tps65086_ldoa1_ranges[] = {REGULATOR_LINEAR_RANGE (1350000 ,0x0 ,0x0 ,0 ),REGULATOR_LINEAR_RANGE (1500000 ,0x1 ,0x7 ,100000 ), -REGULATOR_LINEAR_RANGE (2300000 ,0x8 ,0xA ,100000 ), -REGULATOR_LINEAR_RANGE (2700000 ,0xB ,0xD ,150000 ), +REGULATOR_LINEAR_RANGE (2300000 ,0x8 ,0xB ,100000 ), +REGULATOR_LINEAR_RANGE (2850000 ,0xC ,0xD ,150000 ),REGULATOR_LINEAR_RANGE (3300000 ,0xE ,0xE ,0 ), };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/271 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 104/271 tipc: tipc clang warning
In reply to Greg Kroah-HartmanFrom: Jon Maloy <[email protected]>
[ Upstream commit 737889efe9713a0f20a75fd0de952841d9275e6b ]
When checking the code with clang -Wsometimes-uninitialized we get the following warning:
if (!tipc_link_is_establishing(l)) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
net/tipc/node.c:847:46: note: uninitialized use occurs here
tipc_bearer_xmit(n->net, bearer_id, &xmitq, maddr);net/tipc/node.c:831:2: note: remove the 'if' if its condition is always true
if (!tipc_link_is_establishing(l)) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~net/tipc/node.c:821:31: note: initialize the variable 'maddr' to silence this warning
struct tipc_media_addr *maddr;
We fix this by initializing 'maddr' to NULL. For the matter of clarity, we also test if 'xmitq' is non-empty before we use it and 'maddr' further down in the function. It will never happen that 'xmitq' is non- empty at the same time as 'maddr' is NULL, so this is a sufficient test.
--- net/tipc/node.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/tipc/node.c +4 -3
@@ -688,10 +688,10 @@ static void __tipc_node_link_down(struct tipc_node *n, int *bearer_id,static void tipc_node_link_down (struct tipc_node *n,int bearer_id,bool delete) {struct tipc_link_entry *le = &n->links[bearer_id]; +struct tipc_media_addr *maddr =NULL ;struct tipc_link *l = le->link; -struct tipc_media_addr *maddr; -struct sk_buff_head xmitq;int old_bearer_id = bearer_id; +struct sk_buff_head xmitq;if (!l)return ;
@@ -713,7 +713,8 @@ static void tipc_node_link_down(struct tipc_node *n, int bearer_id, bool delete)tipc_node_write_unlock (n);if (delete)tipc_mon_remove_peer (n->net, n->addr, old_bearer_id); -tipc_bearer_xmit (n->net, bearer_id, &xmitq, maddr); +if (!skb_queue_empty (&xmitq)) +tipc_bearer_xmit (n->net, bearer_id, &xmitq, maddr);tipc_sk_rcv (n->net, &le->inputq); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/271 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 106/271 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
@@ -2588,7 +2588,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 72/271 usb: phy: twl6030-usb: fix possible use-after-free on remove
In reply to Greg Kroah-HartmanFrom: Sven Van Asbroeck <[email protected]>
[ Upstream commit 5895d311d28f2605e2f71c1a3e043ed38f3ac9d2 ]
In remove(), use cancel_delayed_work_sync() to cancel the delayed work. Otherwise there's a chance that this work will continue to run until after the device has been removed.
This issue was detected with the help of Coccinelle.
--- drivers/usb/phy/phy-twl6030-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/phy/phy-twl6030-usb.c +1 -1
@@ -422,7 +422,7 @@ static int twl6030_usb_remove(struct platform_device *pdev) {struct twl6030_usb *twl =platform_get_drvdata (pdev); -cancel_delayed_work (&twl->get_status_work); +cancel_delayed_work_sync (&twl->get_status_work);twl6030_interrupt_mask (TWL6030_USBOTG_INT_MASK ,REG_INT_MSK_LINE_C ); twl6030_interrupt_mask(TWL6030_USBOTG_INT_MASK,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/271 keys: Timestamp new keys
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 7c1857bdbdf1e4c541e45eab477ee23ed4333ea4 ]
Set the timestamp on new keys rather than leaving it unset.
--- security/keys/key.c | 1 + 1 file changed, 1 insertion(+)
security/keys/key.c +1 -0
@@ -296,6 +296,7 @@ struct key *key_alloc(struct key_type *type, const char *desc, key->gid = gid; key->perm = perm; key->restrict_link = restrict_link; + key->last_used_at =ktime_get_real_seconds ();if (!(flags &KEY_ALLOC_NOT_IN_QUOTA )) key->flags |=1 <<KEY_FLAG_IN_QUOTA ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/271 dmaengine: mv_xor: Use correct device for DMA API
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
[ Upstream commit 3e5daee5ecf314da33a890fabaa2404244cd2a36 ]
Using dma_dev->dev for mappings before it's assigned with the correct device is unlikely to work as expected, and with future dma-direct changes, passing a NULL device may end up crashing entirely. I don't know enough about this hardware or the mv_xor_prep_dma_interrupt() operation to implement the appropriate error-handling logic that would have revealed those dma_map_single() calls failing on arm64 for as long as the driver has been enabled there, but moving the assignment earlier will at least make the current code operate as intended.
--- drivers/dma/mv_xor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/mv_xor.c +1 -1
@@ -1044,6 +1044,7 @@ mv_xor_channel_add(struct mv_xor_device *xordev, mv_chan->op_in_desc =XOR_MODE_IN_DESC ; dma_dev = &mv_chan->dmadev; + dma_dev->dev = &pdev->dev; mv_chan->xordev = xordev;/*
@@ -1076,7 +1077,6 @@ mv_xor_channel_add(struct mv_xor_device *xordev, dma_dev->device_free_chan_resources = mv_xor_free_chan_resources; dma_dev->device_tx_status = mv_xor_status; dma_dev->device_issue_pending = mv_xor_issue_pending; - dma_dev->dev = &pdev->dev;/* set prep routines based on capability */ if (dma_has_cap (DMA_INTERRUPT , dma_dev->cap_mask))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/271 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 109/271 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 118/271 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
@@ -373,7 +373,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 119/271 ARM: dts: ls1021: Fix SGMII PCS link remaining down after PHY disconnect
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit c7861adbe37f576931650ad8ef805e0c47564b9a ]
Each eTSEC MAC has its own TBI (SGMII) PCS and private MDIO bus. But due to a DTS oversight, both SGMII-compatible MACs of the LS1021 SoC are pointing towards the same internal PCS. Therefore nobody is controlling the internal PCS of eTSEC0.
Upon initial ndo_open, the SGMII link is ok by virtue of U-boot initialization. But upon an ifdown/ifup sequence, the code path from ndo_open -> init_phy -> gfar_configure_serdes does not get executed for the PCS of eTSEC0 (and is executed twice for MAC eTSEC1). So the SGMII link remains down for eTSEC0. On the LS1021A-TWR board, to signal this failure condition, the PHY driver keeps printing '803x_aneg_done: SGMII link is not ok'.
Also, it changes compatible of mdio0 to "fsl,etsec2-mdio" to match mdio1 device.
--- arch/arm/boot/dts/ls1021a-twr.dts | 9 ++++++++- arch/arm/boot/dts/ls1021a.dtsi | 11 ++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)
arch/arm/boot/dts/ls1021a-twr.dts +8 -1
@@ -143,7 +143,7 @@ }; &enet0 { - tbi-handle = <&tbi1>; + tbi-handle = <&tbi0>; phy-handle = <&sgmii_phy2>; phy-connection-type = "sgmii"; status = "okay";
@@ -222,6 +222,13 @@ sgmii_phy2: ethernet-phy@2 { reg = <0x2>; }; + tbi0: tbi-phy@1f { + reg = <0x1f>; + device_type = "tbi-phy"; + }; +}; + +&mdio1 { tbi1: tbi-phy@1f { reg = <0x1f>; device_type = "tbi-phy";
arch/arm/boot/dts/ls1021a.dtsi +10 -1
@@ -505,13 +505,22 @@ }; mdio0: mdio@2d24000 { - compatible = "gianfar"; + compatible = "fsl,etsec2-mdio"; device_type = "mdio"; #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2d24000 0x0 0x4000>; }; + mdio1: mdio@2d64000 { + compatible = "fsl,etsec2-mdio"; + device_type = "mdio"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x0 0x2d64000 0x0 0x4000>, + <0x0 0x2d50030 0x0 0x4>; + }; + ptp_clock@2d10e00 { compatible = "fsl,etsec-ptp"; reg = <0x0 0x2d10e00 0x0 0xb0>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/271 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 123/271 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
@@ -2626,7 +2626,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 125/271 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 124/271 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
@@ -3404,20 +3404,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 126/271 usb: gadget: fsl: fix link error against usb-gadget module
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 2100e3ca3676e894fa48b8f6f01d01733387fe81 ]
The dependency to ensure this driver links correctly fails since it can not be a loadable module:
drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_set_peripheral':
phy-fsl-usb.c:(.text+0x2224): undefined reference to `usb_gadget_vbus_disconnect'
Make the option 'tristate' so it can work correctly.
--- drivers/usb/phy/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/phy/Kconfig +1 -1
@@ -19,7 +19,7 @@ config AB8500_USB in host mode, low speed. config FSL_USB2_OTG - bool "Freescale USB OTG Transceiver Driver" + tristate "Freescale USB OTG Transceiver Driver" depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM=y && PM depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y' select USB_PHY
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/271 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 127/271 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
@@ -2324,6 +2324,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 |
@@ -2357,6 +2362,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] = {
@@ -2373,6 +2384,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] = {
@@ -2384,6 +2401,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 129/271 net: ena: fix swapped parameters when calling ena_com_indirect_table_fill_entry
In reply to Greg Kroah-HartmanFrom: Sameeh Jubran <[email protected]>
[ Upstream commit 3c6eeff295f01bdf1c6c3addcb0a04c0c6c029e9 ]
second parameter should be the index of the table rather than the value.
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +2 -2
@@ -697,8 +697,8 @@ static int ena_set_rxfh(struct net_device *netdev, const u32 *indir,if (indir) {for (i =0 ; i <ENA_RX_RSS_TABLE_SIZE ; i++) { rc =ena_com_indirect_table_fill_entry (ena_dev, -ENA_IO_RXQ_IDX (indir[i]), - i); + i, +ENA_IO_RXQ_IDX (indir[i]));if (unlikely (rc)) {netif_err (adapter, drv, netdev,"Cannot fill indirect table (index is too large)\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/271 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
@@ -3345,9 +3345,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 131/271 net: ena: fix incorrect test of supported hash function
In reply to Greg Kroah-HartmanFrom: Sameeh Jubran <[email protected]>
[ Upstream commit d3cfe7ddbc3dfbb9b201615b7fef8fd66d1b5fe8 ]
ena_com_set_hash_function() tests if a hash function is supported by the device before setting it.
The test returns the opposite result than needed. Reverse the condition to return the correct value.
Also use the BIT macro instead of inline shift.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amazon/ena/ena_com.c +1 -1
@@ -1967,7 +1967,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)if (unlikely (ret))return ret; -if (get_resp.u.flow_hash_func.supported_func & (1 << rss->hash_func)) { +if (!(get_resp.u.flow_hash_func.supported_func &BIT (rss->hash_func))) {pr_err ("Func hash %d isn't supported by device, abort\n" , rss->hash_func);return -EPERM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/271 l2tp: Fix possible NULL pointer dereference
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 638a3a1e349ddf5b82f222ff5cb3b4f266e7c278 ]
BUG: unable to handle kernel NULL pointer dereference at 0000000000000128 PGD 0 P4D 0 Oops: 0000 [#1 CPU: 0 PID: 5697 Comm: modprobe Tainted: G W 5.1.0-rc7+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.3-0-ge2fc41e-prebuilt.qemu-project.org 04/01/2014 RIP: 0010:__lock_acquire+0x53/0x10b0 Code: 8b 1c 25 40 5e 01 00 4c 8b 6d 10 45 85 e4 0f 84 bd 06 00 00 44 8b 1d 7c d2 09 02 49 89 fe 41 89 d2 45 85 db 0f 84 47 02 00 00 <48> 81 3f a0 05 70 83 b8 00 00 00 00 44 0f 44 c0 83 fe 01 0f 86 3a RSP: 0018:ffffc90001c07a28 EFLAGS: 00010002 RAX: 0000000000000000 RBX: ffff88822f038440 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000128 RBP: ffffc90001c07a88 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000001 R13: 0000000000000000 R14: 0000000000000128 R15: 0000000000000000 FS: 00007fead0811540(0000) GS:ffff888237a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000128 CR3: 00000002310da000 CR4: 00000000000006f0 Call Trace: ? __lock_acquire+0x24e/0x10b0 lock_acquire+0xdf/0x230 ? flush_workqueue+0x71/0x530 flush_workqueue+0x97/0x530 ? flush_workqueue+0x71/0x530 l2tp_exit_net+0x170/0x2b0 [l2tp_core ? l2tp_exit_net+0x93/0x2b0 [l2tp_core ops_exit_list.isra.6+0x36/0x60 unregister_pernet_operations+0xb8/0x110 unregister_pernet_device+0x25/0x40 l2tp_init+0x55/0x1000 [l2tp_core ? 0xffffffffa018d000 do_one_initcall+0x6c/0x3cc ? do_init_module+0x22/0x1f1 ? rcu_read_lock_sched_held+0x97/0xb0 ? kmem_cache_alloc_trace+0x325/0x3b0 do_init_module+0x5b/0x1f1 load_module+0x1db1/0x2690 ? m_show+0x1d0/0x1d0 __do_sys_finit_module+0xc5/0xd0 __x64_sys_finit_module+0x15/0x20 do_syscall_64+0x6b/0x1d0 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7fead031a839 Code: 00 f3 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 1f f6 2c 00 f7 d8 64 89 01 48 RSP: 002b:00007ffe8d9acca8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 RAX: ffffffffffffffda RBX: 0000560078398b80 RCX: 00007fead031a839 RDX: 0000000000000000 RSI: 000056007659dc2e RDI: 0000000000000003 RBP: 000056007659dc2e R08: 0000000000000000 R09: 0000560078398b80 R10: 0000000000000003 R11: 0000000000000246 R12: 0000000000000000 R13: 00005600783a04a0 R14: 0000000000040000 R15: 0000560078398b80 Modules linked in: l2tp_core(+) e1000 ip_tables ipv6 [last unloaded: l2tp_core CR2: 0000000000000128 ---[ end trace 8322b2b8bf83f8e1
If alloc_workqueue fails in l2tp_init, l2tp_net_ops is unregistered on failure path. Then l2tp_exit_net is called which will flush NULL workqueue, this patch add a NULL check to fix it.
--- net/l2tp/l2tp_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/l2tp/l2tp_core.c +2 -1
@@ -1947,7 +1947,8 @@ static __net_exit void l2tp_exit_net(struct net *net) }rcu_read_unlock_bh (); -flush_workqueue (l2tp_wq); +if (l2tp_wq) +flush_workqueue (l2tp_wq);rcu_barrier (); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/271 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
@@ -1526,23 +1526,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 136/271 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 137/271 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
@@ -570,7 +570,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 138/271 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
@@ -2182,7 +2182,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 139/271 pwm: meson: Dont disable PWM when setting duty repeatedly
In reply to Greg Kroah-HartmanFrom: Bichao Zheng <[email protected]>
[ Upstream commit a279345807e1e0ae79567a52cfdd9d30c9174a3c ]
There is an abnormally low about 20ms,when setting duty repeatedly. Because setting the duty will disable PWM and then enable. Delete this operation now.
--- drivers/pwm/pwm-meson.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/pwm/pwm-meson.c +0 -5
@@ -320,11 +320,6 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,if (state->period != channel->state.period || state->duty_cycle != channel->state.duty_cycle || state->polarity != channel->state.polarity) { -if (channel->state.enabled) { -meson_pwm_disable (meson, pwm->hwpwm); - channel->state.enabled = false; - } -if (state->polarity != channel->state.polarity) {if (state->polarity ==PWM_POLARITY_NORMAL ) meson->inverter_mask |=BIT (pwm->hwpwm);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/271 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 111/271 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.
--- drivers/soc/fsl/qe/gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/soc/fsl/qe/gpio.c +3 -1
@@ -152,8 +152,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 143/271 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 142/271 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 144/271 dmaengine: tegra210-adma: Fix crash during probe
In reply to Greg Kroah-HartmanFrom: Jon Hunter <[email protected]>
[ Upstream commit b53611fb1ce9b1786bd18205473e0c1d6bfa8934 ]
Commit f33e7bb3eb92 ("dmaengine: tegra210-adma: restore channel status") added support to save and restore the DMA channel registers when runtime suspending the ADMA. This change is causing the kernel to crash when probing the ADMA, if the device is probed deferred when looking up the channel interrupts. The crash occurs because not all of the channel base addresses have been setup at this point and in the clean-up path of the probe, pm_runtime_suspend() is called invoking its callback which expects all the channel base addresses to be initialised.
Although this could be fixed by simply checking for a NULL address, on further review of the driver it seems more appropriate that we only call pm_runtime_get_sync() after all the channel interrupts and base addresses have been configured. Therefore, fix this crash by moving the calls to pm_runtime_enable(), pm_runtime_get_sync() and tegra_adma_init() after the DMA channels have been initialised.
--- drivers/dma/tegra210-adma.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/dma/tegra210-adma.c +13 -13
@@ -744,16 +744,6 @@ static int tegra_adma_probe(struct platform_device *pdev)return PTR_ERR (tdma->ahub_clk); } -pm_runtime_enable (&pdev->dev); - - ret =pm_runtime_get_sync (&pdev->dev); -if (ret <0 ) - goto rpm_disable; - - ret =tegra_adma_init (tdma); -if (ret) - goto rpm_put; -INIT_LIST_HEAD (&tdma->dma_dev.channels);for (i =0 ; i < tdma->nr_channels; i++) {struct tegra_adma_chan *tdc = &tdma->channels[i];
@@ -771,6 +761,16 @@ static int tegra_adma_probe(struct platform_device *pdev) tdc->tdma = tdma; } +pm_runtime_enable (&pdev->dev); + + ret =pm_runtime_get_sync (&pdev->dev); +if (ret <0 ) + goto rpm_disable; + + ret =tegra_adma_init (tdma); +if (ret) + goto rpm_put; +dma_cap_set (DMA_SLAVE , tdma->dma_dev.cap_mask);dma_cap_set (DMA_PRIVATE , tdma->dma_dev.cap_mask);dma_cap_set (DMA_CYCLIC , tdma->dma_dev.cap_mask);
@@ -812,13 +812,13 @@ static int tegra_adma_probe(struct platform_device *pdev) dma_remove:dma_async_device_unregister (&tdma->dma_dev); -irq_dispose: -while (--i >=0 ) -irq_dispose_mapping (tdma->channels[i].irq); rpm_put:pm_runtime_put_sync (&pdev->dev); rpm_disable:pm_runtime_disable (&pdev->dev); +irq_dispose: +while (--i >=0 ) +irq_dispose_mapping (tdma->channels[i].irq);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/271 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
@@ -416,7 +416,18 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)platform_set_drvdata (pdev, master); master->mode_bits = (SPI_CPOL |SPI_CS_HIGH |SPI_NO_CS ); 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->prepare_message = bcm2835aux_spi_prepare_message;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/271 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
@@ -6055,8 +6055,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(),
@@ -6075,11 +6074,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);
@@ -6091,27 +6089,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 115/271 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
@@ -230,18 +230,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 116/271 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 117/271 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 108/271 media: tw5864: Fix possible NULL pointer dereference in tw5864_handle_frame
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 2e7682ebfc750177a4944eeb56e97a3f05734528 ]
'vb' null check should be done before dereferencing it in tw5864_handle_frame, otherwise a NULL pointer dereference may occur.
--- drivers/media/pci/tw5864/tw5864-video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/tw5864/tw5864-video.c +2 -2
@@ -1386,13 +1386,13 @@ static void tw5864_handle_frame(struct tw5864_h264_frame *frame) input->vb =NULL ;spin_unlock_irqrestore (&input->slock, flags); - v4l2_buf =to_vb2_v4l2_buffer (&vb->vb.vb2_buf); -if (!vb) {/* Gone because of disabling */ dev_dbg (&dev->pci->dev,"vb is empty, dropping frame\n" );return ; } + v4l2_buf =to_vb2_v4l2_buffer (&vb->vb.vb2_buf); +/* * Check for space. * Mind the overhead of startcode emulation prevention.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/271 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
@@ -882,14 +882,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 148/271 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 159/271 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 160/271 perf/ioctl: Add check for the sample_period value
In reply to Greg Kroah-HartmanFrom: Ravi Bangoria <[email protected]>
[ Upstream commit 913a90bc5a3a06b1f04c337320e9aeee2328dd77 ]
perf_event_open() limits the sample_period to 63 bits. See:
0819b2e30ccb ("perf: Limit perf_event_attr::sample_period to 63 bits")
Make ioctl() consistent with it.
Also on PowerPC, negative sample_period could cause a recursive PMIs leading to a hang (reported when running perf-fuzzer).
--- kernel/events/core.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/events/core.c +3 -0
@@ -4624,6 +4624,9 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)if (perf_event_check_period (event, value))return -EINVAL ; +if (!event->attr.freq && (value & (1ULL <<63 ))) +return -EINVAL ; +event_function_call (event, __perf_event_period, &value);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/271 dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit c24a5c735f87d0549060de31367c095e8810b895 ]
The commit
080edf75d337 ("dmaengine: hsu: set HSU_CH_MTSR to memory width")
has been mistakenly submitted. The further investigations show that the original code does better job since the memory side transfer size has never been configured by DMA users.
As per latest revision of documentation: "Channel minimum transfer size (CHnMTSR)... For IOSF UART, maximum value that can be programmed is 64 and minimum value that can be programmed is 1."
This reverts commit 080edf75d337d35faa6fc3df99342b10d2848d16.
--- drivers/dma/hsu/hsu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/hsu/hsu.c +2 -2
@@ -64,10 +64,10 @@ static void hsu_dma_chan_start(struct hsu_dma_chan *hsuc)if (hsuc->direction ==DMA_MEM_TO_DEV ) { bsr = config->dst_maxburst; - mtsr = config->src_addr_width; + mtsr = config->dst_addr_width; }else if (hsuc->direction ==DMA_DEV_TO_MEM ) { bsr = config->src_maxburst; - mtsr = config->dst_addr_width; + mtsr = config->src_addr_width; }hsu_chan_disable (hsuc);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/271 clk: qcom: Fix -Wunused-const-variable
In reply to Greg Kroah-HartmanFrom: Nathan Huckleberry <[email protected]>
[ Upstream commit da642427bd7710ec4f4140f693f59aa8521a358c ]
Clang produces the following warning
drivers/clk/qcom/gcc-msm8996.c:133:32: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map' [-Wunused-const-variable] static const structparent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] =
{ ^drivers/clk/qcom/gcc-msm8996.c:141:27: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div' [-Wunused-const-variable] static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = { ^ drivers/clk/qcom/gcc-msm8996.c:187:32: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map' [-Wunused-const-variable] static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = { ^ drivers/clk/qcom/gcc-msm8996.c:197:27: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div' [-Wunused-const-variable] static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = {
It looks like these were never used.
--- drivers/clk/qcom/gcc-msm8996.c | 36 ---------------------------------- 1 file changed, 36 deletions(-)
drivers/clk/qcom/gcc-msm8996.c +0 -36
@@ -140,22 +140,6 @@ static const char * const gcc_xo_gpll0_gpll4_gpll0_early_div[] = {"gpll0_early_div" }; -static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] = { - {P_XO ,0 }, - {P_GPLL0 ,1 }, - {P_GPLL2 ,2 }, - {P_GPLL3 ,3 }, - {P_GPLL0_EARLY_DIV ,6 } -}; - -static const char *const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = { -"xo" , -"gpll0" , -"gpll2" , -"gpll3" , -"gpll0_early_div" -}; -static const struct parent_map gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div_map[] = { {P_XO ,0 }, {P_GPLL0 ,1 },
@@ -194,26 +178,6 @@ static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll2_early_gpll0_early"gpll0_early_div" }; -static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = { - {P_XO ,0 }, - {P_GPLL0 ,1 }, - {P_GPLL2 ,2 }, - {P_GPLL3 ,3 }, - {P_GPLL1 ,4 }, - {P_GPLL4 ,5 }, - {P_GPLL0_EARLY_DIV ,6 } -}; - -static const char *const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = { -"xo" , -"gpll0" , -"gpll2" , -"gpll3" , -"gpll1" , -"gpll4" , -"gpll0_early_div" -}; -static struct clk_fixed_factor xo = { .mult =1 , .div =1 ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 163/271 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
@@ -383,6 +383,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 164/271 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
@@ -533,6 +533,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 166/271 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
@@ -682,7 +682,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 149/271 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
@@ -1582,9 +1582,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 167/271 RDMA/hns: Fixs hw access invalid dma memory error
In reply to Greg Kroah-HartmanFrom: Xi Wang <[email protected]>
[ Upstream commit ec5bc2cc69b4fc494e04d10fc5226f6f9cf67c56 ]
When smmu is enable, if execute the perftest command and then use 'kill -9' to exit, follow this operation repeatedly, the kernel will have a high probability to print the following smmu event:
arm-smmu-v3 arm-smmu-v3.1.auto: event 0x10 received:
arm-smmu-v3 arm-smmu-v3.1.auto: 0x00007d0000000010 arm-smmu-v3 arm-smmu-v3.1.auto: 0x0000020900000080 arm-smmu-v3 arm-smmu-v3.1.auto: 0x00000000f47cf000 arm-smmu-v3 arm-smmu-v3.1.auto: 0x00000000f47cf000
This is because the hw will periodically refresh the qpc cache until the next reset.
This patch fixed it by removing the action that release qpc memory in the 'hns_roce_qp_free' function.
--- drivers/infiniband/hw/hns/hns_roce_qp.c | 1 - 1 file changed, 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_qp.c +0 -1
@@ -241,7 +241,6 @@ void hns_roce_qp_free(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)if ((hr_qp->ibqp.qp_type) !=IB_QPT_GSI ) {hns_roce_table_put (hr_dev, &qp_table->irrl_table, hr_qp->qpn); -hns_roce_table_put (hr_dev, &qp_table->qp_table, hr_qp->qpn); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 168/271 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
@@ -1053,7 +1053,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 ;
@@ -1062,6 +1061,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 171/271 qed: reduce maximum stack frame size
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 7c116e02a4a7575c8c62bfd2106e3e3ec8fb99dc ]
clang warns about an overly large stack frame in one function when it decides to inline all __qed_get_vport_*() functions into __qed_get_vport_stats():
drivers/net/ethernet/qlogic/qed/qed_l2.c:1889:13: error: stack frame size of 1128 bytes in function '_qed_get_vport_stats' [-Werror,-Wframe-larger-than=]
Use a noinline_for_stack annotation to prevent clang from inlining these, which keeps the maximum stack usage at around half of that in the worst case, similar to what we get with gcc.
--- drivers/net/ethernet/qlogic/qed/qed_l2.c | 34 +++++++++++------------- 1 file changed, 15 insertions(+), 19 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_l2.c +15 -19
@@ -1328,10 +1328,9 @@ static void __qed_get_vport_pstats_addrlen(struct qed_hwfn *p_hwfn, } } -static void __qed_get_vport_pstats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack void +__qed_get_vport_pstats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct eth_pstorm_per_queue_stat pstats;u32 pstats_addr =0 , pstats_len =0 ;
@@ -1351,10 +1350,9 @@ static void __qed_get_vport_pstats(struct qed_hwfn *p_hwfn, p_stats->tx_err_drop_pkts +=HILO_64_REGPAIR (pstats.error_drop_pkts); } -static void __qed_get_vport_tstats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack void +__qed_get_vport_tstats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct tstorm_per_port_stat tstats;u32 tstats_addr, tstats_len;
@@ -1397,10 +1395,9 @@ static void __qed_get_vport_ustats_addrlen(struct qed_hwfn *p_hwfn, } } -static void __qed_get_vport_ustats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack +void __qed_get_vport_ustats(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct eth_ustorm_per_queue_stat ustats;u32 ustats_addr =0 , ustats_len =0 ;
@@ -1436,10 +1433,9 @@ static void __qed_get_vport_mstats_addrlen(struct qed_hwfn *p_hwfn, } } -static void __qed_get_vport_mstats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack void +__qed_get_vport_mstats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct eth_mstorm_per_queue_stat mstats;u32 mstats_addr =0 , mstats_len =0 ;
@@ -1463,9 +1459,9 @@ static void __qed_get_vport_mstats(struct qed_hwfn *p_hwfn,HILO_64_REGPAIR (mstats.tpa_coalesced_bytes); } -static void __qed_get_vport_port_stats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats) +static noinline_for_stack void +__qed_get_vport_port_stats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats) {struct port_stats port_stats;int j;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 172/271 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
@@ -989,7 +989,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 173/271 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;
@@ -328,9 +321,12 @@ static int __init mic_init(void)request_module ("mic_x100_dma" );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);
@@ -341,7 +337,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:
@@ -351,7 +347,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 174/271 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
@@ -438,7 +438,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 175/271 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 176/271 net/mlx5: Fix mlx5_ifc_query_lag_out_bits
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit ea77388b02270b0af8dc57f668f311235ea068f0 ]
Remove the "reserved_at_40" field to match the device specification.
--- include/linux/mlx5/mlx5_ifc.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/mlx5/mlx5_ifc.h +0 -2
@@ -7909,8 +7909,6 @@ struct mlx5_ifc_query_lag_out_bits {u8 syndrome[0x20 ]; -u8 reserved_at_40[0x40 ]; -struct mlx5_ifc_lagc_bits ctx; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 177/271 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
@@ -885,6 +885,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 178/271 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 179/271 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
@@ -1417,7 +1417,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 180/271 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
@@ -234,7 +234,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 181/271 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
@@ -380,6 +380,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 182/271 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 184/271 ASoC: sun4i-i2s: RX and TX counter registers are swapped
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit cf2c0e1ce9544df42170fb921f12da82dc0cc8d6 ]
The RX and TX counters registers offset have been swapped, fix that.
--- sound/soc/sunxi/sun4i-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +2 -2
@@ -78,8 +78,8 @@#define SUN4I_I2S_CLK_DIV_MCLK_MASK GENMASK(3, 0)#define SUN4I_I2S_CLK_DIV_MCLK (mclk) ((mclk) << 0) -#define SUN4I_I2S_RX_CNT_REG 0x28 -#define SUN4I_I2S_TX_CNT_REG 0x2c +#define SUN4I_I2S_TX_CNT_REG 0x28 +#define SUN4I_I2S_RX_CNT_REG 0x2c#define SUN4I_I2S_TX_CHAN_SEL_REG 0x30#define SUN4I_I2S_TX_CHAN_SEL (num_chan) (((num_chan) - 1) << 0)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 185/271 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
@@ -226,6 +233,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 151/271 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
@@ -633,7 +633,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
@@ -592,8 +592,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 154/271 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
@@ -542,7 +542,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 156/271 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
@@ -2431,6 +2431,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;
@@ -2464,11 +2471,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:
@@ -2482,12 +2496,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 147/271 serial: stm32: fix transmit_chars when tx is stopped
In reply to Greg Kroah-HartmanFrom: Erwan Le Ray <[email protected]>
[ Upstream commit b83b957c91f68e53f0dc596e129e8305761f2a32 ]
Disables the tx irq when the transmission is ended and updates stop_tx conditions for code cleanup.
--- drivers/tty/serial/stm32-usart.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/tty/serial/stm32-usart.c +3 -8
@@ -293,13 +293,8 @@ static void stm32_transmit_chars(struct uart_port *port)return ; } -if (uart_tx_stopped (port)) { -stm32_stop_tx (port); -return ; - } - -if (uart_circ_empty (xmit)) { -stm32_stop_tx (port); +if (uart_circ_empty (xmit) ||uart_tx_stopped (port)) { +stm32_clr_bits (port, ofs->cr1,USART_CR1_TXEIE );return ; }
@@ -312,7 +307,7 @@ static void stm32_transmit_chars(struct uart_port *port)uart_write_wakeup (port);if (uart_circ_empty (xmit)) -stm32_stop_tx (port); +stm32_clr_bits (port, ofs->cr1,USART_CR1_TXEIE ); }static irqreturn_t stm32_interrupt (int irq,void *ptr)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 187/271 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
@@ -74,7 +74,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 196/271 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
@@ -300,9 +300,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);
@@ -316,9 +316,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 199/271 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 200/271 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 201/271 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 202/271 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
@@ -2113,6 +2113,8 @@ skip_ats_check:*/ domain_flush_tlb_pde (domain); +domain_flush_complete (domain); +return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 204/271 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
@@ -1773,7 +1773,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 188/271 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
@@ -190,7 +190,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 206/271 of: mdio: Fix a signedness bug in of_phy_get_and_connect()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d7eb651212fdbafa82d485d8e76095ac3b14c193 ]
The "iface" variable is an enum and in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/of/of_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/of_mdio.c +1 -1
@@ -353,7 +353,7 @@ struct phy_device *of_phy_get_and_connect(struct net_device *dev,struct phy_device *phy; iface =of_get_phy_mode (np); -if (iface <0 ) +if ((int )iface <0 )return NULL ; phy_np =of_parse_phandle (np,"phy-handle" ,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 207/271 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 int 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 -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 209/271 net: stmmac: gmac4+: Not all Unicast addresses may be available
In reply to Greg Kroah-HartmanFrom: Jose Abreu <[email protected]>
[ Upstream commit 25683bab09a70542b9f8e3e28f79b3369e56701f ]
Some setups may not have all Unicast addresses filters available. Check the number of available filters before trying to setup it.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +1 -1
@@ -168,7 +168,7 @@ static void dwmac4_set_filter(struct mac_device_info *hw, }/* Handle multiple unicast addresses */ -if (netdev_uc_count (dev) >GMAC_MAX_PERFECT_ADDRESSES ) { +if (netdev_uc_count (dev) > hw->unicast_filter_entries) {/* Switch to promiscuous mode if more than 128 addrs * are required */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 211/271 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 212/271 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 213/271 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
@@ -158,7 +158,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 214/271 act_mirred: Fix mirred_init_module error handling
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 11c9a7d38af524217efb7a176ad322b97ac2f163 ]
If tcf_register_action failed, mirred_device_notifier should be unregistered.
--- net/sched/act_mirred.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/sched/act_mirred.c +5 -1
@@ -332,7 +332,11 @@ static int __init mirred_init_module(void)return err;pr_info ("Mirror/redirect action on\n" ); -return tcf_register_action (&act_mirred_ops, &mirred_net_ops); + err =tcf_register_action (&act_mirred_ops, &mirred_net_ops); +if (err) +unregister_netdevice_notifier (&mirred_device_notifier); + +return err; } static void __exit mirred_cleanup_module(void)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 215/271 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
@@ -33,6 +33,8 @@#include "sfpb.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;
@@ -909,7 +911,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 ); }
@@ -1288,7 +1290,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 216/271 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
@@ -1441,6 +1441,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 218/271 net: netem: correct the parents backlog when corrupted packet was dropped
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit e0ad032e144731a5928f2d75e91c2064ba1a764c ]
If packet corruption failed we jump to finish_segs and return NET_XMIT_SUCCESS. Seeing success will make the parent qdisc increment its backlog, that's incorrect - we need to return NET_XMIT_DROP.
--- net/sched/sch_netem.c | 2 ++ 1 file changed, 2 insertions(+)
net/sched/sch_netem.c +2 -0
@@ -609,6 +609,8 @@ finish_segs: }/* Parent qdiscs accounted for 1 skb of size @prev_len */ qdisc_tree_reduce_backlog (sch, -(nb -1 ), -(len - prev_len)); + }else if (!skb) { +return NET_XMIT_DROP ; }return NET_XMIT_SUCCESS ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 217/271 net: netem: fix error path for corrupted GSO frames
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit a7fa12d15855904aff1716e1fc723c03ba38c5cc ]
To corrupt a GSO frame we first perform segmentation. We then proceed using the first segment instead of the full GSO skb and requeue the rest of the segments as separate packets.
If there are any issues with processing the first segment we still want to process the rest, therefore we jump to the finish_segs label.
Commit 177b8007463c ("net: netem: fix backlog accounting for corrupted GSO frames") started using the pointer to the first segment in the "rest of segments processing", but as mentioned above the first segment may had already been freed at this point.
Backlog corrections for parent qdiscs have to be adjusted.
--- net/sched/sch_netem.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/sched/sch_netem.c +6 -3
@@ -510,6 +510,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,if (skb->ip_summed ==CHECKSUM_PARTIAL &&skb_checksum_help (skb)) {qdisc_drop (skb, sch, to_free); + skb =NULL ; goto finish_segs; }
@@ -586,9 +587,10 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, finish_segs:if (segs) {unsigned int len, last_len; -int nb =0 ; +int nb; - len = skb->len; + len = skb ? skb->len :0 ; + nb = skb ?1 :0 ;while (segs) { skb2 = segs->next;
@@ -605,7 +607,8 @@ finish_segs: } segs = skb2; } -qdisc_tree_reduce_backlog (sch, -nb, prev_len - len); +/* Parent qdiscs accounted for 1 skb of size @prev_len */ +qdisc_tree_reduce_backlog (sch, -(nb -1 ), -(len - prev_len)); }return NET_XMIT_SUCCESS ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 220/271 afs: Fix large file support
In reply to Greg Kroah-HartmanFrom: Marc Dionne <[email protected]>
[ Upstream commit b485275f1aca8a9da37fd35e4fad673935e827da ]
By default s_maxbytes is set to MAX_NON_LFS, which limits the usable file size to 2GB, enforced by the vfs.
Commit b9b1f8d5930a ("AFS: write support fixes") added support for the 64-bit fetch and store server operations, but did not change this value. As a result, attempts to write past the 2G mark result in EFBIG errors:
$ dd if=/dev/zero of=foo bs=1M count=1 seek=2048 dd: error writing 'foo': File too large
Set s_maxbytes to MAX_LFS_FILESIZE.
--- fs/afs/super.c | 1 + 1 file changed, 1 insertion(+)
fs/afs/super.c +1 -0
@@ -317,6 +317,7 @@ static int afs_fill_super(struct super_block *sb,/* fill in the superblock */ sb->s_blocksize =PAGE_SIZE ; sb->s_blocksize_bits =PAGE_SHIFT ; + sb->s_maxbytes =MAX_LFS_FILESIZE ; sb->s_magic =AFS_FS_MAGIC ; sb->s_op = &afs_super_ops; sb->s_bdi = &as->volume->bdi;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 223/271 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
@@ -526,10 +526,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 222/271 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) {
@@ -511,11 +522,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 ; }
@@ -678,10 +691,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; }
@@ -700,9 +709,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 ;
@@ -718,10 +724,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 221/271 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; };
@@ -515,7 +514,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 ;
@@ -624,11 +623,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 ;
@@ -685,7 +679,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; }
@@ -708,6 +701,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 :
@@ -717,12 +711,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 224/271 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 191/271 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/supply/power_supply_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/power/supply/power_supply_core.c +5 -5
@@ -764,14 +764,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;
@@ -808,8 +808,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 193/271 staging: greybus: light: fix a couple double frees
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 329101244f214952606359d254ae883b7109e1a5 ]
The problem is in gb_lights_request_handler(). If we get a request to change the config then we release the light with gb_lights_light_release() and re-allocated it. However, if the allocation fails part way through then we call gb_lights_light_release() again. This can lead to a couple different double frees where we haven't cleared out the original values:
gb_lights_light_v4l2_unregister(light); ... kfree(light->channels); kfree(light->name);
I also made a small change to how we set "light->channels_count = 0;". The original code handled this part fine and did not cause a use after free but it was sort of complicated to read.
--- drivers/staging/greybus/light.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/greybus/light.c +6 -6
@@ -1102,21 +1102,21 @@ static void gb_lights_channel_release(struct gb_channel *channel)static void gb_lights_light_release (struct gb_light *light) {int i; -int count; light->ready = false; - count = light->channels_count; -if (light->has_flash)gb_lights_light_v4l2_unregister (light); + light->has_flash = false; -for (i =0 ; i < count; i++) { +for (i =0 ; i < light->channels_count; i++)gb_lights_channel_release (&light->channels[i]); - light->channels_count--; - } + light->channels_count =0 ; +kfree (light->channels); + light->channels =NULL ;kfree (light->name); + light->name =NULL ; }static void gb_lights_release (struct gb_lights *glights)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 194/271 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 186/271 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
@@ -547,7 +547,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 195/271 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 237/271 net, ip6_tunnel: fix namespaces move
In reply to Greg Kroah-HartmanFrom: William Dauchy <[email protected]>
[ Upstream commit 5311a69aaca30fa849c3cc46fb25f75727fb72d0 ]
in the same manner as commit d0f418516022 ("net, ip_tunnel: fix namespaces move"), fix namespace moving as it was broken since commit 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnel"), but for ipv6 this time; there is no reason to keep it for ip6_tunnel.
--- net/ipv6/ip6_tunnel.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/ipv6/ip6_tunnel.c +1 -3
@@ -1861,10 +1861,8 @@ static int ip6_tnl_dev_init(struct net_dif (err)return err;ip6_tnl_link_config (t); -if (t->parms.collect_md) { - dev->features |=NETIF_F_NETNS_LOCAL ; +if (t->parms.collect_md)netif_keep_dst (dev); - }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 240/271 tcp_bbr: improve arithmetic division in bbr_update_bw()
In reply to Greg Kroah-HartmanFrom: Wen Yang <[email protected]>
[ Upstream commit 5b2f1f3070b6447b76174ea8bfb7390dc6253ebd ]
do_div() does a 64-by-32 division. Use div64_long() instead of it if the divisor is long, to avoid truncation to 32-bit. And as a nice side effect also cleans up the function a bit.
--- net/ipv4/tcp_bbr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ipv4/tcp_bbr.c +1 -2
@@ -649,8 +649,7 @@ static void bbr_update_bw(struct sock *s* bandwidth sample. Delivered is in packets and interval_us in uS and * ratio will be <<1 for most connections. So delivered is first scaled. */ - bw = (u64 )rs->delivered *BW_UNIT ; -do_div (bw, rs->interval_us); + bw =div64_long ((u64 )rs->delivered *BW_UNIT , rs->interval_us);/* If this sample is application-limited, it is likely to have a very * low delivered count that represents application behavior rather than
Greg Kroah-Hartman
maintainerPATCH 241/271 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 <linux/of_net.h> #include "lan78xx.h"
@@ -3291,6 +3292,19 @@ static void lan78xx_tx_timeout(struct netasklet_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,
@@ -3304,6 +3318,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 void lan78xx_stat_monitor (unsigned long param)
Greg Kroah-Hartman
maintainerPATCH 242/271 gtp: make sure only SOCK_DGRAM UDP sockets are accepted
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 940ba14986657a50c15f694efca1beba31fa568f ]
A malicious user could use RAW sockets and fool GTP using them as standard SOCK_DGRAM UDP sockets.
BUG: KMSAN: uninit-value in udp_tunnel_encap_enable include/net/udp_tunnel.h:174 [inline] BUG: KMSAN: uninit-value in setup_udp_tunnel_sock+0x45e/0x6f0 net/ipv4/udp_tunnel.c:85 CPU: 0 PID: 11262 Comm: syz-executor613 Not tainted 5.5.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1c9/0x220 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 udp_tunnel_encap_enable include/net/udp_tunnel.h:174 [inline] setup_udp_tunnel_sock+0x45e/0x6f0 net/ipv4/udp_tunnel.c:85 gtp_encap_enable_socket+0x37f/0x5a0 drivers/net/gtp.c:827 gtp_encap_enable drivers/net/gtp.c:844 [inline] gtp_newlink+0xfb/0x1e50 drivers/net/gtp.c:666 __rtnl_newlink net/core/rtnetlink.c:3305 [inline] rtnl_newlink+0x2973/0x3920 net/core/rtnetlink.c:3363 rtnetlink_rcv_msg+0x1153/0x1570 net/core/rtnetlink.c:5424 netlink_rcv_skb+0x451/0x650 net/netlink/af_netlink.c:2477 rtnetlink_rcv+0x50/0x60 net/core/rtnetlink.c:5442 netlink_unicast_kernel net/netlink/af_netlink.c:1302 [inline] netlink_unicast+0xf9e/0x1100 net/netlink/af_netlink.c:1328 netlink_sendmsg+0x1248/0x14d0 net/netlink/af_netlink.c:1917 sock_sendmsg_nosec net/socket.c:639 [inline] sock_sendmsg net/socket.c:659 [inline] ____sys_sendmsg+0x12b6/0x1350 net/socket.c:2330 ___sys_sendmsg net/socket.c:2384 [inline] __sys_sendmsg+0x451/0x5f0 net/socket.c:2417 __do_sys_sendmsg net/socket.c:2426 [inline] __se_sys_sendmsg+0x97/0xb0 net/socket.c:2424 __x64_sys_sendmsg+0x4a/0x70 net/socket.c:2424 do_syscall_64+0xb8/0x160 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x441359 Code: e8 ac e8 ff ff 48 83 c4 18 c3 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 eb 08 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fff1cd0ac28 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 0000000000441359 RDX: 0000000000000000 RSI: 0000000020000100 RDI: 0000000000000003 RBP: 00000000006cb018 R08: 00000000004002c8 R09: 00000000004002c8 R10: 00000000004002c8 R11: 0000000000000246 R12: 00000000004020d0 R13: 0000000000402160 R14: 0000000000000000 R15: 0000000000000000
Uninit was created at:
kmsan_save_stack_with_flags+0x3c/0x90 mm/kmsan/kmsan.c:144 kmsan_internal_alloc_meta_for_pages mm/kmsan/kmsan_shadow.c:307 [inline] kmsan_alloc_page+0x12a/0x310 mm/kmsan/kmsan_shadow.c:336 __alloc_pages_nodemask+0x57f2/0x5f60 mm/page_alloc.c:4800 alloc_pages_current+0x67d/0x990 mm/mempolicy.c:2207 alloc_pages include/linux/gfp.h:534 [inline] alloc_slab_page+0x111/0x12f0 mm/slub.c:1511 allocate_slab mm/slub.c:1656 [inline] new_slab+0x2bc/0x1130 mm/slub.c:1722 new_slab_objects mm/slub.c:2473 [inline] ___slab_alloc+0x1533/0x1f30 mm/slub.c:2624 __slab_alloc mm/slub.c:2664 [inline] slab_alloc_node mm/slub.c:2738 [inline] slab_alloc mm/slub.c:2783 [inline] kmem_cache_alloc+0xb23/0xd70 mm/slub.c:2788 sk_prot_alloc+0xf2/0x620 net/core/sock.c:1597 sk_alloc+0xf0/0xbe0 net/core/sock.c:1657 inet_create+0x7c7/0x1370 net/ipv4/af_inet.c:321 __sock_create+0x8eb/0xf00 net/socket.c:1420 sock_create net/socket.c:1471 [inline] __sys_socket+0x1a1/0x600 net/socket.c:1513 __do_sys_socket net/socket.c:1522 [inline] __se_sys_socket+0x8d/0xb0 net/socket.c:1520 __x64_sys_socket+0x4a/0x70 net/socket.c:1520 do_syscall_64+0xb8/0x160 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/net/gtp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/gtp.c +3 -1
@@ -836,7 +836,9 @@ static int gtp_encap_enable(struct net_dreturn -ENOENT ; } -if (sock0->sk->sk_protocol !=IPPROTO_UDP ) { +if (sock0->sk->sk_protocol !=IPPROTO_UDP || + sock0->sk->sk_type !=SOCK_DGRAM || + (sock0->sk->sk_family !=AF_INET && sock0->sk->sk_family !=AF_INET6 )) {netdev_dbg (dev,"socket fd=%d not UDP\n" , fd_gtp0); err = -EINVAL ; goto err1;
Greg Kroah-Hartman
maintainerPATCH 243/271 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 244/271 hwmon: (core) Simplify sysfs attribute name allocation
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
commit 3a412d5e4a1c831723d0aaf305f1cf9a78ad9c90 upstream.
Allocating the sysfs attribute name only if needed and only with the required minimum length looks optimal, but does not take the additional overhead for both devm_ data structures and the allocation header itself into account. This also results in unnecessary memory fragmentation. Move the sysfs name string into struct hwmon_device_attribute and give it a sufficient length to reduce this overhead.
--- drivers/hwmon/hwmon.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/hwmon/hwmon.c +9 -8
@@ -38,12 +38,15 @@ struct hwmon_device {#define to_hwmon_device (d) container_of(d, struct hwmon_device, dev) +#define MAX_SYSFS_ATTR_NAME_LENGTH 32 +struct hwmon_device_attribute {struct device_attribute dev_attr;const struct hwmon_ops *ops;enum hwmon_sensor_types type;u32 attr;int index; +char name[MAX_SYSFS_ATTR_NAME_LENGTH ]; };#define to_hwmon_attr (d) \
@@ -232,20 +235,18 @@ static struct attribute *hwmon_genattr(sif ((mode &S_IWUGO ) && !ops->write)return ERR_PTR (-EINVAL ); + hattr =devm_kzalloc (dev,sizeof (*hattr),GFP_KERNEL ); +if (!hattr) +return ERR_PTR (-ENOMEM ); +if (type == hwmon_chip) { name = (char *)template; }else { - name =devm_kzalloc (dev,strlen (template) +16 ,GFP_KERNEL ); -if (!name) -return ERR_PTR (-ENOMEM ); -scnprintf (name,strlen (template) +16 , template, +scnprintf (hattr->name,sizeof (hattr->name), template, index +hwmon_attr_base (type)); + name = hattr->name; } - hattr =devm_kzalloc (dev,sizeof (*hattr),GFP_KERNEL ); -if (!hattr) -return ERR_PTR (-ENOMEM ); - hattr->type = type; hattr->attr = attr; hattr->index = index;
Greg Kroah-Hartman
maintainerPATCH 228/271 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
@@ -7026,8 +7026,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
@@ -3697,8 +3697,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
@@ -6018,8 +6018,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 246/271 hwmon: (core) Fix double-free in __hwmon_device_register()
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit 74e3512731bd5c9673176425a76a7cc5efa8ddb6 upstream.
Fix double-free that happens when thermal zone setup fails, see KASAN log below.
==================================================================
BUG: KASAN: double-free or invalid-free in __hwmon_device_register+0x5dc/0xa7c CPU: 0 PID: 132 Comm: kworker/0:2 Tainted: G B 4.19.0-rc8-next-20181016-00042-gb52cd80401e9-dirty #41 Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) Workqueue: events deferred_probe_work_func Backtrace: [<c0110540>] (dump_backtrace) from [<c0110944>] (show_stack+0x20/0x24) [<c0110924>] (show_stack) from [<c105cb08>] (dump_stack+0x9c/0xb0) [<c105ca6c>] (dump_stack) from [<c02fdaec>] (print_address_description+0x68/0x250) [<c02fda84>] (print_address_description) from [<c02fd4ac>] (kasan_report_invalid_free+0x68/0x88) [<c02fd444>] (kasan_report_invalid_free) from [<c02fc85c>] (__kasan_slab_free+0x1f4/0x200) [<c02fc668>] (__kasan_slab_free) from [<c02fd0c0>] (kasan_slab_free+0x14/0x18) [<c02fd0ac>] (kasan_slab_free) from [<c02f9c6c>] (kfree+0x90/0x294) [<c02f9bdc>] (kfree) from [<c0b41bbc>] (__hwmon_device_register+0x5dc/0xa7c) [<c0b415e0>] (__hwmon_device_register) from [<c0b421e8>] (hwmon_device_register_with_info+0xa0/0xa8) [<c0b42148>] (hwmon_device_register_with_info) from [<c0b42324>] (devm_hwmon_device_register_with_info+0x74/0xb4) [<c0b422b0>] (devm_hwmon_device_register_with_info) from [<c0b4481c>] (lm90_probe+0x414/0x578) [<c0b44408>] (lm90_probe) from [<c0aeeff4>] (i2c_device_probe+0x35c/0x384) [<c0aeec98>] (i2c_device_probe) from [<c08776cc>] (really_probe+0x290/0x3e4) [<c087743c>] (really_probe) from [<c0877a2c>] (driver_probe_device+0x80/0x1c4) [<c08779ac>] (driver_probe_device) from [<c0877da8>] (__device_attach_driver+0x104/0x11c) [<c0877ca4>] (__device_attach_driver) from [<c0874dd8>] (bus_for_each_drv+0xa4/0xc8) [<c0874d34>] (bus_for_each_drv) from [<c08773b0>] (__device_attach+0xf0/0x15c) [<c08772c0>] (__device_attach) from [<c0877e24>] (device_initial_probe+0x1c/0x20) [<c0877e08>] (device_initial_probe) from [<c08762f4>] (bus_probe_device+0xdc/0xec) [<c0876218>] (bus_probe_device) from [<c0876a08>] (deferred_probe_work_func+0xa8/0xd4) [<c0876960>] (deferred_probe_work_func) from [<c01527c4>] (process_one_work+0x3dc/0x96c) [<c01523e8>] (process_one_work) from [<c01541e0>] (worker_thread+0x4ec/0x8bc) [<c0153cf4>] (worker_thread) from [<c015b238>] (kthread+0x230/0x240) [<c015b008>] (kthread) from [<c01010bc>] (ret_from_fork+0x14/0x38) Exception stack(0xcf743fb0 to 0xcf743ff8)
3fa0: 00000000 00000000 00000000 00000000
3fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 3fe0: 00000000 00000000 00000000 00000000 00000013 00000000
Allocated by task 132: kasan_kmalloc.part.1+0x58/0xf4 kasan_kmalloc+0x90/0xa4 kmem_cache_alloc_trace+0x90/0x2a0 __hwmon_device_register+0xbc/0xa7c hwmon_device_register_with_info+0xa0/0xa8 devm_hwmon_device_register_with_info+0x74/0xb4 lm90_probe+0x414/0x578 i2c_device_probe+0x35c/0x384 really_probe+0x290/0x3e4 driver_probe_device+0x80/0x1c4 __device_attach_driver+0x104/0x11c bus_for_each_drv+0xa4/0xc8 __device_attach+0xf0/0x15c device_initial_probe+0x1c/0x20 bus_probe_device+0xdc/0xec deferred_probe_work_func+0xa8/0xd4 process_one_work+0x3dc/0x96c worker_thread+0x4ec/0x8bc kthread+0x230/0x240 ret_from_fork+0x14/0x38 (null) Freed by task 132: __kasan_slab_free+0x12c/0x200 kasan_slab_free+0x14/0x18 kfree+0x90/0x294 hwmon_dev_release+0x1c/0x20 device_release+0x4c/0xe8 kobject_put+0xac/0x11c device_unregister+0x2c/0x30 __hwmon_device_register+0xa58/0xa7c hwmon_device_register_with_info+0xa0/0xa8 devm_hwmon_device_register_with_info+0x74/0xb4 lm90_probe+0x414/0x578 i2c_device_probe+0x35c/0x384 really_probe+0x290/0x3e4 driver_probe_device+0x80/0x1c4 __device_attach_driver+0x104/0x11c bus_for_each_drv+0xa4/0xc8 __device_attach+0xf0/0x15c device_initial_probe+0x1c/0x20 bus_probe_device+0xdc/0xec deferred_probe_work_func+0xa8/0xd4 process_one_work+0x3dc/0x96c worker_thread+0x4ec/0x8bc kthread+0x230/0x240 ret_from_fork+0x14/0x38 (null)
--- drivers/hwmon/hwmon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/hwmon/hwmon.c +4 -4
@@ -596,8 +596,10 @@ __hwmon_device_register(struct device *dif (info[i]->config[j] &HWMON_T_INPUT ) { err =hwmon_thermal_add_sensor (dev, hwdev, j); -if (err) - goto free_device; +if (err) { +device_unregister (hdev); + goto ida_remove; + } } } }
@@ -605,8 +607,6 @@ __hwmon_device_register(struct device *dreturn hdev; -free_device: -device_unregister (hdev); free_hwmon:kfree (hwdev); ida_remove:
Greg Kroah-Hartman
maintainerPATCH 247/271 hwmon: (core) Do not use device managed functions for memory allocations
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
commit 3bf8bdcf3bada771eb12b57f2a30caee69e8ab8d upstream.
The hwmon core uses device managed functions, tied to the hwmon parent device, for various internal memory allocations. This is problematic since hwmon device lifetime does not necessarily match its parent's device lifetime. If there is a mismatch, memory leaks will accumulate until the parent device is released.
Fix the problem by managing all memory allocations internally. The only exception is memory allocation for thermal device registration, which can be tied to the hwmon device, along with thermal device registration itself.
--- drivers/hwmon/hwmon.c | 68 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 27 deletions(-)
drivers/hwmon/hwmon.c +41 -27
@@ -51,6 +51,7 @@ struct hwmon_device_attribute {#define to_hwmon_attr (d) \ container_of(d, struct hwmon_device_attribute, dev_attr) +#define to_dev_attr (a) container_of(a, struct device_attribute, attr)/* * Thermal zone information
@@ -58,7 +59,7 @@ struct hwmon_device_attribute {* also provides the sensor index. */ struct hwmon_thermal_data { -struct hwmon_device *hwdev;/* Reference to hwmon device */ +struct device *dev;/* Reference to hwmon device */ int index;/* sensor index */ };
@@ -95,9 +96,27 @@ static const struct attribute_group *hwmNULL }; +static void hwmon_free_attrs (struct attribute **attrs) +{ +int i; + +for (i =0 ; attrs[i]; i++) { +struct device_attribute *dattr =to_dev_attr (attrs[i]); +struct hwmon_device_attribute *hattr =to_hwmon_attr (dattr); + +kfree (hattr); + } +kfree (attrs); +} +static void hwmon_dev_release (struct device *dev) { -kfree (to_hwmon_device (dev)); +struct hwmon_device *hwdev =to_hwmon_device (dev); + +if (hwdev->group.attrs) +hwmon_free_attrs (hwdev->group.attrs); +kfree (hwdev->groups); +kfree (hwdev); }static struct class hwmon_class = {
@@ -121,11 +140,11 @@ static DEFINE_IDA(hwmon_ida);static int hwmon_thermal_get_temp (void *data,int *temp) {struct hwmon_thermal_data *tdata = data; -struct hwmon_device *hwdev = tdata->hwdev; +struct hwmon_device *hwdev =to_hwmon_device (tdata->dev);int ret;long t; - ret = hwdev->chip->ops->read (&hwdev->dev, hwmon_temp, hwmon_temp_input, + ret = hwdev->chip->ops->read (tdata->dev, hwmon_temp, hwmon_temp_input, tdata->index, &t);if (ret <0 )return ret;
@@ -139,8 +158,7 @@ static struct thermal_zone_of_device_ops .get_temp = hwmon_thermal_get_temp, }; -static int hwmon_thermal_add_sensor (struct device *dev, -struct hwmon_device *hwdev,int index) +static int hwmon_thermal_add_sensor (struct device *dev,int index) {struct hwmon_thermal_data *tdata;struct thermal_zone_device *tzd;
@@ -149,10 +167,10 @@ static int hwmon_thermal_add_sensor(struif (!tdata)return -ENOMEM ; - tdata->hwdev = hwdev; + tdata->dev = dev; tdata->index = index; - tzd =devm_thermal_zone_of_sensor_register (&hwdev->dev, index, tdata, + tzd =devm_thermal_zone_of_sensor_register (dev, index, tdata, &hwmon_thermal_ops);/* * If CONFIG_THERMAL_OF is disabled, this returns -ENODEV,
@@ -164,8 +182,7 @@ static int hwmon_thermal_add_sensor(stru return 0; }#else -static int hwmon_thermal_add_sensor (struct device *dev, -struct hwmon_device *hwdev,int index) +static int hwmon_thermal_add_sensor (struct device *dev,int index) {return 0 ; }
@@ -215,8 +232,7 @@ static int hwmon_attr_base(enum hwmon_sereturn 1 ; } -static struct attribute *hwmon_genattr(struct device *dev, - const void *drvdata, +static struct attribute *hwmon_genattr(const void *drvdata, enum hwmon_sensor_types type, u32 attr, int index,
@@ -242,7 +258,7 @@ static struct attribute *hwmon_genattr(sif ((mode &S_IWUGO ) && !ops->write)return ERR_PTR (-EINVAL ); - hattr =devm_kzalloc (dev,sizeof (*hattr),GFP_KERNEL ); + hattr =kzalloc (sizeof (*hattr),GFP_KERNEL );if (!hattr)return ERR_PTR (-ENOMEM );
@@ -441,8 +457,7 @@ static int hwmon_num_channel_attrs(constreturn n; } -static int hwmon_genattrs (struct device *dev, -const void *drvdata, +static int hwmon_genattrs (const void *drvdata,struct attribute **attrs,const struct hwmon_ops *ops,const struct hwmon_channel_info *info)
@@ -468,7 +483,7 @@ static int hwmon_genattrs(struct device attr_mask &= ~BIT (attr);if (attr >= template_size)return -EINVAL ; - a =hwmon_genattr (dev, drvdata, info->type, attr, i, + a =hwmon_genattr (drvdata, info->type, attr, i, templates[attr], ops);if (IS_ERR (a)) {if (PTR_ERR (a) != -ENOENT )
@@ -482,8 +497,7 @@ static int hwmon_genattrs(struct device }static struct attribute ** -__hwmon_create_attrs (struct device *dev,const void *drvdata, -const struct hwmon_chip_info *chip) +__hwmon_create_attrs (const void *drvdata,const struct hwmon_chip_info *chip) {int ret, i, aindex =0 , nattrs =0 ;struct attribute **attrs;
@@ -494,15 +508,17 @@ __hwmon_create_attrs(struct device *dev,if (nattrs ==0 )return ERR_PTR (-EINVAL ); - attrs =devm_kcalloc (dev, nattrs +1 ,sizeof (*attrs),GFP_KERNEL ); + attrs =kcalloc (nattrs +1 ,sizeof (*attrs),GFP_KERNEL );if (!attrs)return ERR_PTR (-ENOMEM );for (i =0 ; chip->info[i]; i++) { - ret =hwmon_genattrs (dev, drvdata, &attrs[aindex], chip->ops, + ret =hwmon_genattrs (drvdata, &attrs[aindex], chip->ops, chip->info[i]); -if (ret <0 ) +if (ret <0 ) { +hwmon_free_attrs (attrs);return ERR_PTR (ret); + } aindex += ret; }
@@ -542,14 +558,13 @@ __hwmon_device_register(struct device *dfor (i =0 ; groups[i]; i++) ngroups++; - hwdev->groups =devm_kcalloc (dev, ngroups,sizeof (*groups), -GFP_KERNEL ); + hwdev->groups =kcalloc (ngroups,sizeof (*groups),GFP_KERNEL );if (!hwdev->groups) { err = -ENOMEM ; goto free_hwmon; } - attrs =__hwmon_create_attrs (dev, drvdata, chip); + attrs =__hwmon_create_attrs (drvdata, chip);if (IS_ERR (attrs)) { err =PTR_ERR (attrs); goto free_hwmon;
@@ -594,8 +609,7 @@ __hwmon_device_register(struct device *d hwmon_temp_input, j))continue ;if (info[i]->config[j] &HWMON_T_INPUT ) { - err =hwmon_thermal_add_sensor (dev, - hwdev, j); + err =hwmon_thermal_add_sensor (hdev, j);if (err) {device_unregister (hdev); goto ida_remove;
@@ -608,7 +622,7 @@ __hwmon_device_register(struct device *dreturn hdev; free_hwmon: -kfree (hwdev); +hwmon_dev_release (hdev); ida_remove:ida_simple_remove (&hwmon_ida, id);return ERR_PTR (err);
Greg Kroah-Hartman
maintainerPATCH 250/271 mmc: tegra: fix SDR50 tuning override
In reply to Greg Kroah-HartmanFrom: Michał Mirosław <[email protected]>
commit f571389c0b015e76f91c697c4c1700aba860d34f upstream.
Commit 7ad2ed1dfcbe inadvertently mixed up a quirk flag's name and broke SDR50 tuning override. Use correct NVQUIRK_ name.
--- drivers/mmc/host/sdhci-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +1 -1
@@ -174,7 +174,7 @@ static void tegra_sdhci_reset(struct sdh misc_ctrl |=SDHCI_MISC_CTRL_ENABLE_DDR50 ;if (soc_data->nvquirks &NVQUIRK_ENABLE_SDR104 ) misc_ctrl |=SDHCI_MISC_CTRL_ENABLE_SDR104 ; -if (soc_data->nvquirks &SDHCI_MISC_CTRL_ENABLE_SDR50 ) +if (soc_data->nvquirks &NVQUIRK_ENABLE_SDR50 ) clk_ctrl |=SDHCI_CLOCK_CTRL_SDR50_TUNING_OVERRIDE ; }
Greg Kroah-Hartman
maintainerPATCH 252/271 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
@@ -523,7 +523,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 254/271 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
@@ -1822,14 +1822,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 255/271 Input: pegasus_notetaker - fix endpoint sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit bcfcb7f9b480dd0be8f0df2df17340ca92a03b98 upstream.
The driver was checking the number of endpoints of the first alternate setting instead of the current one, something which could be used by a malicious device (or USB descriptor fuzzer) to trigger a NULL-pointer dereference.
--- drivers/input/tablet/pegasus_notetaker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/tablet/pegasus_notetaker.c +1 -1
@@ -260,7 +260,7 @@ static int pegasus_probe(struct usb_intereturn -ENODEV ;/* Sanity check that the device has an endpoint */ -if (intf->altsetting[0 ].desc.bNumEndpoints <1 ) { +if (intf->cur_altsetting->desc.bNumEndpoints <1 ) {dev_err (&intf->dev,"Invalid number of endpoints\n" );return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 256/271 Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
commit 97e24b095348a15ec08c476423c3b3b939186ad7 upstream.
The driver misses a check for devm_thermal_zone_of_sensor_register(). Add a check to fix it.
--- drivers/input/touchscreen/sun4i-ts.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/input/touchscreen/sun4i-ts.c +5 -1
@@ -246,6 +246,7 @@ static int sun4i_ts_probe(struct platforstruct device *dev = &pdev->dev;struct device_node *np = dev->of_node;struct device *hwmon; +struct thermal_zone_device *thermal;int error;u32 reg;bool ts_attached;
@@ -365,7 +366,10 @@ static int sun4i_ts_probe(struct platforif (IS_ERR (hwmon))return PTR_ERR (hwmon); -devm_thermal_zone_of_sensor_register (ts->dev,0 , ts, &sun4i_ts_tz_ops); + thermal =devm_thermal_zone_of_sensor_register (ts->dev,0 , ts, + &sun4i_ts_tz_ops); +if (IS_ERR (thermal)) +return PTR_ERR (thermal);writel (TEMP_IRQ_EN (1 ), ts->base +TP_INT_FIFOC );
Greg Kroah-Hartman
maintainerPATCH 229/271 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