4.9.204-stable review
Subsystems (3)
Greg Kroah-Hartman
maintainerPATCH 1/151 net/mlx4_en: fix mlx4 ethtool -N insertion
In reply to Greg Kroah-HartmanFrom: Luigi Rizzo <[email protected]>
[ Upstream commit 34e59836565e36fade1464e054a3551c1a0364be ]
ethtool expects ETHTOOL_GRXCLSRLALL to set ethtool_rxnfc->data with the total number of entries in the rx classifier table. Surprisingly, mlx4 is missing this part (in principle ethtool could still move forward and try the insert).
Tested: compiled and run command:
phh13:~# ethtool -N eth1 flow-type udp4 queue 4 Added rule with ID 255
--- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +1 -0
@@ -1679,6 +1679,7 @@ static int mlx4_en_get_rxnfc(struct net_ err =mlx4_en_get_flow (dev, cmd, cmd->fs.location);break ;case ETHTOOL_GRXCLSRLALL : + cmd->data =MAX_NUM_OF_FS_RULES ;while ((!err || err == -ENOENT ) && priority < cmd->rule_cnt) { err =mlx4_en_get_flow (dev, cmd, i);if (!err)
Greg Kroah-Hartman
maintainerPATCH 10/151 platform/x86: asus-nb-wmi: Support ALS on the Zenbook UX430UQ
In reply to Greg Kroah-HartmanFrom: Kiernan Hager <[email protected]>
[ Upstream commit db2582afa7444a0ce6bb1ebf1431715969a10b06 ]
This patch adds support for ALS on the Zenbook UX430UQ to the asus_nb_wmi driver. It also renames "quirk_asus_ux330uak" to "quirk_asus_forceals" because it is now used for more than one model of computer, and should thus have a more general name.
--- drivers/platform/x86/asus-nb-wmi.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/platform/x86/asus-nb-wmi.c +11 -2
@@ -120,7 +120,7 @@ static struct quirk_entry quirk_asus_x550lb = { .xusb2pr = 0x01D9, }; -static struct quirk_entry quirk_asus_ux330uak = { +static struct quirk_entry quirk_asus_forceals = { .wmi_force_als_set = true, };
@@ -431,7 +431,7 @@ static const struct dmi_system_id asus_quirks[] = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), DMI_MATCH(DMI_PRODUCT_NAME, "UX330UAK"), }, - .driver_data = &quirk_asus_ux330uak, + .driver_data = &quirk_asus_forceals, }, { .callback = dmi_matched,
@@ -442,6 +442,15 @@ static const struct dmi_system_id asus_quirks[] = { }, .driver_data = &quirk_asus_x550lb, }, + { + .callback = dmi_matched, + .ident = "ASUSTeK COMPUTER INC. UX430UQ", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "UX430UQ"), + }, + .driver_data = &quirk_asus_forceals, + }, {}, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/151 mwifiex: Fix NL80211_TX_POWER_LIMITED
In reply to Greg Kroah-HartmanFrom: Adrian Bunk <[email protected]>
[ Upstream commit 65a576e27309120e0621f54d5c81eb9128bd56be ]
NL80211_TX_POWER_LIMITED was treated as NL80211_TX_POWER_AUTOMATIC, which is the opposite of what should happen and can cause nasty regulatory problems.
if/else converted to a switch without default to make gcc warn on unhandled enum values.
--- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 13 +++++++++++-- drivers/net/wireless/marvell/mwifiex/ioctl.h | 1 + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 11 +++++++---- 3 files changed, 19 insertions(+), 6 deletions(-)
drivers/net/wireless/marvell/mwifiex/cfg80211.c +11 -2
@@ -364,11 +364,20 @@ mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy,struct mwifiex_power_cfg power_cfg;int dbm =MBM_TO_DBM (mbm); -if (type ==NL80211_TX_POWER_FIXED ) { +switch (type) { +case NL80211_TX_POWER_FIXED : power_cfg.is_power_auto =0 ; + power_cfg.is_power_fixed =1 ; power_cfg.power_level = dbm; - }else { +break ; +case NL80211_TX_POWER_LIMITED : + power_cfg.is_power_auto =0 ; + power_cfg.is_power_fixed =0 ; + power_cfg.power_level = dbm; +break ; +case NL80211_TX_POWER_AUTOMATIC : power_cfg.is_power_auto =1 ; +break ; } priv =mwifiex_get_priv (adapter,MWIFIEX_BSS_ROLE_ANY );
drivers/net/wireless/marvell/mwifiex/ioctl.h +1 -0
@@ -265,6 +265,7 @@ struct mwifiex_ds_encrypt_key {struct mwifiex_power_cfg {u32 is_power_auto; +u32 is_power_fixed;u32 power_level; };
drivers/net/wireless/marvell/mwifiex/sta_ioctl.c +7 -4
@@ -728,6 +728,9 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, txp_cfg = (struct host_cmd_ds_txpwr_cfg *) buf; txp_cfg->action =cpu_to_le16 (HostCmd_ACT_GEN_SET);if (!power_cfg->is_power_auto) { +u16 dbm_min = power_cfg->is_power_fixed ? + dbm : priv->min_tx_power_level; + txp_cfg->mode =cpu_to_le32 (1 ); pg_tlv = (struct mwifiex_types_power_group *) (buf +sizeof (struct host_cmd_ds_txpwr_cfg ));
@@ -742,7 +745,7 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, pg->last_rate_code =0x03 ; pg->modulation_class =MOD_CLASS_HR_DSSS ; pg->power_step =0 ; - pg->power_min = (s8 ) dbm; + pg->power_min = (s8 ) dbm_min; pg->power_max = (s8 ) dbm; pg++;/* Power group for modulation class OFDM */
@@ -750,7 +753,7 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, pg->last_rate_code =0x07 ; pg->modulation_class =MOD_CLASS_OFDM ; pg->power_step =0 ; - pg->power_min = (s8 ) dbm; + pg->power_min = (s8 ) dbm_min; pg->power_max = (s8 ) dbm; pg++;/* Power group for modulation class HTBW20 */
@@ -758,7 +761,7 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, pg->last_rate_code =0x20 ; pg->modulation_class =MOD_CLASS_HT ; pg->power_step =0 ; - pg->power_min = (s8 ) dbm; + pg->power_min = (s8 ) dbm_min; pg->power_max = (s8 ) dbm; pg->ht_bandwidth =HT_BW_20 ; pg++;
@@ -767,7 +770,7 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, pg->last_rate_code =0x20 ; pg->modulation_class =MOD_CLASS_HT ; pg->power_step =0 ; - pg->power_min = (s8 ) dbm; + pg->power_min = (s8 ) dbm_min; pg->power_max = (s8 ) dbm; pg->ht_bandwidth =HT_BW_40 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/151 printk: fix integer overflow in setup_log_buf()
In reply to Greg Kroah-HartmanFrom: Sergey Senozhatsky <[email protected]>
[ Upstream commit d2130e82e9454304e9b91ba9da551b5989af8c27 ]
The way we calculate logbuf free space percentage overflows signed integer:
int free;
free = __LOG_BUF_LEN - log_next_idx;
pr_info("early log buf free: %u(%u%%)\n",
free, (free * 100) / __LOG_BUF_LEN);We support LOG_BUF_LEN of up to 1<<25 bytes. Since setup_log_buf() is called during early init, logbuf is mostly empty, so
__LOG_BUF_LEN - log_next_idx
is close to 1<<25. Thus when we multiply it by 100, we overflow signed integer value range: 100 is 2^6 + 2^5 + 2^2.
Example, booting with LOG_BUF_LEN 1<<25 and log_buf_len=2G boot param:
[ 0.075317] log_buf_len: -2147483648 bytes [ 0.075319] early log buf free: 33549896(-28%)
Make "free" unsigned integer and use appropriate printk() specifier.
To: Steven Rostedt <[email protected]>
--- kernel/printk/printk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/printk/printk.c +1 -1
@@ -1050,7 +1050,7 @@ void __init setup_log_buf(int early) {unsigned long flags;char *new_log_buf; -int free; +unsigned int free;if (log_buf != __log_buf)return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/151 ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit 51e68fb0929c29e47e9074ca3e99ffd6021a1c5a ]
In some error paths, reference count of firewire unit is not decreased. This commit fixes the bug.
--- sound/firewire/isight.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/firewire/isight.c +5 -5
@@ -639,7 +639,7 @@ static int isight_probe(struct fw_unit *unit,if (!isight->audio_base) {dev_err (&unit->device,"audio unit base not found\n" ); err = -ENXIO ; - goto err_unit; + goto error; }fw_iso_resources_init (&isight->resources, unit);
@@ -668,12 +668,12 @@ static int isight_probe(struct fw_unit *unit,dev_set_drvdata (&unit->device, isight);return 0 ; - -err_unit: -fw_unit_put (isight->unit); -mutex_destroy (&isight->mutex); error:snd_card_free (card); + +mutex_destroy (&isight->mutex); +fw_unit_put (isight->unit); +return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/151 gfs2: Fix marking bitmaps non-full
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
[ Upstream commit ec23df2b0cf3e1620f5db77972b7fb735f267eff ]
Reservations in gfs can span multiple gfs2_bitmaps (but they won't span multiple resource groups). When removing a reservation, we want to clear the GBF_FULL flags of all involved gfs2_bitmaps, not just that of the first bitmap.
--- fs/gfs2/rgrp.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
fs/gfs2/rgrp.c +11 -2
@@ -630,7 +630,10 @@ static void __rs_deltree(struct gfs2_blkreserv *rs)RB_CLEAR_NODE (&rs->rs_node);if (rs->rs_free) { -struct gfs2_bitmap *bi =rbm_bi (&rs->rs_rbm); +u64 last_block =gfs2_rbm_to_block (&rs->rs_rbm) + + rs->rs_free -1 ; +struct gfs2_rbm last_rbm = { .rgd = rs->rs_rbm.rgd, }; +struct gfs2_bitmap *start, *last;/* return reserved blocks to the rgrp */ BUG_ON (rs->rs_rbm.rgd->rd_reserved < rs->rs_free);
@@ -641,7 +644,13 @@ static void __rs_deltree(struct gfs2_blkreserv *rs)it will force the number to be recalculated later. */ rgd->rd_extfail_pt += rs->rs_free; rs->rs_free =0 ; -clear_bit (GBF_FULL , &bi->bi_flags); +if (gfs2_rbm_from_block (&last_rbm, last_block)) +return ; + start =rbm_bi (&rs->rs_rbm); + last =rbm_bi (&last_rbm); +do +clear_bit (GBF_FULL , &start->bi_flags); +while (start++ != last); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/151 synclink_gt(): fix compat_ioctl()
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
[ Upstream commit 27230e51349fde075598c1b59d15e1ff802f3f6e ]
compat_ptr() for pointer-taking ones...
--- drivers/tty/synclink_gt.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/tty/synclink_gt.c +4 -12
@@ -1187,14 +1187,13 @@ static long slgt_compat_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) {struct slgt_info *info = tty->driver_data; -int rc = -ENOIOCTLCMD ; +int rc;if (sanity_check (info, tty->name,"compat_ioctl" ))return -ENODEV ;DBGINFO (("%s compat_ioctl() cmd=%08X\n" , info->device_name, cmd));switch (cmd) { -case MGSL_IOCSPARAMS32 : rc =set_params32 (info,compat_ptr (arg));break ;
@@ -1214,18 +1213,11 @@ static long slgt_compat_ioctl(struct tty_struct *tty,case MGSL_IOCWAITGPIO :case MGSL_IOCGXSYNC :case MGSL_IOCGXCTRL : -case MGSL_IOCSTXIDLE : -case MGSL_IOCTXENABLE : -case MGSL_IOCRXENABLE : -case MGSL_IOCTXABORT : -case TIOCMIWAIT : -case MGSL_IOCSIF : -case MGSL_IOCSXSYNC : -case MGSL_IOCSXCTRL : - rc =ioctl (tty, cmd, arg); + rc =ioctl (tty, cmd, (unsigned long )compat_ptr (arg));break ; +default : + rc =ioctl (tty, cmd, arg); } -DBGINFO (("%s compat_ioctl() cmd=%08X rc=%d\n" , info->device_name, cmd, rc));return rc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/151 net: rtnetlink: prevent underflows in do_setvfinfo()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d658c8f56ec7b3de8051a24afb25da9ba3c388c5 ]
The "ivm->vf" variable is a u32, but the problem is that a number of drivers cast it to an int and then forget to check for negatives. An example of this is in the cxgb4 driver.
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
2890 static int cxgb4_mgmt_get_vf_config(struct net_device *dev,
2891 int vf, struct ifla_vf_info *ivi)
^^^^^^
2892 {
2893 struct port_info *pi = netdev_priv(dev);
2894 struct adapter *adap = pi->adapter;
2895 struct vf_info *vfinfo;
2896
2897 if (vf >= adap->num_vfs)
^^^^^^^^^^^^^^^^^^^
2898 return -EINVAL;
2899 vfinfo = &adap->vfinfo[vf];
^^^^^^^^^^^^^^^^^^^^^^^^^^There are 48 functions affected.
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c:8435 hclge_set_vf_vlan_filter() warn: can 'vfid' underflow 's32min-2147483646' drivers/net/ethernet/freescale/enetc/enetc_pf.c:377 enetc_pf_set_vf_mac() warn: can 'vf' underflow 's32min-2147483646' drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:2899 cxgb4_mgmt_get_vf_config() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:2960 cxgb4_mgmt_set_vf_rate() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:3019 cxgb4_mgmt_set_vf_rate() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:3038 cxgb4_mgmt_set_vf_vlan() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:3086 cxgb4_mgmt_set_vf_link_state() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/chelsio/cxgb/cxgb2.c:791 get_eeprom() warn: can 'i' underflow 's32min-(-4),0,4-s32max' drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:82 bnxt_set_vf_spoofchk() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:164 bnxt_set_vf_trust() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:186 bnxt_get_vf_config() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:228 bnxt_set_vf_mac() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:264 bnxt_set_vf_vlan() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:293 bnxt_set_vf_bw() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:333 bnxt_set_vf_link_state() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c:2595 bnx2x_vf_op_prep() warn: can 'vfidx' underflow 's32min-63' drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c:2595 bnx2x_vf_op_prep() warn: can 'vfidx' underflow 's32min-63' drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c:2281 bnx2x_post_vf_bulletin() warn: can 'vf' underflow 's32min-63' drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c:2285 bnx2x_post_vf_bulletin() warn: can 'vf' underflow 's32min-63' drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c:2286 bnx2x_post_vf_bulletin() warn: can 'vf' underflow 's32min-63' drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c:2292 bnx2x_post_vf_bulletin() warn: can 'vf' underflow 's32min-63' drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c:2297 bnx2x_post_vf_bulletin() warn: can 'vf' underflow 's32min-63' drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c:1832 qlcnic_sriov_set_vf_mac() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c:1864 qlcnic_sriov_set_vf_tx_rate() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c:1937 qlcnic_sriov_set_vf_vlan() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c:2005 qlcnic_sriov_get_vf_config() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c:2036 qlcnic_sriov_set_vf_spoofchk() warn: can 'vf' underflow 's32min-254' drivers/net/ethernet/emulex/benet/be_main.c:1914 be_get_vf_config() warn: can 'vf' underflow 's32min-65534' drivers/net/ethernet/emulex/benet/be_main.c:1915 be_get_vf_config() warn: can 'vf' underflow 's32min-65534' drivers/net/ethernet/emulex/benet/be_main.c:1922 be_set_vf_tvt() warn: can 'vf' underflow 's32min-65534' drivers/net/ethernet/emulex/benet/be_main.c:1951 be_clear_vf_tvt() warn: can 'vf' underflow 's32min-65534' drivers/net/ethernet/emulex/benet/be_main.c:2063 be_set_vf_tx_rate() warn: can 'vf' underflow 's32min-65534' drivers/net/ethernet/emulex/benet/be_main.c:2091 be_set_vf_link_state() warn: can 'vf' underflow 's32min-65534' drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c:2609 ice_set_vf_port_vlan() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c:3050 ice_get_vf_cfg() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c:3103 ice_set_vf_spoofchk() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c:3181 ice_set_vf_mac() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c:3237 ice_set_vf_trust() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c:3286 ice_set_vf_link_state() warn: can 'vf_id' underflow 's32min-65534' drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:3919 i40e_validate_vf() warn: can 'vf_id' underflow 's32min-2147483646' drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:3957 i40e_ndo_set_vf_mac() warn: can 'vf_id' underflow 's32min-2147483646' drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:4104 i40e_ndo_set_vf_port_vlan() warn: can 'vf_id' underflow 's32min-2147483646' drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:4263 i40e_ndo_set_vf_bw() warn: can 'vf_id' underflow 's32min-2147483646' drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:4309 i40e_ndo_get_vf_config() warn: can 'vf_id' underflow 's32min-2147483646' drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:4371 i40e_ndo_set_vf_link_state() warn: can 'vf_id' underflow 's32min-2147483646' drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:4441 i40e_ndo_set_vf_spoofchk() warn: can 'vf_id' underflow 's32min-2147483646' drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:4441 i40e_ndo_set_vf_spoofchk() warn: can 'vf_id' underflow 's32min-2147483646' drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:4504 i40e_ndo_set_vf_trust() warn: can 'vf_id' underflow 's32min-2147483646'
--- net/core/rtnetlink.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
net/core/rtnetlink.c +22 -1
@@ -1724,6 +1724,8 @@ static int do_setvfinfo(struct net_devicif (tb[IFLA_VF_MAC ]) {struct ifla_vf_mac *ivm =nla_data (tb[IFLA_VF_MAC ]); +if (ivm->vf >=INT_MAX ) +return -EINVAL ; err = -EOPNOTSUPP ;if (ops->ndo_set_vf_mac) err = ops->ndo_set_vf_mac(dev, ivm->vf,
@@ -1735,6 +1737,8 @@ static int do_setvfinfo(struct net_devicif (tb[IFLA_VF_VLAN ]) {struct ifla_vf_vlan *ivv =nla_data (tb[IFLA_VF_VLAN ]); +if (ivv->vf >=INT_MAX ) +return -EINVAL ; err = -EOPNOTSUPP ;if (ops->ndo_set_vf_vlan) err = ops->ndo_set_vf_vlan(dev, ivv->vf, ivv->vlan,
@@ -1767,6 +1771,8 @@ static int do_setvfinfo(struct net_devicif (len ==0 )return -EINVAL ; +if (ivvl[0 ]->vf >=INT_MAX ) +return -EINVAL ; err = ops->ndo_set_vf_vlan (dev, ivvl[0 ]->vf, ivvl[0 ]->vlan, ivvl[0 ]->qos, ivvl[0 ]->vlan_proto);if (err <0 )
@@ -1777,6 +1783,8 @@ static int do_setvfinfo(struct net_devicstruct ifla_vf_tx_rate *ivt =nla_data (tb[IFLA_VF_TX_RATE ]);struct ifla_vf_info ivf; +if (ivt->vf >=INT_MAX ) +return -EINVAL ; err = -EOPNOTSUPP ;if (ops->ndo_get_vf_config) err = ops->ndo_get_vf_config (dev, ivt->vf, &ivf);
@@ -1795,6 +1803,8 @@ static int do_setvfinfo(struct net_devicif (tb[IFLA_VF_RATE ]) {struct ifla_vf_rate *ivt =nla_data (tb[IFLA_VF_RATE ]); +if (ivt->vf >=INT_MAX ) +return -EINVAL ; err = -EOPNOTSUPP ;if (ops->ndo_set_vf_rate) err = ops->ndo_set_vf_rate(dev, ivt->vf,
@@ -1807,6 +1817,8 @@ static int do_setvfinfo(struct net_devicif (tb[IFLA_VF_SPOOFCHK ]) {struct ifla_vf_spoofchk *ivs =nla_data (tb[IFLA_VF_SPOOFCHK ]); +if (ivs->vf >=INT_MAX ) +return -EINVAL ; err = -EOPNOTSUPP ;if (ops->ndo_set_vf_spoofchk) err = ops->ndo_set_vf_spoofchk(dev, ivs->vf,
@@ -1818,6 +1830,8 @@ static int do_setvfinfo(struct net_devicif (tb[IFLA_VF_LINK_STATE ]) {struct ifla_vf_link_state *ivl =nla_data (tb[IFLA_VF_LINK_STATE ]); +if (ivl->vf >=INT_MAX ) +return -EINVAL ; err = -EOPNOTSUPP ;if (ops->ndo_set_vf_link_state) err = ops->ndo_set_vf_link_state(dev, ivl->vf,
@@ -1831,6 +1845,8 @@ static int do_setvfinfo(struct net_devic err = -EOPNOTSUPP ; ivrssq_en =nla_data (tb[IFLA_VF_RSS_QUERY_EN ]); +if (ivrssq_en->vf >=INT_MAX ) +return -EINVAL ;if (ops->ndo_set_vf_rss_query_en) err = ops->ndo_set_vf_rss_query_en (dev, ivrssq_en->vf, ivrssq_en->setting);
@@ -1841,6 +1857,8 @@ static int do_setvfinfo(struct net_devicif (tb[IFLA_VF_TRUST ]) {struct ifla_vf_trust *ivt =nla_data (tb[IFLA_VF_TRUST ]); +if (ivt->vf >=INT_MAX ) +return -EINVAL ; err = -EOPNOTSUPP ;if (ops->ndo_set_vf_trust) err = ops->ndo_set_vf_trust (dev, ivt->vf, ivt->setting);
@@ -1851,15 +1869,18 @@ static int do_setvfinfo(struct net_devicif (tb[IFLA_VF_IB_NODE_GUID ]) {struct ifla_vf_guid *ivt =nla_data (tb[IFLA_VF_IB_NODE_GUID ]); +if (ivt->vf >=INT_MAX ) +return -EINVAL ;if (!ops->ndo_set_vf_guid)return -EOPNOTSUPP ; -return handle_vf_guid (dev, ivt,IFLA_VF_IB_NODE_GUID ); }if (tb[IFLA_VF_IB_PORT_GUID ]) {struct ifla_vf_guid *ivt =nla_data (tb[IFLA_VF_IB_PORT_GUID ]); +if (ivt->vf >=INT_MAX ) +return -EINVAL ;if (!ops->ndo_set_vf_guid)return -EOPNOTSUPP ;
Greg Kroah-Hartman
maintainerPATCH 3/151 sfc: Only cancel the PPS workqueue if it exists
In reply to Greg Kroah-HartmanFrom: Martin Habets <[email protected]>
[ Upstream commit 723eb53690041740a13ac78efeaf6804f5d684c9 ]
The workqueue only exists for the primary PF. For other functions we hit a WARN_ON in kernel/workqueue.c.
--- drivers/net/ethernet/sfc/ptp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/sfc/ptp.c +2 -1
@@ -1320,7 +1320,8 @@ void efx_ptp_remove(struct efx_nic *efx) (void )efx_ptp_disable (efx);cancel_work_sync (&efx->ptp_data->work); -cancel_work_sync (&efx->ptp_data->pps_work); +if (efx->ptp_data->pps_workwq) +cancel_work_sync (&efx->ptp_data->pps_work);skb_queue_purge (&efx->ptp_data->rxq);skb_queue_purge (&efx->ptp_data->txq);
Greg Kroah-Hartman
maintainerPATCH 4/151 net/mlx5e: Fix set vf link state error flow
In reply to Greg Kroah-HartmanFrom: Roi Dayan <[email protected]>
[ Upstream commit 751021218f7e66ee9bbaa2be23056e447cd75ec4 ]
Before this commit the ndo always returned success. Fix that.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +1 -1
@@ -1757,7 +1757,7 @@ int mlx5_eswitch_set_vport_state(struct unlock:mutex_unlock (&esw->state_lock); -return 0 ; +return err; } int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw,
Greg Kroah-Hartman
maintainerPATCH 5/151 net/sched: act_pedit: fix WARN() in the traffic path
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit f67169fef8dbcc1ac6a6a109ecaad0d3b259002c ]
when configuring act_pedit rules, the number of keys is validated only on addition of a new entry. This is not sufficient to avoid hitting a WARN() in the traffic path: for example, it is possible to replace a valid entry with a new one having 0 extended keys, thus causing splats in dmesg like:
pedit BUG: index 42
WARNING: CPU: 2 PID: 4054 at net/sched/act_pedit.c:410 tcf_pedit_act+0xc84/0x1200 [act_pedit] [...] RIP: 0010:tcf_pedit_act+0xc84/0x1200 [act_pedit] Code: 89 fa 48 c1 ea 03 0f b6 04 02 84 c0 74 08 3c 03 0f 8e ac 00 00 00 48 8b 44 24 10 48 c7 c7 a0 c4 e4 c0 8b 70 18 e8 1c 30 95 ea <0f> 0b e9 a0 fa ff ff e8 00 03 f5 ea e9 14 f4 ff ff 48 89 58 40 e9 RSP: 0018:ffff888077c9f320 EFLAGS: 00010286 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffffac2983a2 RDX: 0000000000000001 RSI: 0000000000000008 RDI: ffff888053927bec RBP: dffffc0000000000 R08: ffffed100a726209 R09: ffffed100a726209 R10: 0000000000000001 R11: ffffed100a726208 R12: ffff88804beea780 R13: ffff888079a77400 R14: ffff88804beea780 R15: ffff888027ab2000 FS: 00007fdeec9bd740(0000) GS:ffff888053900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffdb3dfd000 CR3: 000000004adb4006 CR4: 00000000001606e0 Call Trace: tcf_action_exec+0x105/0x3f0 tcf_classify+0xf2/0x410 __dev_queue_xmit+0xcbf/0x2ae0 ip_finish_output2+0x711/0x1fb0 ip_output+0x1bf/0x4b0 ip_send_skb+0x37/0xa0 raw_sendmsg+0x180c/0x2430 sock_sendmsg+0xdb/0x110 __sys_sendto+0x257/0x2b0 __x64_sys_sendto+0xdd/0x1b0 do_syscall_64+0xa5/0x4e0 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7fdeeb72e993 Code: 48 8b 0d e0 74 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 0f 1f 44 00 00 83 3d 0d d6 2c 00 00 75 13 49 89 ca b8 2c 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 34 c3 48 83 ec 08 e8 4b cc 00 00 48 89 04 24 RSP: 002b:00007ffdb3de8a18 EFLAGS: 00000246 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 000055c81972b700 RCX: 00007fdeeb72e993 RDX: 0000000000000040 RSI: 000055c81972b700 RDI: 0000000000000003 RBP: 00007ffdb3dea130 R08: 000055c819728510 R09: 0000000000000010 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000040 R13: 000055c81972b6c0 R14: 000055c81972969c R15: 0000000000000080
Fix this moving the check on 'nkeys' earlier in tcf_pedit_init(), so that attempts to install rules having 0 keys are always rejected with -EINVAL.
--- net/sched/act_pedit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/sched/act_pedit.c +3 -2
@@ -54,13 +54,14 @@ static int tcf_pedit_init(struct net *neif (tb[TCA_PEDIT_PARMS ] ==NULL )return -EINVAL ; parm =nla_data (tb[TCA_PEDIT_PARMS ]); +if (!parm->nkeys) +return -EINVAL ; + ksize = parm->nkeys *sizeof (struct tc_pedit_key );if (nla_len (tb[TCA_PEDIT_PARMS ]) <sizeof (*parm) + ksize)return -EINVAL ;if (!tcf_hash_check (tn, parm->index, a, bind)) { -if (!parm->nkeys) -return -EINVAL ; ret =tcf_hash_create (tn, parm->index, est, a, &act_pedit_ops, bind, false);if (ret)
Greg Kroah-Hartman
maintainerPATCH 8/151 Revert "fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()"
In reply to Greg Kroah-HartmanFrom: Joseph Qi <[email protected]>
commit 94b07b6f9e2e996afff7395de6b35f34f4cb10bf upstream.
This reverts commit 56e94ea132bb5c2c1d0b60a6aeb34dcb7d71a53d.
Commit 56e94ea132bb ("fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()") introduces a regression that fail to create directory with mount option user_xattr and acl. Actually the reported NULL pointer dereference case can be correctly handled by loc->xl_ops->xlo_add_entry(), so revert it.
--- fs/ocfs2/xattr.c | 56 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 23 deletions(-)
fs/ocfs2/xattr.c +33 -23
@@ -1497,6 +1497,18 @@ static int ocfs2_xa_check_space(struct oreturn loc->xl_ops->xlo_check_space (loc, xi); } +static void ocfs2_xa_add_entry (struct ocfs2_xa_loc *loc,u32 name_hash) +{ + loc->xl_ops->xlo_add_entry (loc, name_hash); + loc->xl_entry->xe_name_hash =cpu_to_le32 (name_hash); +/* +* We can't leave the new entry's xe_name_offset at zero or +* add_namevalue() will go nuts. We set it to the size of our +* storage so that it can never be less than any other entry. +*/ + loc->xl_entry->xe_name_offset =cpu_to_le16 (loc->xl_size); +} +static void ocfs2_xa_add_namevalue (struct ocfs2_xa_loc *loc,struct ocfs2_xattr_info *xi) {
@@ -2128,31 +2140,29 @@ static int ocfs2_xa_prepare_entry(structif (rc) goto out; -if (!loc->xl_entry) { - rc = -EINVAL ; - goto out; - } - -if (ocfs2_xa_can_reuse_entry (loc, xi)) { - orig_value_size = loc->xl_entry->xe_value_size; - rc =ocfs2_xa_reuse_entry (loc, xi, ctxt); -if (rc) - goto out; - goto alloc_value; - } +if (loc->xl_entry) { +if (ocfs2_xa_can_reuse_entry (loc, xi)) { + orig_value_size = loc->xl_entry->xe_value_size; + rc =ocfs2_xa_reuse_entry (loc, xi, ctxt); +if (rc) + goto out; + goto alloc_value; + } -if (!ocfs2_xattr_is_local (loc->xl_entry)) { - orig_clusters =ocfs2_xa_value_clusters (loc); - rc =ocfs2_xa_value_truncate (loc,0 , ctxt); -if (rc) { -mlog_errno (rc); -ocfs2_xa_cleanup_value_truncate (loc, -"overwriting" , - orig_clusters); - goto out; +if (!ocfs2_xattr_is_local (loc->xl_entry)) { + orig_clusters =ocfs2_xa_value_clusters (loc); + rc =ocfs2_xa_value_truncate (loc,0 , ctxt); +if (rc) { +mlog_errno (rc); +ocfs2_xa_cleanup_value_truncate (loc, +"overwriting" , + orig_clusters); + goto out; + } } - } -ocfs2_xa_wipe_namevalue (loc); +ocfs2_xa_wipe_namevalue (loc); + }else +ocfs2_xa_add_entry (loc, name_hash);/* * If we get here, we have a blank entry. Fill it. We grow our
Greg Kroah-Hartman
maintainerPATCH 7/151 tools: gpio: Correctly add make dependencies for gpio_utils
In reply to Greg Kroah-HartmanFrom: Laura Abbott <[email protected]>
commit 0161a94e2d1c713bd34d72bc0239d87c31747bf7 upstream.
gpio tools fail to build correctly with make parallelization:
$ make -s -j24 ld: gpio-utils.o: file not recognized: file truncated make[1]: *** [/home/labbott/linux_upstream/tools/build/Makefile.build:145: lsgpio-in.o] Error 1 make: *** [Makefile:43: lsgpio-in.o] Error 2 make: *** Waiting for unfinished jobs....
This is because gpio-utils.o is used across multiple targets. Fix this by making gpio-utios.o a proper dependency.
--- tools/gpio/Build | 1 + tools/gpio/Makefile | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-)
tools/gpio/Build +1 -0
@@ -1,3 +1,4 @@ +gpio-utils-y += gpio-utils.o lsgpio-y += lsgpio.o gpio-utils.o gpio-hammer-y += gpio-hammer.o gpio-utils.o gpio-event-mon-y += gpio-event-mon.o gpio-utils.o
tools/gpio/Makefile +7 -3
@@ -32,11 +32,15 @@ $(OUTPUT)include/linux/gpio.h: ../../inc prepare: $(OUTPUT)include/linux/gpio.h +GPIO_UTILS_IN := $(output)gpio-utils-in.o +$(GPIO_UTILS_IN): prepare FORCE + $(Q)$(MAKE) $(build)=gpio-utils + # # lsgpio # LSGPIO_IN := $(OUTPUT)lsgpio-in.o -$(LSGPIO_IN): prepare FORCE +$(LSGPIO_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o $(Q)$(MAKE) $(build)=lsgpio $(OUTPUT)lsgpio: $(LSGPIO_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
@@ -45,7 +49,7 @@ $(OUTPUT)lsgpio: $(LSGPIO_IN) # gpio-hammer # GPIO_HAMMER_IN := $(OUTPUT)gpio-hammer-in.o -$(GPIO_HAMMER_IN): prepare FORCE +$(GPIO_HAMMER_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o $(Q)$(MAKE) $(build)=gpio-hammer $(OUTPUT)gpio-hammer: $(GPIO_HAMMER_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
@@ -54,7 +58,7 @@ $(OUTPUT)gpio-hammer: $(GPIO_HAMMER_IN) # gpio-event-mon # GPIO_EVENT_MON_IN := $(OUTPUT)gpio-event-mon-in.o -$(GPIO_EVENT_MON_IN): prepare FORCE +$(GPIO_EVENT_MON_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o $(Q)$(MAKE) $(build)=gpio-event-mon $(OUTPUT)gpio-event-mon: $(GPIO_EVENT_MON_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
Greg Kroah-Hartman
maintainerPATCH 9/151 mm/ksm.c: dont WARN if page is still mapped in remove_stable_node()
In reply to Greg Kroah-HartmanFrom: Andrey Ryabinin <[email protected]>
commit 9a63236f1ad82d71a98aa80320b6cb618fb32f44 upstream.
It's possible to hit the WARN_ON_ONCE(page_mapped(page)) in remove_stable_node() when it races with __mmput() and squeezes in between ksm_exit() and exit_mmap().
WARNING: CPU: 0 PID: 3295 at mm/ksm.c:888 remove_stable_node+0x10c/0x150 Call Trace: remove_all_stable_nodes+0x12b/0x330 run_store+0x4ef/0x7b0 kernfs_fop_write+0x200/0x420 vfs_write+0x154/0x450 ksys_write+0xf9/0x1d0 do_syscall_64+0x99/0x510 entry_SYSCALL_64_after_hwframe+0x49/0xbe
Remove the warning as there is nothing scary going on.
--- mm/ksm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
mm/ksm.c +7 -7
@@ -710,13 +710,13 @@ static int remove_stable_node(struct stareturn 0 ; } -if (WARN_ON_ONCE (page_mapped (page))) { -/* -* This should not happen: but if it does, just refuse to let -* merge_across_nodes be switched - there is no need to panic. -*/ - err = -EBUSY ; - }else { +/* +* Page could be still mapped if this races with __mmput() running in +* between ksm_exit() and exit_mmap(). Just refuse to let +* merge_across_nodes/max_page_sharing be switched. +*/ + err = -EBUSY ; +if (!page_mapped (page)) {/* * The stable node did not yet appear stale to get_ksm_page(), * since that allows for an unmapped ksm page to be recognized
Greg Kroah-Hartman
maintainercover 4.9.204-stable review
This is the start of the stable review cycle for the 4.9.204 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 29 Nov 2019 20:18: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.204-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.204-rc1
Michael Ellerman <[email protected]>
KVM: PPC: Book3S HV: Flush link stack on guest exit to host kernel
Michael Ellerman <[email protected]>
powerpc/book3s64: Fix link stack flush on context switch
Christopher M. Riedl <[email protected]>
powerpc/64s: support nospectre_v2 cmdline option
Bernd Porr <[email protected]>
staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error
Aleksander Morgado <[email protected]>
USB: serial: option: add support for Foxconn T77W968 LTE modules
Aleksander Morgado <[email protected]>
USB: serial: option: add support for DW5821e with eSIM support
Johan Hovold <[email protected]>
USB: serial: mos7840: fix remote wakeup
Johan Hovold <[email protected]>
USB: serial: mos7720: fix remote wakeup
Pavel Löbl <[email protected]>
USB: serial: mos7840: add USB ID to support Moxa UPort 2210
Oliver Neukum <[email protected]>
appledisplay: fix error handling in the scheduled work
Oliver Neukum <[email protected]>
USB: chaoskey: fix error case of a timeout
Greg Kroah-Hartman <[email protected]>
usb-serial: cp201x: support Mark-10 digital force gauge
Hewenliang <[email protected]>
usbip: tools: fix fd leakage in the function of read_attr_usbip_status
Michael S. Tsirkin <[email protected]>
virtio_console: move removal code
Michael S. Tsirkin <[email protected]>
virtio_console: drop custom control queue cleanup
Michael S. Tsirkin <[email protected]>
virtio_console: fix uninitialized variable use
Halil Pasic <[email protected]>
virtio_ring: fix return code on DMA mapping fails
Laurent Vivier <[email protected]>
virtio_console: allocate inbufs in add_port() only if it is needed
Michael S. Tsirkin <[email protected]>
virtio_console: don't tie bufs to a vq
Michael S. Tsirkin <[email protected]>
virtio_console: reset on out of memory
Sean Young <[email protected]>
media: imon: invalid dereference in imon_touch_event
Vito Caputo <[email protected]>
media: cxusb: detect cxusb_ctrl_msg error in query
Oliver Neukum <[email protected]>
media: b2c2-flexcop-usb: add sanity checking
Laurent Pinchart <[email protected]>
media: uvcvideo: Fix error path in control parsing failure
Kai Shen <[email protected]>
cpufreq: Add NULL checks to show() and store() methods of cpufreq
Alan Stern <[email protected]>
media: usbvision: Fix races among open, close, and disconnect
Alexander Popov <[email protected]>
media: vivid: Fix wrong locking that causes race conditions on streaming stop
Vandana BN <[email protected]>
media: vivid: Set vid_cap_streaming and vid_out_streaming to true
Guillaume Nault <[email protected]>
l2tp: don't use l2tp_tunnel_find() in l2tp_ip and l2tp_ip6
Oliver Neukum <[email protected]>
nfc: port100: handle command failure cleanly
Waiman Long <[email protected]>
x86/speculation: Fix redundant MDS mitigation message
Waiman Long <[email protected]>
x86/speculation: Fix incorrect MDS/TAA mitigation status
Alexander Kapshuk <[email protected]>
x86/insn: Fix awk regexp warnings
Alexey Brodkin <[email protected]>
ARC: perf: Accommodate big-endian CPU
Chester Lin <[email protected]>
ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary
Gang He <[email protected]>
ocfs2: remove ocfs2_is_o2cb_active()
Bo Yan <[email protected]>
cpufreq: Skip cpufreq resume if it's not suspended
Hari Vyas <[email protected]>
arm64: fix for bad_mode() handler to always result in panic
Bart Van Assche <[email protected]>
dm: use blk_set_queue_dying() in __dm_destroy()
Denis Efremov <[email protected]>
ath9k_hw: fix uninitialized variable data
Sean Christopherson <[email protected]>
KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved
Tomas Bortoli <[email protected]>
Bluetooth: Fix invalid-free in bcsp_close()
zhong jiang <[email protected]>
mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock
Vignesh R <[email protected]>
spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch
Kishon Vijay Abraham I <[email protected]>
PCI: keystone: Use quirk to limit MRRS for K2G
Nathan Chancellor <[email protected]>
pinctrl: zynq: Use define directive for PIN_CONFIG_IO_STANDARD
Nathan Chancellor <[email protected]>
pinctrl: lpc18xx: Use define directive for PIN_CONFIG_GPIO_PIN_INT
Brian Masney <[email protected]>
pinctrl: qcom: spmi-gpio: fix gpio-hog related boot issues
David Barmann <[email protected]>
sock: Reset dst when changing sk_mark via setsockopt
YueHaibing <[email protected]>
net: bcmgenet: return correct value 'ret' from bcmgenet_power_down
Colin Ian King <[email protected]>
ACPICA: Use %d for signed int print formatting instead of %u
Tycho Andersen <[email protected]>
dlm: don't leak kernel pointer to userspace
Tycho Andersen <[email protected]>
dlm: fix invalid free
James Smart <[email protected]>
scsi: lpfc: fcoe: Fix link down issue after 1000+ link bounces
Shivasharan S <[email protected]>
scsi: megaraid_sas: Fix msleep granularity
Suganath Prabu <[email protected]>
scsi: mpt3sas: Fix driver modifying persistent data in Manufacturing page11
Suganath Prabu <[email protected]>
scsi: mpt3sas: Fix Sync cache command failure during driver unload
Shaokun Zhang <[email protected]>
rtlwifi: rtl8192de: Fix misleading REG_MCUFWDL information
Dan Carpenter <[email protected]>
wireless: airo: potential buffer overflow in sprintf()
Ali MJ Al-Nasrawy <[email protected]>
brcmsmac: never log "tid x is not agg'able" by default
Gustavo A. R. Silva <[email protected]>
rtl8xxxu: Fix missing break in switch
Christophe JAILLET <[email protected]>
wlcore: Fix the return value in case of error in 'wlcore_vendor_cmd_smart_config_start()'
Richard Guy Briggs <[email protected]>
audit: print empty EXECVE args
Valentin Schneider <[email protected]>
sched/fair: Don't increase sd->balance_interval on newidle balance
Eric Dumazet <[email protected]>
net: do not abort bulk send on BQL status
Larry Chen <[email protected]>
ocfs2: fix clusters leak in ocfs2_defrag_extent()
Changwei Ge <[email protected]>
ocfs2: don't put and assigning null to bh allocated outside
Victor Kamensky <[email protected]>
arm64: makefile fix build of .i file in external module case
Dave Jiang <[email protected]>
ntb: intel: fix return value for ndev_vec_mask()
Jon Mason <[email protected]>
ntb_netdev: fix sleep time mismatch
Miroslav Lichvar <[email protected]>
igb: shorten maximum PHC timecounter update interval
David Hildenbrand <[email protected]>
mm/memory_hotplug: make add_memory() take the device_hotplug_lock
Colin Ian King <[email protected]>
fs/hfs/extent.c: fix array out of bounds read of array extent
Ernesto A. Fernández <[email protected]>
hfs: update timestamp on truncate()
Ernesto A. Fernández <[email protected]>
hfsplus: update timestamps on truncate()
Ernesto A. Fernández <[email protected]>
hfs: fix return value of hfs_get_block()
Ernesto A. Fernández <[email protected]>
hfsplus: fix return value of hfsplus_get_block()
Ernesto A. Fernández <[email protected]>
hfs: prevent btree data loss on ENOSPC
Ernesto A. Fernández <[email protected]>
hfsplus: prevent btree data loss on ENOSPC
Ernesto A. Fernández <[email protected]>
hfs: fix BUG on bnode parent update
Ernesto A. Fernández <[email protected]>
hfsplus: fix BUG on bnode parent update
Rasmus Villemoes <[email protected]>
linux/bitmap.h: fix type of nbits in bitmap_shift_right()
Rasmus Villemoes <[email protected]>
linux/bitmap.h: handle constant zero-size bitmaps correctly
Anton Ivanov <[email protected]>
um: Make line/tty semantics use true write IRQ
Sabrina Dubroca <[email protected]>
macsec: let the administrator set UP state even if lowerdev is down
Sabrina Dubroca <[email protected]>
macsec: update operstate when lower device changes
Dave Chinner <[email protected]>
mm/page-writeback.c: fix range_cyclic writeback vs writepages deadlock
Jia-Ju Bai <[email protected]>
fs/ocfs2/dlm/dlmdebug.c: fix a sleep-in-atomic-context bug in dlm_print_one_mle()
David S. Miller <[email protected]>
sparc64: Rework xchg() definition to avoid warnings.
Felipe Rechia <[email protected]>
powerpc/process: Fix flush_all_to_thread for SPE
Geert Uytterhoeven <[email protected]>
thermal: rcar_thermal: Prevent hardware access during system suspend
Masami Hiramatsu <[email protected]>
selftests/ftrace: Fix to test kprobe $comm arg only if available
Marek Szyprowski <[email protected]>
mfd: max8997: Enale irq-wakeup unconditionally
Fabio Estevam <[email protected]>
mfd: mc13xxx-core: Fix PMIC shutdown when reading ADC values
Sapthagiri Baratam <[email protected]>
mfd: arizona: Correct calling of runtime_put_sync
Ivan Khoronzhuk <[email protected]>
net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode
Dan Carpenter <[email protected]>
qlcnic: fix a return in qlcnic_dcb_get_capability()
Nathan Chancellor <[email protected]>
mISDN: Fix type of switch control variable in ctrl_teimanager
Chao Yu <[email protected]>
f2fs: fix to spread clear_cold_data()
Nathan Chancellor <[email protected]>
rtc: s35390a: Change buf's type to u8 in s35390a_init
Yan, Zheng <[email protected]>
ceph: fix dentry leak in ceph_readdir_prepopulate
David S. Miller <[email protected]>
sparc: Fix parport build warnings.
Vignesh R <[email protected]>
spi: omap2-mcspi: Set FIFO DMA trigger level to word length
Thomas Richter <[email protected]>
s390/perf: Return error when debug_register fails
Nathan Chancellor <[email protected]>
atm: zatm: Fix empty body Clang warnings
J. Bruce Fields <[email protected]>
sunrpc: safely reallow resvport min/max inversion
Trond Myklebust <[email protected]>
SUNRPC: Fix a compile warning for cmpxchg64()
Colin Ian King <[email protected]>
usbip: tools: fix atoi() on non-null terminated string
Mattias Jacobsson <[email protected]>
USB: misc: appledisplay: fix backlight update_status return code
Benjamin Herrenschmidt <[email protected]>
macintosh/windfarm_smu_sat: Fix debug output
Philipp Klocke <[email protected]>
ALSA: i2c/cs8427: Fix int to char conversion
Steven Rostedt (VMware) <[email protected]>
kprobes, x86/ptrace.h: Make regs_get_kernel_stack_nth() not fault on bad stack
Dave Chinner <[email protected]>
xfs: fix use-after-free race in xfs_buf_rele
Netanel Belgazal <[email protected]>
net: ena: Fix Kconfig dependency on X86
Kyeongdon Kim <[email protected]>
net: fix warning in af_unix
Christoph Hellwig <[email protected]>
scsi: dc395x: fix DMA API usage in sg_update_list
Christoph Hellwig <[email protected]>
scsi: dc395x: fix dma API usage in srb_done
Marcel Ziswiler <[email protected]>
ASoC: tegra_sgtl5000: fix device_node refcounting
Lubomir Rintel <[email protected]>
clk: mmp2: fix the clock id for sdh2_clk and sdh3_clk
Nathan Chancellor <[email protected]>
scsi: iscsi_tcp: Explicitly cast param in iscsi_sw_tcp_host_get_param
Nathan Chancellor <[email protected]>
scsi: isci: Change sci_controller_start_task's return type to sci_status
Nathan Chancellor <[email protected]>
scsi: isci: Use proper enumerated type in atapi_d2h_reg_frame_handler
Uros Bizjak <[email protected]>
KVM/x86: Fix invvpid and invept register operand size in 64-bit mode
Gustavo A. R. Silva <[email protected]>
scsi: ips: fix missing break in switch
Omar Sandoval <[email protected]>
amiflop: clean up on errors during setup
Angelo Dureghello <[email protected]>
m68k: fix command-line parsing when passed from u-boot
Wenwen Wang <[email protected]>
misc: mic: fix a DMA pool free failure
Duncan Laurie <[email protected]>
gsmi: Fix bug in append_to_eventlog sysfs handler
Nikolay Borisov <[email protected]>
btrfs: handle error of get_old_root
Chaotian Jing <[email protected]>
mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail
Sergei Shtylyov <[email protected]>
spi: sh-msiof: fix deferred probing
Carl Huang <[email protected]>
ath10k: allocate small size dma memory in ath10k_pci_diag_write_mem
Ali MJ Al-Nasrawy <[email protected]>
brcmsmac: AP mode: update beacon when TIM changes
Sam Bobroff <[email protected]>
powerpc/eeh: Fix use of EEH_PE_KEEP on wrong field
Dan Carpenter <[email protected]>
powerpc: Fix signedness bug in update_flash_db()
Al Viro <[email protected]>
synclink_gt(): fix compat_ioctl()
Andreas Gruenbacher <[email protected]>
gfs2: Fix marking bitmaps non-full
Sergey Senozhatsky <[email protected]>
printk: fix integer overflow in setup_log_buf()
Takashi Sakamoto <[email protected]>
ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback
Adrian Bunk <[email protected]>
mwifiex: Fix NL80211_TX_POWER_LIMITED
Hans de Goede <[email protected]>
platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi
Kiernan Hager <[email protected]>
platform/x86: asus-nb-wmi: Support ALS on the Zenbook UX430UQ
Andrey Ryabinin <[email protected]>
mm/ksm.c: don't WARN if page is still mapped in remove_stable_node()
Joseph Qi <[email protected]>
Revert "fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()"
Laura Abbott <[email protected]>
tools: gpio: Correctly add make dependencies for gpio_utils
Thierry Reding <[email protected]>
gpio: max77620: Fixup debounce delays
Davide Caratti <[email protected]>
net/sched: act_pedit: fix WARN() in the traffic path
Roi Dayan <[email protected]>
net/mlx5e: Fix set vf link state error flow
Martin Habets <[email protected]>
sfc: Only cancel the PPS workqueue if it exists
Dan Carpenter <[email protected]>
net: rtnetlink: prevent underflows in do_setvfinfo()
Luigi Rizzo <[email protected]>
net/mlx4_en: fix mlx4 ethtool -N insertion
-------------
Diffstat:
Documentation/hw-vuln/mds.rst | 7 +- Documentation/hw-vuln/tsx_async_abort.rst | 5 +- Documentation/kernel-parameters.txt | 11 ++ Makefile | 4 +- arch/arc/kernel/perf_event.c | 4 +- arch/arm/mm/mmu.c | 3 + arch/arm64/Makefile | 2 + arch/arm64/kernel/traps.c | 1 - arch/m68k/kernel/uboot.c | 2 +- arch/powerpc/include/asm/asm-prototypes.h | 3 + arch/powerpc/include/asm/security_features.h | 3 + arch/powerpc/kernel/eeh_pe.c | 2 +- arch/powerpc/kernel/entry_64.S | 6 + arch/powerpc/kernel/process.c | 3 +- arch/powerpc/kernel/security.c | 74 ++++++++++- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 27 ++++ arch/powerpc/platforms/ps3/os-area.c | 2 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- arch/s390/kernel/perf_cpum_sf.c | 6 +- arch/sparc/include/asm/cmpxchg_64.h | 7 +- arch/sparc/include/asm/parport.h | 2 + arch/um/drivers/line.c | 2 +- arch/x86/include/asm/ptrace.h | 42 +++++-- arch/x86/kernel/cpu/bugs.c | 30 ++++- arch/x86/kvm/mmu.c | 8 +- arch/x86/kvm/vmx.c | 4 +- arch/x86/tools/gen-insn-attr-x86.awk | 4 +- drivers/acpi/acpi_memhotplug.c | 2 +- drivers/atm/zatm.c | 42 +++---- drivers/base/memory.c | 9 +- drivers/block/amiflop.c | 84 ++++++------- drivers/bluetooth/hci_bcsp.c | 3 + drivers/char/virtio_console.c | 140 ++++++++++----------- drivers/clk/mmp/clk-of-mmp2.c | 4 +- drivers/cpufreq/cpufreq.c | 9 ++ drivers/firmware/google/gsmi.c | 5 +- drivers/gpio/gpio-max77620.c | 6 +- drivers/isdn/mISDN/tei.c | 7 +- drivers/macintosh/windfarm_smu_sat.c | 25 ++-- drivers/md/dm.c | 4 +- drivers/media/platform/vivid/vivid-kthread-cap.c | 8 +- drivers/media/platform/vivid/vivid-kthread-out.c | 8 +- drivers/media/platform/vivid/vivid-sdr-cap.c | 8 +- drivers/media/platform/vivid/vivid-vid-cap.c | 3 - drivers/media/platform/vivid/vivid-vid-out.c | 3 - drivers/media/rc/imon.c | 3 +- drivers/media/usb/b2c2/flexcop-usb.c | 3 + drivers/media/usb/dvb-usb/cxusb.c | 3 +- drivers/media/usb/usbvision/usbvision-video.c | 21 +++- drivers/media/usb/uvc/uvc_driver.c | 30 ++--- drivers/mfd/arizona-core.c | 8 +- drivers/mfd/max8997.c | 8 +- drivers/mfd/mc13xxx-core.c | 3 +- drivers/misc/mic/scif/scif_fence.c | 2 +- drivers/mmc/host/mtk-sd.c | 2 +- drivers/net/ethernet/amazon/Kconfig | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- drivers/net/ethernet/intel/igb/igb_ptp.c | 8 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 2 +- drivers/net/ethernet/sfc/ptp.c | 3 +- drivers/net/ethernet/ti/cpsw.c | 1 + drivers/net/macsec.c | 20 ++- drivers/net/ntb_netdev.c | 2 +- drivers/net/wireless/ath/ath10k/pci.c | 23 ++-- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 30 ++++- .../wireless/broadcom/brcm80211/brcmsmac/main.h | 1 + drivers/net/wireless/cisco/airo.c | 2 +- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 13 +- drivers/net/wireless/marvell/mwifiex/ioctl.h | 1 + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 11 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 2 +- drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +- drivers/nfc/port100.c | 2 +- drivers/ntb/hw/intel/ntb_hw_intel.c | 2 +- drivers/pci/host/pci-keystone.c | 3 + drivers/pinctrl/pinctrl-lpc18xx.c | 10 +- drivers/pinctrl/pinctrl-zynq.c | 9 +- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 21 +++- drivers/platform/x86/asus-nb-wmi.c | 21 +++- drivers/platform/x86/asus-wmi.c | 2 +- drivers/platform/x86/asus-wmi.h | 1 + drivers/rtc/rtc-s35390a.c | 2 +- drivers/scsi/dc395x.c | 12 +- drivers/scsi/ips.c | 1 + drivers/scsi/isci/host.c | 8 +- drivers/scsi/isci/host.h | 2 +- drivers/scsi/isci/request.c | 4 +- drivers/scsi/isci/task.c | 4 +- drivers/scsi/iscsi_tcp.c | 3 +- drivers/scsi/lpfc/lpfc_els.c | 2 + drivers/scsi/lpfc/lpfc_hbadisc.c | 20 +++ drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 11 +- drivers/scsi/lpfc/lpfc_sli4.h | 1 + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- drivers/scsi/mpt3sas/mpt3sas_config.c | 4 - drivers/scsi/mpt3sas/mpt3sas_scsih.c | 36 +++++- drivers/spi/spi-omap2-mcspi.c | 26 ++-- drivers/spi/spi-sh-msiof.c | 4 +- drivers/staging/comedi/drivers/usbduxfast.c | 21 ++-- drivers/thermal/rcar_thermal.c | 4 +- drivers/tty/synclink_gt.c | 16 +-- drivers/usb/misc/appledisplay.c | 15 ++- drivers/usb/misc/chaoskey.c | 24 +++- drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/mos7720.c | 4 - drivers/usb/serial/mos7840.c | 16 ++- drivers/usb/serial/option.c | 7 ++ drivers/virtio/virtio_ring.c | 2 +- drivers/xen/balloon.c | 3 + fs/btrfs/ctree.c | 4 + fs/ceph/inode.c | 1 - fs/dlm/member.c | 5 +- fs/dlm/user.c | 2 +- fs/f2fs/data.c | 8 +- fs/f2fs/dir.c | 1 + fs/f2fs/segment.c | 4 +- fs/gfs2/rgrp.c | 13 +- fs/hfs/brec.c | 1 + fs/hfs/btree.c | 41 +++--- fs/hfs/btree.h | 1 + fs/hfs/catalog.c | 16 +++ fs/hfs/extent.c | 10 +- fs/hfs/inode.c | 2 + fs/hfsplus/attributes.c | 10 ++ fs/hfsplus/brec.c | 1 + fs/hfsplus/btree.c | 44 ++++--- fs/hfsplus/catalog.c | 24 ++++ fs/hfsplus/extents.c | 8 +- fs/hfsplus/hfsplus_fs.h | 2 + fs/hfsplus/inode.c | 1 + fs/ocfs2/buffer_head_io.c | 77 +++++++++--- fs/ocfs2/dlm/dlmdebug.c | 2 +- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/move_extents.c | 17 +++ fs/ocfs2/stackglue.c | 6 - fs/ocfs2/stackglue.h | 3 - fs/ocfs2/xattr.c | 56 +++++---- fs/xfs/xfs_buf.c | 38 +++++- include/linux/bitmap.h | 9 +- include/linux/kvm_host.h | 1 + include/linux/memory_hotplug.h | 1 + include/linux/mfd/max8997.h | 1 - include/linux/mfd/mc13xxx.h | 1 + kernel/auditsc.c | 2 +- kernel/printk/printk.c | 2 +- kernel/sched/fair.c | 13 +- mm/ksm.c | 14 +-- mm/memory_hotplug.c | 22 +++- mm/page-writeback.c | 33 +++-- net/core/dev.c | 2 +- net/core/rtnetlink.c | 23 +++- net/core/sock.c | 6 +- net/l2tp/l2tp_ip.c | 24 ++-- net/l2tp/l2tp_ip6.c | 24 ++-- net/sched/act_pedit.c | 5 +- net/sunrpc/auth_gss/gss_krb5_seal.c | 1 + net/sunrpc/xprtsock.c | 34 ++--- net/unix/af_unix.c | 2 + sound/firewire/isight.c | 10 +- sound/i2c/cs8427.c | 2 +- sound/soc/tegra/tegra_sgtl5000.c | 17 ++- tools/gpio/Build | 1 + tools/gpio/Makefile | 10 +- tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk | 4 +- tools/power/acpi/tools/acpidump/apmain.c | 2 +- .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 3 + tools/usb/usbip/libsrc/usbip_host_common.c | 8 +- virt/kvm/kvm_main.c | 26 +++- 173 files changed, 1264 insertions(+), 619 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 29/151 KVM/x86: Fix invvpid and invept register operand size in 64-bit mode
From: Uros Bizjak <[email protected]>
[ Upstream commit 5ebb272b2ea7e02911a03a893f8d922d49f9bb4a ]
Register operand size of invvpid and invept instruction in 64-bit mode has always 64 bits. Adjust inline function argument type to reflect correct size.
--- arch/x86/kvm/vmx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx.c +2 -2
@@ -1547,7 +1547,7 @@ static int __find_msr_index(struct vcpu_vmx *vmx, u32 msr)return -1 ; } -static inline void __invvpid (int ext,u16 vpid,gva_t gva) +static inline void __invvpid (unsigned long ext,u16 vpid,gva_t gva) {struct {u64 vpid :16 ;
@@ -1561,7 +1561,7 @@ static inline void __invvpid(int ext, u16 vpid, gva_t gva) : : "a"(&operand), "c"(ext) : "cc", "memory"); } -static inline void __invept (int ext,u64 eptp,gpa_t gpa) +static inline void __invept (unsigned long ext,u64 eptp,gpa_t gpa) {struct {u64 eptp, gpa;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/151 scsi: isci: Change sci_controller_start_tasks return type to sci_status
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 362b5da3dfceada6e74ecdd7af3991bbe42c0c0f ]
Clang warns when an enumerated type is implicitly converted to another.
drivers/scsi/isci/request.c:3476:13: warning: implicit conversion from enumeration type 'enum sci_task_status' to different enumeration type 'enum sci_status' [-Wenum-conversion]
status = sci_controller_start_task(ihost,
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/scsi/isci/host.c:2744:10: warning: implicit conversion from enumeration type 'enum sci_status' to different enumeration type 'enum sci_task_status' [-Wenum-conversion]
return SCI_SUCCESS;
~~~~~~ ^~~~~~~~~~~
drivers/scsi/isci/host.c:2753:9: warning: implicit conversion from
enumeration type 'enum sci_status' to different enumeration type 'enum
sci_task_status' [-Wenum-conversion]
return status;
~~~~~~ ^~~~~~Avoid all of these implicit conversion by just making sci_controller_start_task use sci_status. This silences Clang and has no functional change since sci_task_status has all of its values mapped to something in sci_status.
--- drivers/scsi/isci/host.c | 8 ++++---- drivers/scsi/isci/host.h | 2 +- drivers/scsi/isci/task.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/isci/host.c +4 -4
@@ -2717,9 +2717,9 @@ enum sci_status sci_controller_continue_io(struct isci_request *ireq)* the task management request. * @task_request: the handle to the task request object to start. */ -enum sci_task_status sci_controller_start_task (struct isci_host *ihost, -struct isci_remote_device *idev, -struct isci_request *ireq) +enum sci_status sci_controller_start_task (struct isci_host *ihost, +struct isci_remote_device *idev, +struct isci_request *ireq) {enum sci_status status;
@@ -2728,7 +2728,7 @@ enum sci_task_status sci_controller_start_task(struct isci_host *ihost,"%s: SCIC Controller starting task from invalid " "state\n" , __func__); -return SCI_TASK_FAILURE_INVALID_STATE ; +return SCI_FAILURE_INVALID_STATE ; } status =sci_remote_device_start_task (ihost, idev, ireq);
drivers/scsi/isci/host.h +1 -1
@@ -490,7 +490,7 @@ enum sci_status sci_controller_start_io(struct isci_remote_device *idev, struct isci_request *ireq); -enum sci_task_status sci_controller_start_task ( +enum sci_status sci_controller_start_task (struct isci_host *ihost,struct isci_remote_device *idev,struct isci_request *ireq);
drivers/scsi/isci/task.c +2 -2
@@ -258,7 +258,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost, struct isci_tmf *tmf, unsigned long timeout_ms) {DECLARE_COMPLETION_ONSTACK (completion ); -enum sci_task_status status =SCI_TASK_FAILURE ; +enum sci_status status =SCI_FAILURE ;struct isci_request *ireq;int ret =TMF_RESP_FUNC_FAILED ;unsigned long flags;
@@ -301,7 +301,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost,/* start the TMF io. */ status =sci_controller_start_task (ihost, idev, ireq); -if (status !=SCI_TASK_SUCCESS ) { +if (status !=SCI_SUCCESS ) { dev_dbg(&ihost->pdev->dev, "%s: start_io failed - status = 0x%x, request = %p\n", __func__,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/151 scsi: iscsi_tcp: Explicitly cast param in iscsi_sw_tcp_host_get_param
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 20054597f169090109fc3f0dfa1a48583f4178a4 ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/scsi/iscsi_tcp.c:803:15: warning: implicit conversion from enumeration type 'enum iscsi_host_param' to different enumeration type 'enum iscsi_param' [-Wenum-conversion]
&addr, param, buf);
^~~~~1 warning generated.
iscsi_conn_get_addr_param handles ISCSI_HOST_PARAM_IPADDRESS just fine so add an explicit cast to iscsi_param to make it clear to Clang that this is expected behavior.
--- drivers/scsi/iscsi_tcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/iscsi_tcp.c +2 -1
@@ -798,7 +798,8 @@ static int iscsi_sw_tcp_host_get_param(struct Scsi_Host *shost,return rc;return iscsi_conn_get_addr_param ((struct sockaddr_storage *) - &addr, param, buf); + &addr, + (enum iscsi_param )param, buf);default :return iscsi_host_get_param (shost, param, buf); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/151 clk: mmp2: fix the clock id for sdh2_clk and sdh3_clk
In reply to Greg Kroah-HartmanFrom: Lubomir Rintel <[email protected]>
[ Upstream commit 4917fb90eec7c26dac1497ada3bd4a325f670fcc ]
A typo that makes it impossible to get the correct clocks for MMP2_CLK_SDH2 and MMP2_CLK_SDH3.
--- drivers/clk/mmp/clk-of-mmp2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/mmp/clk-of-mmp2.c +2 -2
@@ -227,8 +227,8 @@ static struct mmp_param_gate_clk apmu_gate_clks[] = {/* The gate clocks has mux parent. */ {MMP2_CLK_SDH0, "sdh0_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH0, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, {MMP2_CLK_SDH1, "sdh1_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH1, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, - {MMP2_CLK_SDH1, "sdh2_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH2, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, - {MMP2_CLK_SDH1, "sdh3_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH3, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, + {MMP2_CLK_SDH2, "sdh2_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH2, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, + {MMP2_CLK_SDH3, "sdh3_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH3, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, {MMP2_CLK_DISP0, "disp0_clk", "disp0_div", CLK_SET_RATE_PARENT, APMU_DISP0, 0x1b, 0x1b, 0x0, 0, &disp0_lock}, {MMP2_CLK_DISP0_SPHY, "disp0_sphy_clk", "disp0_sphy_div", CLK_SET_RATE_PARENT, APMU_DISP0, 0x1024, 0x1024, 0x0, 0, &disp0_lock}, {MMP2_CLK_DISP1, "disp1_clk", "disp1_div", CLK_SET_RATE_PARENT, APMU_DISP1, 0x1b, 0x1b, 0x0, 0, &disp1_lock},
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/151 ASoC: tegra_sgtl5000: fix device_node refcounting
In reply to Greg Kroah-HartmanFrom: Marcel Ziswiler <[email protected]>
[ Upstream commit a85227da2dcc291b762c8482a505bc7d0d2d4b07 ]
Similar to the following:
commit 4321723648b0 ("ASoC: tegra_alc5632: fix device_node refcounting")
commit 7c5dfd549617 ("ASoC: tegra: fix device_node refcounting")
--- sound/soc/tegra/tegra_sgtl5000.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
sound/soc/tegra/tegra_sgtl5000.c +15 -2
@@ -152,14 +152,14 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing/invalid\n" ); ret = -EINVAL ; - goto err; + goto err_put_codec_of_node; } tegra_sgtl5000_dai.platform_of_node = tegra_sgtl5000_dai.cpu_of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; + goto err_put_cpu_of_node; ret =snd_soc_register_card (card);if (ret) {
@@ -172,6 +172,13 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev) err_fini_utils:tegra_asoc_utils_fini (&machine->util_data); +err_put_cpu_of_node: +of_node_put (tegra_sgtl5000_dai.cpu_of_node); + tegra_sgtl5000_dai.cpu_of_node =NULL ; + tegra_sgtl5000_dai.platform_of_node =NULL ; +err_put_codec_of_node: +of_node_put (tegra_sgtl5000_dai.codec_of_node); + tegra_sgtl5000_dai.codec_of_node =NULL ; err:return ret; }
@@ -186,6 +193,12 @@ static int tegra_sgtl5000_driver_remove(struct platform_device *pdev)tegra_asoc_utils_fini (&machine->util_data); +of_node_put (tegra_sgtl5000_dai.cpu_of_node); + tegra_sgtl5000_dai.cpu_of_node =NULL ; + tegra_sgtl5000_dai.platform_of_node =NULL ; +of_node_put (tegra_sgtl5000_dai.codec_of_node); + tegra_sgtl5000_dai.codec_of_node =NULL ; +return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/151 scsi: dc395x: fix dma API usage in srb_done
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 3a5bd7021184dec2946f2a4d7a8943f8a5713e52 ]
We can't just transfer ownership to the CPU and then unmap, as this will break with swiotlb.
Instead unmap the command and sense buffer a little earlier in the I/O completion handler and get rid of the pci_dma_sync_sg_for_cpu call entirely.
--- drivers/scsi/dc395x.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/scsi/dc395x.c +2 -5
@@ -3450,14 +3450,12 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb, } } -if (dir !=PCI_DMA_NONE &&scsi_sg_count (cmd)) -pci_dma_sync_sg_for_cpu (acb->dev,scsi_sglist (cmd), -scsi_sg_count (cmd), dir); - ckc_only =0 ;/* Check Error Conditions */ ckc_e: +pci_unmap_srb (acb, srb); +if (cmd->cmnd[0 ] ==INQUIRY ) {unsigned char *base =NULL ;struct ScsiInqData *ptr;
@@ -3511,7 +3509,6 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb, cmd, cmd->result);srb_free_insert (acb, srb); } -pci_unmap_srb (acb, srb); cmd->scsi_done (cmd);waiting_process_next (acb);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/151 scsi: dc395x: fix DMA API usage in sg_update_list
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 6c404a68bf83b4135a8a9aa1c388ebdf98e8ba7f ]
We need to transfer device ownership to the CPU before we can manipulate the mapped data.
--- drivers/scsi/dc395x.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/dc395x.c +5 -0
@@ -1972,6 +1972,11 @@ static void sg_update_list(struct ScsiReqBlk *srb, u32 left) xferred -= psge->length; }else {/* Partial SG entry done */ +pci_dma_sync_single_for_cpu (srb->dcb-> + acb->dev, + srb->sg_bus_addr, +SEGMENTX_LEN , +PCI_DMA_TODEVICE ); psge->length -= xferred; psge->address += xferred; srb->sg_index = idx;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/151 ath10k: allocate small size dma memory in ath10k_pci_diag_write_mem
In reply to Greg Kroah-HartmanFrom: Carl Huang <[email protected]>
[ Upstream commit 0738b4998c6d1caf9ca2447b946709a7278c70f1 ]
ath10k_pci_diag_write_mem may allocate big size of the dma memory based on the parameter nbytes. Take firmware diag download as example, the biggest size is about 500K. In some systems, the allocation is likely to fail because it can't acquire such a large contiguous dma memory.
The fix is to allocate a small size dma memory. In the loop, driver copies the data to the allocated dma memory and writes to the destination until all the data is written.
Tested with QCA6174 PCI with firmware-6.bin_WLAN.RM.4.4.1-00119-QCARMSWP-1, this also affects QCA9377 PCI.
--- drivers/net/wireless/ath/ath10k/pci.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath10k/pci.c +11 -12
@@ -1039,10 +1039,9 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,struct ath10k_pci *ar_pci =ath10k_pci_priv (ar);int ret =0 ;u32 *buf; -unsigned int completed_nbytes, orig_nbytes, remaining_bytes; +unsigned int completed_nbytes, alloc_nbytes, remaining_bytes;struct ath10k_ce_pipe *ce_diag;void *data_buf =NULL ; -u32 ce_data;/* Host buffer address in CE space */ dma_addr_t ce_data_base =0 ;int i;
@@ -1056,9 +1055,10 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,* 1) 4-byte alignment * 2) Buffer in DMA-able space */ - orig_nbytes = nbytes; + alloc_nbytes = min_t(unsigned int, nbytes, DIAG_TRANSFER_LIMIT); + data_buf = (unsigned char *)dma_alloc_coherent (ar->dev, - orig_nbytes, + alloc_nbytes, &ce_data_base,GFP_ATOMIC );if (!data_buf) {
@@ -1066,9 +1066,6 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address, goto done; } -/* Copy caller's data to allocated DMA buf */ -memcpy (data_buf, data, orig_nbytes); -/* * The address supplied by the caller is in the * Target CPU virtual address space.
@@ -1081,12 +1078,14 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,*/ address =ath10k_pci_targ_cpu_to_ce_addr (ar, address); - remaining_bytes = orig_nbytes; - ce_data = ce_data_base; + remaining_bytes = nbytes;while (remaining_bytes) {/* FIXME: check cast */ nbytes =min_t (int, remaining_bytes,DIAG_TRANSFER_LIMIT ); +/* Copy caller's data to allocated DMA buf */ +memcpy (data_buf, data, nbytes); +/* Set up to receive directly into Target(!) address */ ret =__ath10k_ce_rx_post_buf (ce_diag, &address, address);if (ret !=0 )
@@ -1096,7 +1095,7 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,* Request CE to send caller-supplied data that * was copied to bounce buffer to Target(!) address. */ - ret =ath10k_ce_send_nolock (ce_diag,NULL , (u32 )ce_data, + ret =ath10k_ce_send_nolock (ce_diag,NULL , ce_data_base, nbytes,0 ,0 );if (ret !=0 ) goto done;
@@ -1137,12 +1136,12 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address, remaining_bytes -= nbytes; address += nbytes; - ce_data += nbytes; + data += nbytes; } done:if (data_buf) { -dma_free_coherent (ar->dev, orig_nbytes, data_buf, +dma_free_coherent (ar->dev, alloc_nbytes, data_buf, ce_data_base); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/151 net: ena: Fix Kconfig dependency on X86
In reply to Greg Kroah-HartmanFrom: Netanel Belgazal <[email protected]>
[ Upstream commit 8c590f9776386b8f697fd0b7ed6142ae6e3de79e ]
The Kconfig limitation of X86 is to too wide. The ENA driver only requires a little endian dependency.
Change the dependency to be on little endian CPU.
--- drivers/net/ethernet/amazon/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amazon/Kconfig +1 -1
@@ -17,7 +17,7 @@ if NET_VENDOR_AMAZON config ENA_ETHERNET tristate "Elastic Network Adapter (ENA) support" - depends on (PCI_MSI && X86) + depends on PCI_MSI && !CPU_BIG_ENDIAN ---help--- This driver supports Elastic Network Adapter (ENA)"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/151 xfs: fix use-after-free race in xfs_buf_rele
In reply to Greg Kroah-HartmanFrom: Dave Chinner <[email protected]>
[ Upstream commit 37fd1678245f7a5898c1b05128bc481fb403c290 ]
When looking at a 4.18 based KASAN use after free report, I noticed that racing xfs_buf_rele() may race on dropping the last reference to the buffer and taking the buffer lock. This was the symptom displayed by the KASAN report, but the actual issue that was reported had already been fixed in 4.19-rc1 by commit e339dd8d8b04 ("xfs: use sync buffer I/O for sync delwri queue submission").
Despite this, I think there is still an issue with xfs_buf_rele() in this code:
release = atomic_dec_and_lock(&bp->b_hold, &pag->pag_buf_lock);
spin_lock(&bp->b_lock);
if (!release) {.....
If two threads race on the b_lock after both dropping a reference and one getting dropping the last reference so release = true, we end up with:
CPU 0 CPU 1atomic_dec_and_lock()
atomic_dec_and_lock() spin_lock(&bp->b_lock) spin_lock(&bp->b_lock) <spins> <release = true bp->b_lru_ref = 0> <remove from lists> freebuf = true spin_unlock(&bp->b_lock) xfs_buf_free(bp)
<gets lock, reading and writing freed memory> <accesses freed memory> spin_unlock(&bp->b_lock) <reads/writes freed memory>
IOWs, we can't safely take bp->b_lock after dropping the hold reference because the buffer may go away at any time after we drop that reference. However, this can be fixed simply by taking the bp->b_lock before we drop the reference.
It is safe to nest the pag_buf_lock inside bp->b_lock as the pag_buf_lock is only used to serialise against lookup in xfs_buf_find() and no other locks are held over or under the pag_buf_lock there. Make this clear by documenting the buffer lock orders at the top of the file.
--- fs/xfs/xfs_buf.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)
fs/xfs/xfs_buf.c +37 -1
@@ -57,6 +57,32 @@ static kmem_zone_t *xfs_buf_zone;#define xb_to_gfp (flags) \ ((((flags) & XBF_READ_AHEAD) ? __GFP_NORETRY : GFP_NOFS) | __GFP_NOWARN) +/* +* Locking orders +* +* xfs_buf_ioacct_inc: +* xfs_buf_ioacct_dec: +* b_sema (caller holds) +* b_lock +* +* xfs_buf_stale: +* b_sema (caller holds) +* b_lock +* lru_lock +* +* xfs_buf_rele: +* b_lock +* pag_buf_lock +* lru_lock +* +* xfs_buftarg_wait_rele +* lru_lock +* b_lock (trylock due to inversion) +* +* xfs_buftarg_isolate +* lru_lock +* b_lock (trylock due to inversion) +*/ static inline int xfs_buf_is_vmapped(
@@ -957,8 +983,18 @@ xfs_buf_rele(ASSERT (atomic_read (&bp->b_hold) >0 ); - release =atomic_dec_and_lock (&bp->b_hold, &pag->pag_buf_lock); +/* +* We grab the b_lock here first to serialise racing xfs_buf_rele() +* calls. The pag_buf_lock being taken on the last reference only +* serialises against racing lookups in xfs_buf_find(). IOWs, the second +* to last reference we drop here is not serialised against the last +* reference until we take bp->b_lock. Hence if we don't grab b_lock +* first, the last "release" reference can win the race to the lock and +* free the buffer before the second-to-last reference is processed, +* leading to a use-after-free scenario. +*/ spin_lock (&bp->b_lock); + release =atomic_dec_and_lock (&bp->b_hold, &pag->pag_buf_lock);if (!release) {/* * Drop the in-flight state if the buffer is already on the LRU
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/151 kprobes, x86/ptrace.h: Make regs_get_kernel_stack_nth() not fault on bad stack
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
[ Upstream commit c2712b858187f5bcd7b042fe4daa3ba3a12635c0 ]
Andy had some concerns about using regs_get_kernel_stack_nth() in a new function regs_get_kernel_argument() as if there's any error in the stack code, it could cause a bad memory access. To be on the safe side, call probe_kernel_read() on the stack address to be extra careful in accessing the memory. A helper function, regs_get_kernel_stack_nth_addr(), was added to just return the stack address (or NULL if not on the stack), that will be used to find the address (and could be used by other functions) and read the address with kernel_probe_read().
--- arch/x86/include/asm/ptrace.h | 42 +++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-)
arch/x86/include/asm/ptrace.h +35 -7
@@ -199,24 +199,52 @@ static inline int regs_within_kernel_stack(struct pt_regs *regs, (kernel_stack_pointer(regs) & ~(THREAD_SIZE - 1))); } +/** +* regs_get_kernel_stack_nth_addr() - get the address of the Nth entry on stack +* @regs: pt_regs which contains kernel stack pointer. +* @n: stack entry number. +* +* regs_get_kernel_stack_nth() returns the address of the @n th entry of the +* kernel stack which is specified by @regs. If the @n th entry is NOT in +* the kernel stack, this returns NULL. +*/ +static inline unsigned long *regs_get_kernel_stack_nth_addr (struct pt_regs *regs,unsigned int n) +{ +unsigned long *addr = (unsigned long *)kernel_stack_pointer (regs); + + addr += n; +if (regs_within_kernel_stack (regs, (unsigned long )addr)) +return addr; +else +return NULL ; +} + +/* To avoid include hell, we can't include uaccess.h */ +extern long probe_kernel_read (void *dst,const void *src,size_t size); +/** * regs_get_kernel_stack_nth() - get Nth entry of the stack * @regs: pt_regs which contains kernel stack pointer. * @n: stack entry number. * * regs_get_kernel_stack_nth() returns @n th entry of the kernel stack which -* is specified by @regs. If the @n th entry is NOT in the kernel stack, +* is specified by @regs. If the @n th entry is NOT in the kernel stack * this returns 0. */ static inline unsigned long regs_get_kernel_stack_nth (struct pt_regs *regs,unsigned int n) { -unsigned long *addr = (unsigned long *)kernel_stack_pointer (regs); - addr += n; -if (regs_within_kernel_stack (regs, (unsigned long )addr)) -return *addr; -else -return 0 ; +unsigned long *addr; +unsigned long val; +long ret; + + addr =regs_get_kernel_stack_nth_addr (regs, n); +if (addr) { + ret =probe_kernel_read (&val, addr,sizeof (val)); +if (!ret) +return val; + } +return 0 ; }#define arch_has_single_step () (1)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/151 ALSA: i2c/cs8427: Fix int to char conversion
In reply to Greg Kroah-HartmanFrom: Philipp Klocke <[email protected]>
[ Upstream commit eb7ebfa3c1989aa8e59d5e68ab3cddd7df1bfb27 ]
Compiling with clang yields the following warning:
sound/i2c/cs8427.c:140:31: warning: implicit conversion from 'int' to 'char' changes value from 160 to -96 [-Wconstant-conversion]
data[0] = CS8427_REG_AUTOINC | CS8427_REG_CORU_DATABUF;
~ ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~Because CS8427_REG_AUTOINC is defined as 128, it is too big for a char field.
So change data from char to unsigned char, that it can hold the value.
This patch does not change the generated code.
--- sound/i2c/cs8427.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/i2c/cs8427.c +1 -1
@@ -118,7 +118,7 @@ static int snd_cs8427_send_corudata(struct snd_i2c_device *device,struct cs8427 *chip = device->private_data;char *hw_data = udata ? chip->playback.hw_udata : chip->playback.hw_status; -char data[32 ]; +unsigned char data[32 ];int err, idx;if (!memcmp (hw_data, ndata, count))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/151 USB: misc: appledisplay: fix backlight update_status return code
In reply to Greg Kroah-HartmanFrom: Mattias Jacobsson <[email protected]>
[ Upstream commit 090158555ff8d194a98616034100b16697dd80d0 ]
Upon success the update_status handler returns a positive number corresponding to the number of bytes transferred by usb_control_msg. However the return code of the update_status handler should indicate if an error occurred(negative) or how many bytes of the user's input to sysfs that was consumed. Return code zero indicates all bytes were consumed.
The bug can for example result in the update_status handler being called twice, the second time with only the "unconsumed" part of the user's input to sysfs. Effectively setting an incorrect brightness.
Change the update_status handler to return zero for all successful transactions and forward usb_control_msg's error code upon failure.
--- drivers/usb/misc/appledisplay.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/misc/appledisplay.c +5 -2
@@ -160,8 +160,11 @@ static int appledisplay_bl_update_status(struct backlight_device *bd) pdata->msgdata,2 , ACD_USB_TIMEOUT);mutex_unlock (&pdata->sysfslock); - -return retval; + +if (retval <0 ) +return retval; +else +return 0 ; }static int appledisplay_bl_get_brightness (struct backlight_device *bd)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/151 usbip: tools: fix atoi() on non-null terminated string
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit e325808c0051b16729ffd472ff887c6cae5c6317 ]
Currently the call to atoi is being passed a single char string that is not null terminated, so there is a potential read overrun along the stack when parsing for an integer value. Fix this by instead using a 2 char string that is initialized to all zeros to ensure that a 1 char read into the string is always terminated with a \0.
Detected by cppcheck:
"Invalid atoi() argument nr 1. A nul-terminated string is required."
--- tools/usb/usbip/libsrc/usbip_host_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/usb/usbip/libsrc/usbip_host_common.c +3 -3
@@ -43,7 +43,7 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)int size;int fd;int length; -char status; +char status[2 ] = {0 };int value =0 ; size = snprintf(status_attr_path, sizeof(status_attr_path),
@@ -61,14 +61,14 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)return -1 ; } - length =read (fd, &status,1 ); + length =read (fd, status,1 );if (length <0 ) {err ("error reading attribute %s" , status_attr_path);close (fd);return -1 ; } - value =atoi (&status); + value =atoi (status);return value; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/151 SUNRPC: Fix a compile warning for cmpxchg64()
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit e732f4485a150492b286f3efc06f9b34dd6b9995 ]
--- net/sunrpc/auth_gss/gss_krb5_seal.c | 1 + 1 file changed, 1 insertion(+)
net/sunrpc/auth_gss/gss_krb5_seal.c +1 -0
@@ -63,6 +63,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/random.h> #include <linux/crypto.h> +#include <linux/atomic.h> #if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/151 sunrpc: safely reallow resvport min/max inversion
In reply to Greg Kroah-HartmanFrom: J. Bruce Fields <[email protected]>
[ Upstream commit 826799e66e8683e5698e140bb9ef69afc8c0014e ]
Commits ffb6ca33b04b and e08ea3a96fc7 prevent setting xprt_min_resvport greater than xprt_max_resvport, but may also break simple code that sets one parameter then the other, if the new range does not overlap the old.
Also it looks racy to me, unless there's some serialization I'm not seeing. Granted it would probably require malicious privileged processes (unless there's a chance these might eventually be settable in unprivileged containers), but still it seems better not to let userspace panic the kernel.
Simpler seems to be to allow setting the parameters to whatever you want but interpret xprt_min_resvport > xprt_max_resvport as the empty range.
--- net/sunrpc/xprtsock.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
net/sunrpc/xprtsock.c +18 -16
@@ -124,7 +124,7 @@ static struct ctl_table xs_tunables_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = &xprt_min_resvport_limit, - .extra2 = &xprt_max_resvport + .extra2 = &xprt_max_resvport_limit }, { .procname = "max_resvport",
@@ -132,7 +132,7 @@ static struct ctl_table xs_tunables_table[] = { .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &xprt_min_resvport, + .extra1 = &xprt_min_resvport_limit, .extra2 = &xprt_max_resvport_limit }, {
@@ -1737,11 +1737,17 @@ static void xs_udp_timer(struct rpc_xprt *xprt, struct rpc_task *task)xprt_adjust_cwnd (xprt, task, -ETIMEDOUT ); } -static unsigned short xs_get_random_port (void ) +static int xs_get_random_port (void ) { -unsigned short range = xprt_max_resvport - xprt_min_resvport +1 ; -unsigned short rand = (unsigned short )prandom_u32 () % range; -return rand + xprt_min_resvport; +unsigned short min = xprt_min_resvport, max = xprt_max_resvport; +unsigned short range; +unsigned short rand; + +if (max < min) +return -EADDRINUSE ; + range = max - min +1 ; + rand = (unsigned short )prandom_u32 () % range; +return rand + min; }/**
@@ -1798,9 +1804,9 @@ static void xs_set_srcport(struct sock_xprt *transport, struct socket *sock) transport->srcport =xs_sock_getport (sock); } -static unsigned short xs_get_srcport (struct sock_xprt *transport) +static int xs_get_srcport (struct sock_xprt *transport) { -unsigned short port = transport->srcport; +int port = transport->srcport;if (port ==0 && transport->xprt.resvport) port =xs_get_random_port ();
@@ -1821,7 +1827,7 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock) {struct sockaddr_storage myaddr;int err, nloop =0 ; -unsigned short port =xs_get_srcport (transport); +int port =xs_get_srcport (transport);unsigned short last;/*
@@ -1839,8 +1845,8 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)* transport->xprt.resvport == 1) xs_get_srcport above will * ensure that port is non-zero and we will bind as needed. */ -if (port ==0 ) -return 0 ; +if (port <=0 ) +return port;memcpy (&myaddr, &transport->srcaddr, transport->xprt.addrlen); do {
@@ -3223,12 +3229,8 @@ static int param_set_uint_minmax(const char *val,static int param_set_portnr (const char *val,const struct kernel_param *kp) { -if (kp->arg == &xprt_min_resvport) -return param_set_uint_minmax (val, kp, -RPC_MIN_RESVPORT , - xprt_max_resvport);return param_set_uint_minmax (val, kp, - xprt_min_resvport, +RPC_MIN_RESVPORT ,RPC_MAX_RESVPORT ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/151 atm: zatm: Fix empty body Clang warnings
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 64b9d16e2d02ca6e5dc8fcd30cfd52b0ecaaa8f4 ]
Clang warns:
drivers/atm/zatm.c:513:7: error: while loop has empty body [-Werror,-Wempty-body]
zwait;
^drivers/atm/zatm.c:513:7: note: put the semicolon on a separate line to silence this warning
Get rid of this warning by using an empty do-while loop. While we're at it, add parentheses to make it clear that this is a function-like macro.
--- drivers/atm/zatm.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/atm/zatm.c +21 -21
@@ -126,7 +126,7 @@ static unsigned long dummy[2] = {0,0};#define zin_n (r) inl(zatm_dev->base+r*4)#define zin (r) inl(zatm_dev->base+uPD98401_##r*4)#define zout (v,r) outl(v,zatm_dev->base+uPD98401_##r*4) -#define zwait while (zin(CMR) & uPD98401_BUSY) +#define zwait () do {} while (zin(CMR) & uPD98401_BUSY)/* RX0, RX1, TX0, TX1 */ static const int mbx_entries[NR_MBX ] = {1024 ,1024 ,1024 ,1024 };
@@ -140,7 +140,7 @@ static const int mbx_esize[NR_MBX] = { 16,16,4,4 }; /* entry size in bytes */static void zpokel (struct zatm_dev *zatm_dev,u32 value,u32 addr) { - zwait; +zwait ();zout (value,CER );zout (uPD98401_IND_ACC | uPD98401_IA_BALL | (uPD98401_IA_TGT_CM << uPD98401_IA_TGT_SHIFT) | addr,CMR );
@@ -149,10 +149,10 @@ static void zpokel(struct zatm_dev *zatm_dev,u32 value,u32 addr)static u32 zpeekl (struct zatm_dev *zatm_dev,u32 addr) { - zwait; +zwait ();zout (uPD98401_IND_ACC | uPD98401_IA_BALL | uPD98401_IA_RW | (uPD98401_IA_TGT_CM << uPD98401_IA_TGT_SHIFT) | addr,CMR ); - zwait; +zwait ();return zin (CER ); }
@@ -241,7 +241,7 @@ static void refill_pool(struct atm_dev *dev,int pool) }if (first) {spin_lock_irqsave (&zatm_dev->lock, flags); - zwait; +zwait ();zout (virt_to_bus (first),CER );zout (uPD98401_ADD_BAT | (pool << uPD98401_POOL_SHIFT) | count,CMR );
@@ -508,9 +508,9 @@ static int open_rx_first(struct atm_vcc *vcc) }if (zatm_vcc->pool <0 )return -EMSGSIZE ;spin_lock_irqsave (&zatm_dev->lock, flags); - zwait; +zwait ();zout (uPD98401_OPEN_CHAN,CMR ); - zwait; +zwait ();DPRINTK ("0x%x 0x%x\n" ,zin (CMR ),zin (CER )); chan = (zin (CMR ) & uPD98401_CHAN_ADDR) >> uPD98401_CHAN_ADDR_SHIFT;spin_unlock_irqrestore (&zatm_dev->lock, flags);
@@ -571,21 +571,21 @@ static void close_rx(struct atm_vcc *vcc) pos = vcc->vci >>1 ; shift = (1 -(vcc->vci &1 )) <<4 ;zpokel (zatm_dev,zpeekl (zatm_dev,pos) & ~(0xffff << shift),pos); - zwait; +zwait ();zout (uPD98401_NOP,CMR ); - zwait; +zwait ();zout (uPD98401_NOP,CMR );spin_unlock_irqrestore (&zatm_dev->lock, flags); }spin_lock_irqsave (&zatm_dev->lock, flags); - zwait; +zwait ();zout (uPD98401_DEACT_CHAN | uPD98401_CHAN_RT | (zatm_vcc->rx_chan << uPD98401_CHAN_ADDR_SHIFT),CMR ); - zwait; +zwait ();udelay (10 );/* why oh why ... ? */ zout (uPD98401_CLOSE_CHAN | uPD98401_CHAN_RT | (zatm_vcc->rx_chan << uPD98401_CHAN_ADDR_SHIFT),CMR ); - zwait; +zwait ();if (!(zin (CMR ) & uPD98401_CHAN_ADDR)) printk(KERN_CRIT DEV_LABEL "(itf %d): can't close RX channel ""%d\n" ,vcc->dev->number,zatm_vcc->rx_chan);
@@ -699,7 +699,7 @@ printk("NONONONOO!!!!\n");skb_queue_tail (&zatm_vcc->tx_queue,skb);DPRINTK ("QRP=0x%08lx\n" ,zpeekl (zatm_dev,zatm_vcc->tx_chan*VC_SIZE /4 + uPD98401_TXVC_QRP)); - zwait; +zwait ();zout (uPD98401_TX_READY | (zatm_vcc->tx_chan << uPD98401_CHAN_ADDR_SHIFT),CMR );spin_unlock_irqrestore (&zatm_dev->lock, flags);
@@ -891,12 +891,12 @@ static void close_tx(struct atm_vcc *vcc) }spin_lock_irqsave (&zatm_dev->lock, flags);#if 0 - zwait; +zwait ();zout (uPD98401_DEACT_CHAN | (chan << uPD98401_CHAN_ADDR_SHIFT),CMR );#endif - zwait; +zwait ();zout (uPD98401_CLOSE_CHAN | (chan << uPD98401_CHAN_ADDR_SHIFT),CMR ); - zwait; +zwait ();if (!(zin (CMR ) & uPD98401_CHAN_ADDR)) printk(KERN_CRIT DEV_LABEL "(itf %d): can't close TX channel ""%d\n" ,vcc->dev->number,chan);
@@ -926,9 +926,9 @@ static int open_tx_first(struct atm_vcc *vcc) zatm_vcc->tx_chan =0 ;if (vcc->qos.txtp.traffic_class ==ATM_NONE )return 0 ;spin_lock_irqsave (&zatm_dev->lock, flags); - zwait; +zwait ();zout (uPD98401_OPEN_CHAN,CMR ); - zwait; +zwait ();DPRINTK ("0x%x 0x%x\n" ,zin (CMR ),zin (CER )); chan = (zin (CMR ) & uPD98401_CHAN_ADDR) >> uPD98401_CHAN_ADDR_SHIFT;spin_unlock_irqrestore (&zatm_dev->lock, flags);
@@ -1559,7 +1559,7 @@ static void zatm_phy_put(struct atm_dev *dev,unsigned char value,struct zatm_dev *zatm_dev; zatm_dev =ZATM_DEV (dev); - zwait; +zwait ();zout (value,CER );zout (uPD98401_IND_ACC | uPD98401_IA_B0 | (uPD98401_IA_TGT_PHY << uPD98401_IA_TGT_SHIFT) | addr,CMR );
@@ -1571,10 +1571,10 @@ static unsigned char zatm_phy_get(struct atm_dev *dev,unsigned long addr)struct zatm_dev *zatm_dev; zatm_dev =ZATM_DEV (dev); - zwait; +zwait ();zout (uPD98401_IND_ACC | uPD98401_IA_B0 | uPD98401_IA_RW | (uPD98401_IA_TGT_PHY << uPD98401_IA_TGT_SHIFT) | addr,CMR ); - zwait; +zwait ();return zin (CER ) &0xff ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/151 spi: sh-msiof: fix deferred probing
In reply to Greg Kroah-HartmanFrom: Sergei Shtylyov <[email protected]>
[ Upstream commit f34c6e6257aa477cdfe7e9bbbecd3c5648ecda69 ]
Since commit 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") platform_get_irq() can return -EPROBE_DEFER. However, the driver overrides an error returned by that function with -ENOENT which breaks the deferred probing. Propagate upstream an error code returned by platform_get_irq() and remove the bogus "platform" from the error message, while at it...
--- drivers/spi/spi-sh-msiof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-sh-msiof.c +2 -2
@@ -1198,8 +1198,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) i =platform_get_irq (pdev,0 );if (i <0 ) { -dev_err (&pdev->dev,"cannot get platform IRQ\n" ); - ret = -ENOENT ; +dev_err (&pdev->dev,"cannot get IRQ\n" ); + ret = i; goto err1; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/151 spi: omap2-mcspi: Set FIFO DMA trigger level to word length
In reply to Greg Kroah-HartmanFrom: Vignesh R <[email protected]>
[ Upstream commit b682cffa3ac6d9d9e16e9b413c45caee3b391fab ]
McSPI has 32 byte FIFO in Transmit-Receive mode. Current code tries to configuration FIFO watermark level for DMA trigger to be GCD of transfer length and max FIFO size which would mean trigger level may be set to 32 for transmit-receive mode if length is aligned. This does not work in case of SPI slave mode where FIFO always needs to have data ready whenever master starts the clock. With DMA trigger size of 32 there will be a small window during slave TX where DMA is still putting data into FIFO but master would have started clock for next byte, resulting in shifting out of stale data. Similarly, on Slave RX side there may be RX FIFO overflow
Fix this by setting FIFO watermark for DMA trigger to word length. This means DMA is triggered as soon as FIFO has space for word length bytes and DMA would make sure FIFO is almost always full therefore improving FIFO occupancy in both master and slave mode.
--- drivers/spi/spi-omap2-mcspi.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-)
drivers/spi/spi-omap2-mcspi.c +7 -19
@@ -298,7 +298,7 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi,struct omap2_mcspi_cs *cs = spi->controller_state;struct omap2_mcspi *mcspi;unsigned int wcnt; -int max_fifo_depth, fifo_depth, bytes_per_word; +int max_fifo_depth, bytes_per_word;u32 chconf, xferlevel; mcspi =spi_master_get_devdata (master);
@@ -314,10 +314,6 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi,else max_fifo_depth =OMAP2_MCSPI_MAX_FIFODEPTH ; - fifo_depth =gcd (t->len, max_fifo_depth); -if (fifo_depth <2 || fifo_depth % bytes_per_word !=0 ) - goto disable_fifo; - wcnt = t->len / bytes_per_word;if (wcnt >OMAP2_MCSPI_MAX_FIFOWCNT ) goto disable_fifo;
@@ -325,16 +321,17 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi, xferlevel = wcnt <<16 ;if (t->rx_buf !=NULL ) { chconf |=OMAP2_MCSPI_CHCONF_FFER ; - xferlevel |= (fifo_depth -1 ) <<8 ; + xferlevel |= (bytes_per_word -1 ) <<8 ; } +if (t->tx_buf !=NULL ) { chconf |=OMAP2_MCSPI_CHCONF_FFET ; - xferlevel |= fifo_depth -1 ; + xferlevel |= bytes_per_word -1 ; }mcspi_write_reg (master,OMAP2_MCSPI_XFERLEVEL , xferlevel);mcspi_write_chconf0 (spi, chconf); - mcspi->fifo_depth = fifo_depth; + mcspi->fifo_depth = max_fifo_depth;return ; }
@@ -601,7 +598,6 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)struct dma_slave_config cfg;enum dma_slave_buswidth width;unsigned es; -u32 burst;void __iomem *chstat_reg;void __iomem *irqstat_reg;int wait_res;
@@ -623,22 +619,14 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) } count = xfer->len; - burst =1 ; - -if (mcspi->fifo_depth >0 ) { -if (count > mcspi->fifo_depth) - burst = mcspi->fifo_depth / es; -else - burst = count / es; - }memset (&cfg,0 ,sizeof (cfg)); cfg.src_addr = cs->phys +OMAP2_MCSPI_RX0 ; cfg.dst_addr = cs->phys +OMAP2_MCSPI_TX0 ; cfg.src_addr_width = width; cfg.dst_addr_width = width; - cfg.src_maxburst = burst; - cfg.dst_maxburst = burst; + cfg.src_maxburst = es; + cfg.dst_maxburst = es; rx = xfer->rx_buf; tx = xfer->tx_buf;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/151 sparc: Fix parport build warnings.
In reply to Greg Kroah-HartmanFrom: David S. Miller <[email protected]>
[ Upstream commit 46b8306480fb424abd525acc1763da1c63a27d8a ]
If PARPORT_PC_FIFO is not enabled, do not provide the dma lock macros and lock definition. Otherwise:
./arch/sparc/include/asm/parport.h:24:24: warning: ‘dma_spin_lock’ defined but not used [-Wunused-variable]
static DEFINE_SPINLOCK(dma_spin_lock);
^~~~~~~~~~~~~./include/linux/spinlock_types.h:81:39: note: in definition of macro ‘DEFINE_SPINLOCK’
#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
--- arch/sparc/include/asm/parport.h | 2 ++ 1 file changed, 2 insertions(+)
arch/sparc/include/asm/parport.h +2 -0
@@ -20,6 +20,7 @@*/ #define HAS_DMA +#ifdef CONFIG_PARPORT_PC_FIFO static DEFINE_SPINLOCK (dma_spin_lock);#define claim_dma_lock () \
@@ -30,6 +31,7 @@ static DEFINE_SPINLOCK(dma_spin_lock);#define release_dma_lock (__flags) \ spin_unlock_irqrestore(&dma_spin_lock, __flags); +#endif static struct sparc_ebus_info { struct ebus_dma_info info;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/151 rtc: s35390a: Change bufs type to u8 in s35390a_init
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit ef0f02fd69a02b50e468a4ddbe33e3d81671e248 ]
Clang warns:
drivers/rtc/rtc-s35390a.c:124:27: warning: implicit conversion from 'int' to 'char' changes value from 192 to -64 [-Wconstant-conversion]
buf = S35390A_FLAG_RESET | S35390A_FLAG_24H;
~ ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~1 warning generated.
Update buf to be an unsigned 8-bit integer, which matches the buf member in struct i2c_msg.
https://github.com/ClangBuiltLinux/linux/issues/145
--- drivers/rtc/rtc-s35390a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-s35390a.c +1 -1
@@ -106,7 +106,7 @@ static int s35390a_get_reg(struct s35390a *s35390a, int reg, char *buf, int len)*/ static int s35390a_reset (struct s35390a *s35390a,char *status1) { -char buf; +u8 buf;int ret;unsigned initcount =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/151 ceph: fix dentry leak in ceph_readdir_prepopulate
In reply to Greg Kroah-HartmanFrom: Yan, Zheng <[email protected]>
[ Upstream commit c58f450bd61511d897efc2ea472c69630635b557 ]
--- fs/ceph/inode.c | 1 - 1 file changed, 1 deletion(-)
fs/ceph/inode.c +0 -1
@@ -1630,7 +1630,6 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,if (IS_ERR (realdn)) { err =PTR_ERR (realdn);d_drop (dn); - dn =NULL ; goto next_item; } dn = realdn;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/151 f2fs: fix to spread clear_cold_data()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 2baf07818549c8bb8d7b3437e889b86eab56d38e ]
We need to drop PG_checked flag on page as well when we clear PG_uptodate flag, in order to avoid treating the page as GCing one later.
--- fs/f2fs/data.c | 8 +++++++- fs/f2fs/dir.c | 1 + fs/f2fs/segment.c | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-)
fs/f2fs/data.c +7 -1
@@ -1201,6 +1201,7 @@ int do_write_data_page(struct f2fs_io_info *fio)/* This page is already truncated */ if (fio->old_blkaddr ==NULL_ADDR ) {ClearPageUptodate (page); +clear_cold_data (page); goto out_writepage; }
@@ -1337,8 +1338,10 @@ static int f2fs_write_data_page(struct page *page,clear_cold_data (page); out:inode_dec_dirty_pages (inode); -if (err) +if (err) {ClearPageUptodate (page); +clear_cold_data (page); + }if (wbc->for_reclaim) {f2fs_submit_merged_bio_cond (sbi,NULL , page,0 ,DATA ,WRITE );
@@ -1821,6 +1824,8 @@ void f2fs_invalidate_page(struct page *page, unsigned int offset,inode_dec_dirty_pages (inode); } +clear_cold_data (page); +/* This is atomic written page, keep Private */ if (IS_ATOMIC_WRITTEN_PAGE (page))return ;
@@ -1839,6 +1844,7 @@ int f2fs_release_page(struct page *page, gfp_t wait)if (IS_ATOMIC_WRITTEN_PAGE (page))return 0 ; +clear_cold_data (page);set_page_private (page,0 );ClearPagePrivate (page);return 1 ;
fs/f2fs/dir.c +1 -0
@@ -772,6 +772,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,clear_page_dirty_for_io (page);ClearPagePrivate (page);ClearPageUptodate (page); +clear_cold_data (page);inode_dec_dirty_pages (dir); }f2fs_put_page (page,1 );
fs/f2fs/segment.c +3 -1
@@ -227,8 +227,10 @@ static int __revoke_inmem_pages(struct inode *inode, } next:/* we don't need to invalidate this in the sccessful status */ -if (drop || recover) +if (drop || recover) {ClearPageUptodate (page); +clear_cold_data (page); + }set_page_private (page,0 );ClearPagePrivate (page);f2fs_put_page (page,1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/151 qlcnic: fix a return in qlcnic_dcb_get_capability()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit c94f026fb742b2d3199422751dbc4f6fc0e753d8 ]
These functions are supposed to return one on failure and zero on success. Returning a zero here could cause uninitialized variable bugs in several of the callers. For example:
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:1660 get_iscsi_dcb_priority()
error: uninitialized symbol 'caps'.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c +1 -1
@@ -883,7 +883,7 @@ static u8 qlcnic_dcb_get_capability(struct net_device *netdev, int capid,struct qlcnic_adapter *adapter =netdev_priv (netdev);if (!test_bit (QLCNIC_DCB_STATE , &adapter->dcb->state)) -return 0 ; +return 1 ;switch (capid) {case DCB_CAP_ATTR_PG :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/151 mfd: arizona: Correct calling of runtime_put_sync
In reply to Greg Kroah-HartmanFrom: Sapthagiri Baratam <[email protected]>
[ Upstream commit 6b269a41a4520f7eb639e61a45ebbb9c9267d5e0 ]
Don't call runtime_put_sync when clk32k_ref is ARIZONA_32KZ_MCLK2 as there is no corresponding runtime_get_sync call.
MCLK1 is not in the AoD power domain so if it is used as 32kHz clock source we need to hold a runtime PM reference to keep the device from going into low power mode.
--- drivers/mfd/arizona-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mfd/arizona-core.c +4 -4
@@ -52,8 +52,10 @@ int arizona_clk32k_enable(struct arizona *arizona)if (ret !=0 ) goto err_ref; ret =clk_prepare_enable (arizona->mclk[ARIZONA_MCLK1 ]); -if (ret !=0 ) - goto err_pm; +if (ret !=0 ) { +pm_runtime_put_sync (arizona->dev); + goto err_ref; + }break ;case ARIZONA_32KZ_MCLK2 : ret =clk_prepare_enable (arizona->mclk[ARIZONA_MCLK2 ]);
@@ -67,8 +69,6 @@ int arizona_clk32k_enable(struct arizona *arizona) ARIZONA_CLK_32K_ENA); } -err_pm: -pm_runtime_put_sync (arizona->dev); err_ref:if (ret !=0 ) arizona->clk32k_ref--;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/151 net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode
In reply to Greg Kroah-HartmanFrom: Ivan Khoronzhuk <[email protected]>
[ Upstream commit 9737cc99dd14b5b8b9d267618a6061feade8ea68 ]
After flushing all mcast entries from the table, the ones contained in mc list of ndev are not restored when promisc mode is toggled off, because they are considered as synched with ALE, thus, in order to restore them after promisc mode - reset syncing info. This fix touches only switch mode devices, including single port boards like Beagle Bone.
("net: ethernet: ti: cpsw: fix lost of mcast packets while rx_mode update")
--- drivers/net/ethernet/ti/cpsw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/ti/cpsw.c +1 -0
@@ -590,6 +590,7 @@ static void cpsw_set_promiscious(struct net_device *ndev, bool enable)/* Clear all mcast from ALE */ cpsw_ale_flush_multicast (ale,ALE_ALL_PORTS ,-1 ); +__dev_mc_unsync (ndev,NULL );/* Flood All Unicast Packets to Host port */ cpsw_ale_control_set (ale,0 ,ALE_P0_UNI_FLOOD ,1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/151 mfd: mc13xxx-core: Fix PMIC shutdown when reading ADC values
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 55143439b7b501882bea9d95a54adfe00ffc79a3 ]
When trying to read any MC13892 ADC channel on a imx51-babbage board:
The MC13892 PMIC shutdowns completely.
After debugging this issue and comparing the MC13892 and MC13783 initializations done in the vendor kernel, it was noticed that the CHRGRAWDIV bit of the ADC0 register was not being set.
This bit is set by default after power on, but the driver was clearing it.
After setting this bit it is possible to read the ADC values correctly.
--- drivers/mfd/mc13xxx-core.c | 3 ++- include/linux/mfd/mc13xxx.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/mfd/mc13xxx-core.c +2 -1
@@ -278,7 +278,8 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode,if (ret) goto out; - adc0 =MC13XXX_ADC0_ADINC1 |MC13XXX_ADC0_ADINC2 ; + adc0 =MC13XXX_ADC0_ADINC1 |MC13XXX_ADC0_ADINC2 | +MC13XXX_ADC0_CHRGRAWDIV ; adc1 =MC13XXX_ADC1_ADEN |MC13XXX_ADC1_ADTRIGIGN |MC13XXX_ADC1_ASC ;if (channel >7 )
include/linux/mfd/mc13xxx.h +1 -0
@@ -247,6 +247,7 @@ struct mc13xxx_platform_data {#define MC13XXX_ADC0_TSMOD0 (1 << 12)#define MC13XXX_ADC0_TSMOD1 (1 << 13)#define MC13XXX_ADC0_TSMOD2 (1 << 14) +#define MC13XXX_ADC0_CHRGRAWDIV (1 << 15)#define MC13XXX_ADC0_ADINC1 (1 << 16)#define MC13XXX_ADC0_ADINC2 (1 << 17)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/151 mfd: max8997: Enale irq-wakeup unconditionally
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit efddff27c886e729a7f84a7205bd84d7d4af7336 ]
IRQ wake up support for MAX8997 driver was initially configured by respective property in pdata. However, after the driver conversion to device-tree, setting it was left as 'todo'. Nowadays most of other PMIC MFD drivers initialized from device-tree assume that they can be an irq wakeup source, so enable it also for MAX8997. This fixes support for wakeup from MAX8997 RTC alarm.
--- drivers/mfd/max8997.c | 8 +------- include/linux/mfd/max8997.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-)
drivers/mfd/max8997.c +1 -7
@@ -155,12 +155,6 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( pd->ono =irq_of_parse_and_map (dev->of_node,1 ); -/* -* ToDo: the 'wakeup' member in the platform data is more of a linux -* specfic information. Hence, there is no binding for that yet and -* not parsed here. -*/ -return pd; }
@@ -248,7 +242,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c,*/ /* MAX8997 has a power button input. */ -device_init_wakeup (max8997->dev, pdata->wakeup); +device_init_wakeup (max8997->dev, true);return ret;
include/linux/mfd/max8997.h +0 -1
@@ -178,7 +178,6 @@ struct max8997_led_platform_data {struct max8997_platform_data {/* IRQ */ int ono; -int wakeup;/* ---- PMIC ---- */ struct max8997_regulator_data *regulators;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/151 selftests/ftrace: Fix to test kprobe $comm arg only if available
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 2452c96e617a0ff6fb2692e55217a3fa57a7322c ]
Test $comm in kprobe-event argument syntax testcase only if it is supported on the kernel because $comm has been introduced 4.8 kernel.
So on older stable kernel, it should be skipped.
--- .../selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc | 3 +++ 1 file changed, 3 insertions(+)
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc +3 -0
@@ -71,8 +71,11 @@ test_badarg "\$stackp" "\$stack0+10" "\$stack1-10" echo "r ${PROBEFUNC} \$retval" > kprobe_events ! echo "p ${PROBEFUNC} \$retval" > kprobe_events +# $comm was introduced in 4.8, older kernels reject it. +if grep -A1 "fetcharg:" README | grep -q '\$comm' ; then : "Comm access" test_goodarg "\$comm" +fi : "Indirect memory access" test_goodarg "+0(${GOODREG})" "-0(${GOODREG})" "+10(\$stack)" \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/151 powerpc/process: Fix flush_all_to_thread for SPE
In reply to Greg Kroah-HartmanFrom: Felipe Rechia <[email protected]>
[ Upstream commit e901378578c62202594cba0f6c076f3df365ec91 ]
Fix a bug introduced by the creation of flush_all_to_thread() for processors that have SPE (Signal Processing Engine) and use it to compute floating-point operations.
Quoted 1 line
From userspace perspective, the problem was seen in attempts of
computing floating-point operations which should generate exceptions. For example:
fork(); float x = 0.0 / 0.0; isnan(x); // forked process returns False (should be True)
The operation above also should always cause the SPEFSCR FINV bit to be set. However, the SPE floating-point exceptions were turned off after a fork().
Kernel versions prior to the bug used flush_spe_to_thread(), which first saves SPEFSCR register values in tsk->thread and then calls giveup_spe(tsk).
After commit 579e633e764e, the save_all() function was called first to giveup_spe(), and then the SPEFSCR register values were saved in tsk->thread. This would save the SPEFSCR register values after disabling SPE for that thread, causing the bug described above.
Fixes 579e633e764e ("powerpc: create flush_all_to_thread()")
--- arch/powerpc/kernel/process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/kernel/process.c +1 -2
@@ -576,12 +576,11 @@ void flush_all_to_thread(struct task_struct *tsk)if (tsk->thread.regs) {preempt_disable ();BUG_ON (tsk != current); -save_all (tsk); -#ifdef CONFIG_SPE if (tsk->thread.regs->msr &MSR_SPE ) tsk->thread.spefscr =mfspr (SPRN_SPEFSCR );#endif +save_all (tsk);preempt_enable (); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/151 btrfs: handle error of get_old_root
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
[ Upstream commit 315bed43fea532650933e7bba316a7601d439edf ]
In btrfs_search_old_slot get_old_root is always used with the assumption it cannot fail. However, this is not true in rare circumstance it can fail and return null. This will lead to null point dereference when the header is read. Fix this by checking the return value and properly handling NULL by setting ret to -EIO and returning gracefully.
Coverity-id: 1087503
--- fs/btrfs/ctree.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/btrfs/ctree.c +4 -0
@@ -2973,6 +2973,10 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, again: b =get_old_root (root, time_seq); +if (!b) { + ret = -EIO ; + goto done; + } level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/151 gsmi: Fix bug in append_to_eventlog sysfs handler
In reply to Greg Kroah-HartmanFrom: Duncan Laurie <[email protected]>
[ Upstream commit 655603de68469adaff16842ac17a5aec9c9ce89b ]
The sysfs handler should return the number of bytes consumed, which in the case of a successful write is the entire buffer. Also fix a bug where param.data_len was being set to (count - (2 * sizeof(u32))) instead of just (count - sizeof(u32)). The latter is correct because we skip over the leading u32 which is our param.type, but we were also incorrectly subtracting sizeof(u32) on the line where we were actually setting param.data_len:
param.data_len = count - sizeof(u32);
This meant that for our example event.kernel_software_watchdog with total length 10 bytes, param.data_len was just 2 prior to this change.
To test, successfully append an event to the log with gsmi sysfs. This sample event is for a "Kernel Software Watchdog"
Quoted 1 line
xxd -g 1 event.kernel_software_watchdog
0000000: 01 00 00 00 ad de 06 00 00 00
Quoted 3 lines
cat event.kernel_software_watchdog >
/sys/firmware/gsmi/append_to_eventlogmosys eventlog list | tail -1
14 | 2012-06-25 10:14:14 | Kernl Event | Software Watchdog
--- drivers/firmware/google/gsmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/firmware/google/gsmi.c +2 -3
@@ -480,11 +480,10 @@ static ssize_t eventlog_write(struct file *filp, struct kobject *kobj,if (count <sizeof (u32))return -EINVAL ; param.type = *(u32 *)buf; - count -=sizeof (u32); buf +=sizeof (u32);/* The remaining buffer is the data payload */ -if (count > gsmi_dev.data_buf->length) +if ((count -sizeof (u32)) > gsmi_dev.data_buf->length)return -EINVAL ; param.data_len = count -sizeof (u32);
@@ -504,7 +503,7 @@ static ssize_t eventlog_write(struct file *filp, struct kobject *kobj,spin_unlock_irqrestore (&gsmi_dev.lock, flags); -return rc; +return (rc ==0 ) ? count : rc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/151 misc: mic: fix a DMA pool free failure
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit 6b995f4eec34745f6cb20d66d5277611f0b3c3fa ]
In _scif_prog_signal(), the boolean variable 'x100' is used to indicate whether the MIC Coprocessor is X100. If 'x100' is true, the status descriptor will be used to write the value to the destination. Otherwise, a DMA pool will be allocated for this purpose. Specifically, if the DMA pool is allocated successfully, two memory addresses will be returned. One is for the CPU and the other is for the device to access the DMA pool. The former is stored to the variable 'status' and the latter is stored to the variable 'src'. After the allocation, the address in 'src' is saved to 'status->src_dma_addr', which is actually in the DMA pool, and 'src' is then modified.
Later on, if an error occurs, the execution flow will transfer to the label 'dma_fail', which will check 'x100' and free up the allocated DMA pool if 'x100' is false. The point here is that 'status->src_dma_addr' is used for freeing up the DMA pool. As mentioned before, 'status->src_dma_addr' is in the DMA pool. And thus, the device is able to modify this data. This can potentially cause failures when freeing up the DMA pool because of the modified device address.
This patch avoids the above issue by using the variable 'src' (with necessary calculation) to free up the DMA pool.
--- drivers/misc/mic/scif/scif_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mic/scif/scif_fence.c +1 -1
@@ -272,7 +272,7 @@ static int _scif_prog_signal(scif_epd_t epd, dma_addr_t dst, u64 val) dma_fail:if (!x100)dma_pool_free (ep->remote_dev->signal_pool, status, - status->src_dma_addr); + src - offsetof(struct scif_status , val)); alloc_fail:return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/151 m68k: fix command-line parsing when passed from u-boot
In reply to Greg Kroah-HartmanFrom: Angelo Dureghello <[email protected]>
[ Upstream commit 381fdd62c38344a771aed06adaf14aae65c47454 ]
This patch fixes command_line array zero-terminated one byte over the end of the array, causing boot to hang.
--- arch/m68k/kernel/uboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/kernel/uboot.c +1 -1
@@ -103,5 +103,5 @@ __init void process_uboot_commandline(char *commandp, int size) }parse_uboot_commandline (commandp, len); - commandp[size -1 ] =0 ; + commandp[len -1 ] =0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/151 amiflop: clean up on errors during setup
In reply to Greg Kroah-HartmanFrom: Omar Sandoval <[email protected]>
[ Upstream commit 53d0f8dbde89cf6c862c7a62e00c6123e02cba41 ]
The error handling in fd_probe_drives() doesn't clean up at all. Fix it up in preparation for converting to blk-mq. While we're here, get rid of the commented out amiga_floppy_remove().
--- drivers/block/amiflop.c | 84 ++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 44 deletions(-)
drivers/block/amiflop.c +40 -44
@@ -1699,11 +1699,41 @@ static const struct block_device_operations floppy_fops = { .check_events = amiga_check_events, }; +static struct gendisk *fd_alloc_disk (int drive) +{ +struct gendisk *disk; + + disk =alloc_disk (1 ); +if (!disk) + goto out; + + disk->queue =blk_init_queue (do_fd_request, &amiflop_lock); +if (IS_ERR (disk->queue)) { + disk->queue =NULL ; + goto out_put_disk; + } + + unit[drive].trackbuf =kmalloc (FLOPPY_MAX_SECTORS *512 ,GFP_KERNEL ); +if (!unit[drive].trackbuf) + goto out_cleanup_queue; + +return disk; + +out_cleanup_queue: +blk_cleanup_queue (disk->queue); + disk->queue =NULL ; +out_put_disk: +put_disk (disk); +out: + unit[drive].type->code =FD_NODRIVE ; +return NULL ; +} +static int __init fd_probe_drives (void ) {int drive,drives,nomem; -printk (KERN_INFO "FD: probing units\nfound " ); +pr_info ("FD: probing units\nfound" ); drives=0 ; nomem=0 ;for (drive=0 ;drive<FD_MAX_UNITS ;drive++) {
@@ -1711,27 +1741,17 @@ static int __init fd_probe_drives(void)fd_probe (drive);if (unit[drive].type->code ==FD_NODRIVE )continue ; - disk =alloc_disk (1 ); + + disk =fd_alloc_disk (drive);if (!disk) { - unit[drive].type->code =FD_NODRIVE ; +pr_cont (" no mem for fd%d" , drive); + nomem =1 ;continue ; } unit[drive].gendisk = disk; - - disk->queue =blk_init_queue (do_fd_request, &amiflop_lock); -if (!disk->queue) { - unit[drive].type->code =FD_NODRIVE ; -continue ; - } - drives++; -if ((unit[drive].trackbuf =kmalloc (FLOPPY_MAX_SECTORS *512 ,GFP_KERNEL )) ==NULL ) { -printk ("no mem for " ); - unit[drive].type = &drive_types[num_dr_types -1 ];/* FD_NODRIVE */ - drives--; - nomem =1 ; - } -printk ("fd%d " ,drive); + +pr_cont (" fd%d" ,drive); disk->major =FLOPPY_MAJOR ; disk->first_minor = drive; disk->fops = &floppy_fops;
@@ -1742,11 +1762,11 @@ static int __init fd_probe_drives(void) }if ((drives >0 ) || (nomem ==0 )) {if (drives ==0 ) -printk ("no drives" ); -printk ("\n" ); +pr_cont (" no drives" ); +pr_cont ("\n" );return drives; } -printk ("\n" ); +pr_cont ("\n" );return -ENOMEM ; }
@@ -1837,30 +1857,6 @@ static int __init amiga_floppy_probe(struct platform_device *pdev)return ret; } -#if 0 /* not safe to unload */ -static int __exit amiga_floppy_remove(struct platform_device *pdev) -{ -int i; - -for ( i =0 ; i <FD_MAX_UNITS ; i++) { -if (unit[i].type->code !=FD_NODRIVE ) { -struct request_queue *q = unit[i].gendisk->queue; -del_gendisk (unit[i].gendisk); -put_disk (unit[i].gendisk); -kfree (unit[i].trackbuf); -if (q) -blk_cleanup_queue (q); - } - } -blk_unregister_region (MKDEV (FLOPPY_MAJOR ,0 ),256 ); -free_irq (IRQ_AMIGA_CIAA_TB ,NULL ); -free_irq (IRQ_AMIGA_DSKBLK ,NULL ); - custom.dmacon =DMAF_DISK ;/* disable DMA */ -amiga_chip_free (raw_buf); -unregister_blkdev (FLOPPY_MAJOR ,"fd" ); -} -#endif -static struct platform_driver amiga_floppy_driver = { .driver = { .name ="amiga-floppy" ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/151 fs/ocfs2/dlm/dlmdebug.c: fix a sleep-in-atomic-context bug in dlm_print_one_mle()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 999865764f5f128896402572b439269acb471022 ]
The kernel module may sleep with holding a spinlock.
The function call paths (from bottom to top) in Linux-4.16 are:
[FUNC] get_zeroed_page(GFP_NOFS) fs/ocfs2/dlm/dlmdebug.c, 332: get_zeroed_page in dlm_print_one_mle fs/ocfs2/dlm/dlmmaster.c, 240: dlm_print_one_mle in __dlm_put_mle fs/ocfs2/dlm/dlmmaster.c, 255: __dlm_put_mle in dlm_put_mle fs/ocfs2/dlm/dlmmaster.c, 254: spin_lock in dlm_put_ml
[FUNC] get_zeroed_page(GFP_NOFS) fs/ocfs2/dlm/dlmdebug.c, 332: get_zeroed_page in dlm_print_one_mle fs/ocfs2/dlm/dlmmaster.c, 240: dlm_print_one_mle in __dlm_put_mle fs/ocfs2/dlm/dlmmaster.c, 222: __dlm_put_mle in dlm_put_mle_inuse fs/ocfs2/dlm/dlmmaster.c, 219: spin_lock in dlm_put_mle_inuse
To fix this bug, GFP_NOFS is replaced with GFP_ATOMIC.
This bug is found by my static analysis tool DSAC.
--- fs/ocfs2/dlm/dlmdebug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/dlm/dlmdebug.c +1 -1
@@ -329,7 +329,7 @@ void dlm_print_one_mle(struct dlm_master_list_entry *mle) {char *buf; - buf = (char *)get_zeroed_page (GFP_NOFS ); + buf = (char *)get_zeroed_page (GFP_ATOMIC );if (buf) {dump_mle (mle, buf,PAGE_SIZE -1 );free_page ((unsigned long )buf);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/151 hfsplus: prevent btree data loss on ENOSPC
In reply to Greg Kroah-HartmanFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit d92915c35bfaf763d78bf1d5ac7f183420e3bd99 ]
Inserting or deleting a record in a btree may require splitting several of its nodes. If we hit ENOSPC halfway through, the new nodes will be left orphaned and their records will be lost. This could mean lost inodes, extents or xattrs.
Henceforth, check the available disk space before making any changes. This still leaves the potential problem of corruption on ENOMEM.
The patch can be tested with xfstests generic/027.
--- fs/hfsplus/attributes.c | 10 ++++++++++ fs/hfsplus/btree.c | 44 ++++++++++++++++++++++++++--------------- fs/hfsplus/catalog.c | 24 ++++++++++++++++++++++ fs/hfsplus/extents.c | 4 ++++ fs/hfsplus/hfsplus_fs.h | 2 ++ 5 files changed, 68 insertions(+), 16 deletions(-)
fs/hfsplus/attributes.c +10 -0
@@ -216,6 +216,11 @@ int hfsplus_create_attr(struct inode *inode,if (err) goto failed_init_create_attr; +/* Fail early and avoid ENOSPC during the btree operation */ + err =hfs_bmap_reserve (fd.tree, fd.tree->depth +1 ); +if (err) + goto failed_create_attr; +if (name) { err =hfsplus_attr_build_key (sb, fd.search_key, inode->i_ino, name);
@@ -312,6 +317,11 @@ int hfsplus_delete_attr(struct inode *inode, const char *name)if (err)return err; +/* Fail early and avoid ENOSPC during the btree operation */ + err =hfs_bmap_reserve (fd.tree, fd.tree->depth); +if (err) + goto out; +if (name) { err =hfsplus_attr_build_key (sb, fd.search_key, inode->i_ino, name);
fs/hfsplus/btree.c +28 -16
63 lines not on this page · raw message
fs/hfsplus/catalog.c +24 -0
@@ -264,6 +264,14 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir,if (err)return err; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most once. +*/ + err =hfs_bmap_reserve (fd.tree,2 * fd.tree->depth); +if (err) + goto err2; +hfsplus_cat_build_key_with_cnid (sb, fd.search_key, cnid); entry_size = hfsplus_fill_cat_thread(sb, &entry, S_ISDIR(inode->i_mode) ?
@@ -332,6 +340,14 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, const struct qstr *str)if (err)return err; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most once. +*/ + err =hfs_bmap_reserve (fd.tree,2 * (int )fd.tree->depth -2 ); +if (err) + goto out; +if (!str) {int len;
@@ -432,6 +448,14 @@ int hfsplus_rename_cat(u32 cnid,return err; dst_fd = src_fd; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most twice. +*/ + err =hfs_bmap_reserve (src_fd.tree,4 * (int )src_fd.tree->depth -1 ); +if (err) + goto out; +/* find the old dir entry and read the data */ err =hfsplus_cat_build_key (sb, src_fd.search_key, src_dir->i_ino, src_name);
fs/hfsplus/extents.c +4 -0
@@ -99,6 +99,10 @@ static int __hfsplus_ext_write_extent(struct inode *inode,if (hip->extent_state &HFSPLUS_EXT_NEW ) {if (res != -ENOENT )return res; +/* Fail early and avoid ENOSPC during the btree operation */ + res =hfs_bmap_reserve (fd->tree, fd->tree->depth +1 ); +if (res) +return res;hfs_brec_insert (fd, hip->cached_extents,sizeof (hfsplus_extent_rec)); hip->extent_state &= ~(HFSPLUS_EXT_DIRTY |HFSPLUS_EXT_NEW );
fs/hfsplus/hfsplus_fs.h +2 -0
@@ -311,6 +311,7 @@ static inline unsigned short hfsplus_min_io_size(struct super_block *sb)#define hfs_btree_open hfsplus_btree_open#define hfs_btree_close hfsplus_btree_close#define hfs_btree_write hfsplus_btree_write +#define hfs_bmap_reserve hfsplus_bmap_reserve#define hfs_bmap_alloc hfsplus_bmap_alloc#define hfs_bmap_free hfsplus_bmap_free#define hfs_bnode_read hfsplus_bnode_read
@@ -395,6 +396,7 @@ u32 hfsplus_calc_btree_clump_size(u32 block_size, u32 node_size, u64 sectors,struct hfs_btree *hfs_btree_open (struct super_block *sb,u32 id);void hfs_btree_close (struct hfs_btree *tree);int hfs_btree_write (struct hfs_btree *tree); +int hfs_bmap_reserve (struct hfs_btree *tree,int rsvd_nodes);struct hfs_bnode *hfs_bmap_alloc (struct hfs_btree *tree);void hfs_bmap_free (struct hfs_bnode *node);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/151 hfsplus: fix return value of hfsplus_get_block()
In reply to Greg Kroah-HartmanFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 839c3a6a5e1fbc8542d581911b35b2cb5cd29304 ]
Direct writes to empty inodes fail with EIO. The generic direct-io code is in part to blame (a patch has been submitted as "direct-io: allow direct writes to empty inodes"), but hfsplus is worse affected than the other filesystems because the fallback to buffered I/O doesn't happen.
The problem is the return value of hfsplus_get_block() when called with !create. Change it to be more consistent with the other modules.
--- fs/hfsplus/extents.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/hfsplus/extents.c +3 -1
@@ -236,7 +236,9 @@ int hfsplus_get_block(struct inode *inode, sector_t iblock, ablock = iblock >> sbi->fs_shift;if (iblock >= hip->fs_blocks) { -if (iblock > hip->fs_blocks || !create) +if (!create) +return 0 ; +if (iblock > hip->fs_blocks)return -EIO ;if (ablock >= hip->alloc_blocks) { res =hfsplus_file_extend (inode, false);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/151 hfs: prevent btree data loss on ENOSPC
In reply to Greg Kroah-HartmanFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 54640c7502e5ed41fbf4eedd499e85f9acc9698f ]
Inserting a new record in a btree may require splitting several of its nodes. If we hit ENOSPC halfway through, the new nodes will be left orphaned and their records will be lost. This could mean lost inodes or extents.
Henceforth, check the available disk space before making any changes. This still leaves the potential problem of corruption on ENOMEM.
There is no need to reserve space before deleting a catalog record, as we do for hfsplus. This difference is because hfs index nodes have fixed length keys.
--- fs/hfs/btree.c | 41 +++++++++++++++++++++++++---------------- fs/hfs/btree.h | 1 + fs/hfs/catalog.c | 16 ++++++++++++++++ fs/hfs/extent.c | 4 ++++ 4 files changed, 46 insertions(+), 16 deletions(-)
fs/hfs/btree.c +25 -16
@@ -219,25 +219,17 @@ static struct hfs_bnode *hfs_bmap_new_bmap(struct hfs_bnode *prev, u32 idx)return node; } -struct hfs_bnode *hfs_bmap_alloc (struct hfs_btree *tree) +/* Make sure @tree has enough space for the @rsvd_nodes */ +int hfs_bmap_reserve (struct hfs_btree *tree,int rsvd_nodes) { -struct hfs_bnode *node, *next_node; -struct page **pagep; -u32 nidx, idx; -unsigned off; -u16 off16; -u16 len; -u8 *data, byte, m; -int i; - -while (!tree->free_nodes) { -struct inode *inode = tree->inode; -u32 count; -int res; +struct inode *inode = tree->inode; +u32 count; +int res; +while (tree->free_nodes < rsvd_nodes) { res =hfs_extend_file (inode);if (res) -return ERR_PTR (res); +return res;HFS_I (inode)->phys_size = inode->i_size = (loff_t )HFS_I (inode)->alloc_blocks *HFS_SB (tree->sb)->alloc_blksz;
@@ -245,9 +237,26 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) tree->sb->s_blocksize_bits;inode_set_bytes (inode, inode->i_size); count = inode->i_size >> tree->node_size_shift; - tree->free_nodes = count - tree->node_count; + tree->free_nodes += count - tree->node_count; tree->node_count = count; } +return 0 ; +} + +struct hfs_bnode *hfs_bmap_alloc (struct hfs_btree *tree) +{ +struct hfs_bnode *node, *next_node; +struct page **pagep; +u32 nidx, idx; +unsigned off; +u16 off16; +u16 len; +u8 *data, byte, m; +int i, res; + + res =hfs_bmap_reserve (tree,1 ); +if (res) +return ERR_PTR (res); nidx =0 ; node =hfs_bnode_find (tree, nidx);
fs/hfs/btree.h +1 -0
@@ -81,6 +81,7 @@ struct hfs_find_data {extern struct hfs_btree *hfs_btree_open (struct super_block *,u32 ,btree_keycmp );extern void hfs_btree_close (struct hfs_btree *);extern void hfs_btree_write (struct hfs_btree *); +extern int hfs_bmap_reserve (struct hfs_btree *,int );extern struct hfs_bnode *hfs_bmap_alloc (struct hfs_btree *);extern void hfs_bmap_free (struct hfs_bnode *node);
fs/hfs/catalog.c +16 -0
@@ -97,6 +97,14 @@ int hfs_cat_create(u32 cnid, struct inode *dir, const struct qstr *str, struct iif (err)return err; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most once. +*/ + err =hfs_bmap_reserve (fd.tree,2 * fd.tree->depth); +if (err) + goto err2; +hfs_cat_build_key (sb, fd.search_key, cnid,NULL ); entry_size = hfs_cat_build_thread(sb, &entry, S_ISDIR(inode->i_mode) ? HFS_CDR_THD : HFS_CDR_FTH,
@@ -295,6 +303,14 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,return err; dst_fd = src_fd; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most once. +*/ + err =hfs_bmap_reserve (src_fd.tree,2 * src_fd.tree->depth); +if (err) + goto out; +/* find the old dir entry and read the data */ hfs_cat_build_key (sb, src_fd.search_key, src_dir->i_ino, src_name); err =hfs_brec_find (&src_fd);
fs/hfs/extent.c +4 -0
@@ -117,6 +117,10 @@ static int __hfs_ext_write_extent(struct inode *inode, struct hfs_find_data *fd)if (HFS_I (inode)->flags &HFS_FLG_EXT_NEW ) {if (res != -ENOENT )return res; +/* Fail early and avoid ENOSPC during the btree operation */ + res =hfs_bmap_reserve (fd->tree, fd->tree->depth +1 ); +if (res) +return res;hfs_brec_insert (fd,HFS_I (inode)->cached_extents,sizeof (hfs_extent_rec));HFS_I (inode)->flags &= ~(HFS_FLG_EXT_DIRTY |HFS_FLG_EXT_NEW ); }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/151 hfsplus: update timestamps on truncate()
In reply to Greg Kroah-HartmanFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit dc8844aada735890a6de109bef327f5df36a982e ]
The vfs takes care of updating ctime and mtime on ftruncate(), but on truncate() it must be done by the module.
This patch can be tested with xfstests generic/313.
--- fs/hfsplus/inode.c | 1 + 1 file changed, 1 insertion(+)
fs/hfsplus/inode.c +1 -0
@@ -260,6 +260,7 @@ static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr) }truncate_setsize (inode, attr->ia_size);hfsplus_file_truncate (inode); + inode->i_mtime = inode->i_ctime =current_time (inode); }setattr_copy (inode, attr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/151 fs/hfs/extent.c: fix array out of bounds read of array extent
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 6c9a3f843a29d6894dfc40df338b91dbd78f0ae3 ]
Currently extent and index i are both being incremented causing an array out of bounds read on extent[i]. Fix this by removing the extraneous increment of extent.
Ernesto said:
: This is only triggered when deleting a file with a resource fork. I : may be wrong because the documentation isn't clear, but I don't think : you can create those under linux. So I guess nobody was testing them. :
: > A disk space leak, perhaps?
:
: That's what it looks like in general. hfs_free_extents() won't do : anything if the block count doesn't add up, and the error will be : ignored. Now, if the block count randomly does add up, we could see : some corruption.
Detected by CoverityScan, CID#711541 ("Out of bounds read")
--- fs/hfs/extent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/hfs/extent.c +1 -1
@@ -304,7 +304,7 @@ int hfs_free_fork(struct super_block *sb, struct hfs_cat_file *file, int type)return 0 ; blocks =0 ; -for (i =0 ; i <3 ; extent++, i++) +for (i =0 ; i <3 ; i++) blocks +=be16_to_cpu (extent[i].count); res =hfs_free_extents (sb, extent, blocks, blocks);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/151 mm/memory_hotplug: make add_memory() take the device_hotplug_lock
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
[ Upstream commit 8df1d0e4a265f25dc1e7e7624ccdbcb4a6630c89 ]
add_memory() currently does not take the device_hotplug_lock, however is aleady called under the lock from
arch/powerpc/platforms/pseries/hotplug-memory.c drivers/acpi/acpi_memhotplug.c
to synchronize against CPU hot-remove and similar.
In general, we should hold the device_hotplug_lock when adding memory to synchronize against online/offline request (e.g. from user space) - which already resulted in lock inversions due to device_lock() and mem_hotplug_lock - see 30467e0b3be ("mm, hotplug: fix concurrent memory hot-add deadlock"). add_memory()/add_memory_resource() will create memory block devices, so this really feels like the right thing to do.
Holding the device_hotplug_lock makes sure that a memory block device can really only be accessed (e.g. via .online/.state) from user space, once the memory has been fully added to the system.
The lock is not held yet in
drivers/xen/balloon.c arch/powerpc/platforms/powernv/memtrace.c drivers/s390/char/sclp_cmd.c drivers/hv/hv_balloon.c
So, let's either use the locked variants or take the lock.
Don't export add_memory_resource(), as it once was exported to be used by XEN, which is never built as a module. If somebody requires it, we also have to export a locked variant (as device_hotplug_lock is never exported).
--- .../platforms/pseries/hotplug-memory.c | 2 +- drivers/acpi/acpi_memhotplug.c | 2 +- drivers/base/memory.c | 9 ++++++-- drivers/xen/balloon.c | 3 +++ include/linux/memory_hotplug.h | 1 + mm/memory_hotplug.c | 22 ++++++++++++++++--- 6 files changed, 32 insertions(+), 7 deletions(-)
arch/powerpc/platforms/pseries/hotplug-memory.c +1 -1
@@ -616,7 +616,7 @@ static int dlpar_add_lmb(struct of_drconf_cell *lmb) nid =memory_add_physaddr_to_nid (lmb->base_addr);/* Add the memory */ - rc =add_memory (nid, lmb->base_addr, block_sz); + rc =__add_memory (nid, lmb->base_addr, block_sz);if (rc) {dlpar_remove_device_tree_lmb (lmb);dlpar_release_drc (lmb->drc_index);
drivers/acpi/acpi_memhotplug.c +1 -1
@@ -228,7 +228,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)if (node <0 ) node =memory_add_physaddr_to_nid (info->start_addr); - result =add_memory (node, info->start_addr, info->length); + result =__add_memory (node, info->start_addr, info->length);/* * If the memory block has been used by the kernel, add_memory()
drivers/base/memory.c +7 -2
@@ -500,15 +500,20 @@ memory_probe_store(struct device *dev, struct device_attribute *attr,if (phys_addr & ((pages_per_block <<PAGE_SHIFT ) -1 ))return -EINVAL ; + ret =lock_device_hotplug_sysfs (); +if (ret) + goto out; + nid =memory_add_physaddr_to_nid (phys_addr); - ret =add_memory (nid, phys_addr, -MIN_MEMORY_BLOCK_SIZE * sections_per_block); + ret =__add_memory (nid, phys_addr, +MIN_MEMORY_BLOCK_SIZE * sections_per_block);if (ret) goto out; ret = count; out: +unlock_device_hotplug ();return ret; }
drivers/xen/balloon.c +3 -0
@@ -358,7 +358,10 @@ static enum bp_state reserve_additional_memory(void)* callers drop the mutex before trying again. */ mutex_unlock (&balloon_mutex); +/* add_memory_resource() requires the device_hotplug lock */ +lock_device_hotplug (); rc =add_memory_resource (nid, resource, memhp_auto_online); +unlock_device_hotplug ();mutex_lock (&balloon_mutex);if (rc) {
include/linux/memory_hotplug.h +1 -0
@@ -272,6 +272,7 @@ static inline void remove_memory(int nid, u64 start, u64 size) {}extern int walk_memory_range (unsigned long start_pfn,unsigned long end_pfn,void *arg,int (*func)(struct memory_block *,void *)); +extern int __add_memory (int nid,u64 start,u64 size);extern int add_memory (int nid,u64 start,u64 size);extern int add_memory_resource (int nid,struct resource *resource,bool online); extern int zone_for_memory(int nid, u64 start, u64 size, int zone_default,
mm/memory_hotplug.c +19 -3
@@ -1340,7 +1340,12 @@ static int online_memory_block(struct memory_block *mem, void *arg)return memory_block_change_state (mem,MEM_ONLINE ,MEM_OFFLINE ); } -/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ +/* +* NOTE: The caller must call lock_device_hotplug() to serialize hotplug +* and online/offline operations (triggered e.g. by sysfs). +* +* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG +*/ int __ref add_memory_resource (int nid,struct resource *res,bool online) {u64 start, size;
@@ -1418,9 +1423,9 @@ int __ref add_memory_resource(int nid, struct resource *res, bool online)mem_hotplug_done ();return ret; } -EXPORT_SYMBOL_GPL (add_memory_resource); -int __ref add_memory (int nid,u64 start,u64 size) +/* requires device_hotplug_lock, see add_memory_resource() */ +int __ref __add_memory (int nid,u64 start,u64 size) {struct resource *res;int ret;
@@ -1434,6 +1439,17 @@ int __ref add_memory(int nid, u64 start, u64 size)release_memory_resource (res);return ret; } + +int add_memory (int nid,u64 start,u64 size) +{ +int rc; + +lock_device_hotplug (); + rc =__add_memory (nid, start, size); +unlock_device_hotplug (); + +return rc; +}EXPORT_SYMBOL_GPL (add_memory);#ifdef CONFIG_MEMORY_HOTREMOVE
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/151 ntb_netdev: fix sleep time mismatch
In reply to Greg Kroah-HartmanFrom: Jon Mason <[email protected]>
[ Upstream commit a861594b1b7ffd630f335b351c4e9f938feadb8e ]
The tx_time should be in usecs (according to the comment above the variable), but the setting of the timer during the rearming is done in msecs. Change it to match the expected units.
--- drivers/net/ntb_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ntb_netdev.c +1 -1
@@ -236,7 +236,7 @@ static void ntb_netdev_tx_timer(unsigned long data)struct ntb_netdev *dev =netdev_priv (ndev);if (ntb_transport_tx_free_entry (dev->qp) < tx_stop) { -mod_timer (&dev->tx_timer, jiffies +msecs_to_jiffies (tx_time)); +mod_timer (&dev->tx_timer, jiffies +usecs_to_jiffies (tx_time)); }else {/* Make sure anybody stopping the queue after this sees the new * value of ntb_transport_tx_free_entry()
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/151 mm/page-writeback.c: fix range_cyclic writeback vs writepages deadlock
In reply to Greg Kroah-HartmanFrom: Dave Chinner <[email protected]>
[ Upstream commit 64081362e8ff4587b4554087f3cfc73d3e0a4cd7 ]
We've recently seen a workload on XFS filesystems with a repeatable deadlock between background writeback and a multi-process application doing concurrent writes and fsyncs to a small range of a file.
range_cyclic
writeback Process 1 Process 2
xfs_vm_writepages
write_cache_pages
writeback_index = 2
cycled = 0
....
find page 2 dirty
lock Page 2
->writepage
page 2 writeback
page 2 clean
page 2 added to bio
no more pages
write()
locks page 1
dirties page 1
locks page 2
dirties page 1
fsync()
....
xfs_vm_writepages write_cache_pages
start index 0
find page 1 towrite
lock Page 1
->writepage
page 1 writeback
page 1 clean
page 1 added to bio
find page 2 towrite
lock Page 2
page 2 is writeback
<blocks>
write() locks page 1 dirties page 1 fsync()
....
xfs_vm_writepages write_cache_pages
start index 0
!done && !cycled
sets index to 0, restarts lookup
find page 1 dirty
find page 1 towrite lock Page 1 page 1 is writeback <blocks>
lock Page 1
<blocks>
DEADLOCK because:
- process 1 needs page 2 writeback to complete to make enough progress to issue IO pending for page 1
- writeback needs page 1 writeback to complete so process 2 can progress and unlock the page it is blocked on, then it can issue the IO pending for page 2
- process 2 can't make progress until process 1 issues IO for page 1
The underlying cause of the problem here is that range_cyclic writeback is processing pages in descending index order as we hold higher index pages in a structure controlled from above write_cache_pages(). The write_cache_pages() caller needs to be able to submit these pages for IO before write_cache_pages restarts writeback at mapping index 0 to avoid wcp inverting the page lock/writeback wait order.
generic_writepages() is not susceptible to this bug as it has no private context held across write_cache_pages() - filesystems using this infrastructure always submit pages in ->writepage immediately and so there is no problem with range_cyclic going back to mapping index 0.
However:
mpage_writepages() has a private bio context, exofs_writepages() has page_collect fuse_writepages() has fuse_fill_wb_data nfs_writepages() has nfs_pageio_descriptor xfs_vm_writepages() has xfs_writepage_ctx
All of these ->writepages implementations can hold pages under writeback in their private structures until write_cache_pages() returns, and hence they are all susceptible to this deadlock.
Also worth noting is that ext4 has it's own bastardised version of write_cache_pages() and so it /may/ have an equivalent deadlock. I looked at the code long enough to understand that it has a similar retry loop for range_cyclic writeback reaching the end of the file and then promptly ran away before my eyes bled too much. I'll leave it for the ext4 developers to determine if their code is actually has this deadlock and how to fix it if it has.
There's a few ways I can see avoid this deadlock. There's probably more, but these are the first I've though of:
1. get rid of range_cyclic altogether
2. range_cyclic always stops at EOF, and we start again from writeback index 0 on the next call into write_cache_pages()
2a. wcp also returns EAGAIN to ->writepages implementations to indicate range cyclic has hit EOF. writepages implementations can then flush the current context and call wpc again to continue. i.e. lift the retry into the ->writepages implementation
3. range_cyclic uses trylock_page() rather than lock_page(), and it skips pages it can't lock without blocking. It will already do this for pages under writeback, so this seems like a no-brainer
3a. all non-WB_SYNC_ALL writeback uses trylock_page() to avoid blocking as per pages under writeback.
I don't think #1 is an option - range_cyclic prevents frequently dirtied lower file offset from starving background writeback of rarely touched higher file offsets.
#2 is simple, and I don't think it will have any impact on performance as going back to the start of the file implies an immediate seek. We'll have exactly the same number of seeks if we switch writeback to another inode, and then come back to this one later and restart from index 0.
#2a is pretty much "status quo without the deadlock". Moving the retry loop up into the wcp caller means we can issue IO on the pending pages before calling wcp again, and so avoid locking or waiting on pages in the wrong order. I'm not convinced we need to do this given that we get the same thing from #2 on the next writeback call from the writeback infrastructure.
#3 is really just a band-aid - it doesn't fix the access/wait inversion problem, just prevents it from becoming a deadlock situation. I'd prefer we fix the inversion, not sweep it under the carpet like this.
#3a is really an optimisation that just so happens to include the band-aid fix of #3.
So it seems that the simplest way to fix this issue is to implement solution #2
--- mm/page-writeback.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
mm/page-writeback.c +15 -18
@@ -2141,6 +2141,13 @@ EXPORT_SYMBOL(tag_pages_for_writeback);* not miss some pages (e.g., because some other process has cleared TOWRITE * tag we set). The rule we follow is that TOWRITE tag can be cleared only * by the process clearing the DIRTY tag (and submitting the page for IO). +* +* To avoid deadlocks between range_cyclic writeback and callers that hold +* pages in PageWriteback to aggregate IO until write_cache_pages() returns, +* we do not loop back to the start of the file. Doing so causes a page +* lock/page writeback access order inversion - we should only ever lock +* multiple pages in ascending page->index order, and looping back to the start +* of the file violates that rule and causes deadlocks. */ int write_cache_pages(struct address_space *mapping, struct writeback_control *wbc, writepage_t writepage,
@@ -2155,7 +2162,6 @@ int write_cache_pages(struct address_space *mapping,pgoff_t index;pgoff_t end;/* Inclusive */ pgoff_t done_index; -int cycled;int range_whole =0 ;int tag;
@@ -2163,23 +2169,17 @@ int write_cache_pages(struct address_space *mapping,if (wbc->range_cyclic) { writeback_index = mapping->writeback_index;/* prev offset */ index = writeback_index; -if (index ==0 ) - cycled =1 ; -else - cycled =0 ; end =-1 ; }else { index = wbc->range_start >>PAGE_SHIFT ; end = wbc->range_end >>PAGE_SHIFT ;if (wbc->range_start ==0 && wbc->range_end ==LLONG_MAX ) range_whole =1 ; - cycled =1 ;/* ignore range_cyclic tests */ }if (wbc->sync_mode ==WB_SYNC_ALL || wbc->tagged_writepages) tag =PAGECACHE_TAG_TOWRITE ;else tag =PAGECACHE_TAG_DIRTY ; -retry:if (wbc->sync_mode ==WB_SYNC_ALL || wbc->tagged_writepages)tag_pages_for_writeback (mapping, index, end); done_index = index;
@@ -2287,17 +2287,14 @@ int write_cache_pages(struct address_space *mapping,pagevec_release (&pvec);cond_resched (); } -if (!cycled && !done) { -/* -* range_cyclic: -* We hit the last page and there is more work to be done: wrap -* back to the start of the file -*/ - cycled =1 ; - index =0 ; - end = writeback_index -1 ; - goto retry; - } + +/* +* If we hit the last page and there is more work to be done: wrap +* back the index back to the start of the file for the next +* time we are called. +*/ +if (wbc->range_cyclic && !done) + done_index =0 ;if (wbc->range_cyclic || (range_whole && wbc->nr_to_write >0 )) mapping->writeback_index = done_index;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/151 arm64: makefile fix build of .i file in external module case
In reply to Greg Kroah-HartmanFrom: Victor Kamensky <[email protected]>
[ Upstream commit 98356eb0ae499c63e78073ccedd9a5fc5c563288 ]
After 'a66649dab350 arm64: fix vdso-offsets.h dependency' if one will try to build .i file in case of external kernel module, build fails complaining that prepare0 target is missing. This issue came up with SystemTap when it tries to build variety of .i files for its own generated kernel modules trying to figure given kernel features/capabilities.
The issue is that prepare0 is defined in top level Makefile only if KBUILD_EXTMOD is not defined. .i file rule depends on prepare and in case KBUILD_EXTMOD defined top level Makefile contains empty rule for prepare. But after mentioned commit arch/arm64/Makefile would introduce dependency on prepare0 through its own prepare target.
Fix it to put proper ifdef KBUILD_EXTMOD around code introduced by mentioned commit. It matches what top level Makefile does.
--- arch/arm64/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/Makefile +2 -0
@@ -134,6 +134,7 @@ archclean: $(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)/dts +ifeq ($(KBUILD_EXTMOD),) # We need to generate vdso-offsets.h before compiling certain files in kernel/. # In order to do that, we should use the archprepare target, but we can't since # asm-offsets.h is included in some files used to generate vdso-offsets.h, and
@@ -143,6 +144,7 @@ archclean: prepare: vdso_prepare vdso_prepare: prepare0 $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h +endif define archhelp echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/151 ntb: intel: fix return value for ndev_vec_mask()
In reply to Greg Kroah-HartmanFrom: Dave Jiang <[email protected]>
[ Upstream commit 7756e2b5d68c36e170a111dceea22f7365f83256 ]
ndev_vec_mask() should be returning u64 mask value instead of int. Otherwise the mask value returned can be incorrect for larger vectors.
--- drivers/ntb/hw/intel/ntb_hw_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ntb/hw/intel/ntb_hw_intel.c +1 -1
@@ -330,7 +330,7 @@ static inline int ndev_db_clear_mask(struct intel_ntb_dev *ndev, u64 db_bits,return 0 ; } -static inline int ndev_vec_mask (struct intel_ntb_dev *ndev,int db_vector) +static inline u64 ndev_vec_mask (struct intel_ntb_dev *ndev,int db_vector) {u64 shift, mask;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/151 ocfs2: dont put and assigning null to bh allocated outside
In reply to Greg Kroah-HartmanFrom: Changwei Ge <[email protected]>
[ Upstream commit cf76c78595ca87548ca5e45c862ac9e0949c4687 ]
ocfs2_read_blocks() and ocfs2_read_blocks_sync() are both used to read several blocks from disk. Currently, the input argument *bhs* can be NULL or NOT. It depends on the caller's behavior. If the function fails in reading blocks from disk, the corresponding bh will be assigned to NULL and put.
Obviously, above process for non-NULL input bh is not appropriate. Because the caller doesn't even know its bhs are put and re-assigned.
If buffer head is managed by caller, ocfs2_read_blocks and ocfs2_read_blocks_sync() should not evaluate it to NULL. It will cause caller accessing illegal memory, thus crash.
--- fs/ocfs2/buffer_head_io.c | 77 ++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 18 deletions(-)
fs/ocfs2/buffer_head_io.c +59 -18
@@ -98,25 +98,34 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,return ret; } +/* Caller must provide a bhs[] with all NULL or non-NULL entries, so it +* will be easier to handle read failure. +*/ int ocfs2_read_blocks_sync (struct ocfs2_super *osb,u64 block,unsigned int nr,struct buffer_head *bhs[]) {int status =0 ;unsigned int i;struct buffer_head *bh; +int new_bh =0 ;trace_ocfs2_read_blocks_sync ((unsigned long long )block, nr);if (!nr) goto bail; +/* Don't put buffer head and re-assign it to NULL if it is allocated +* outside since the caller can't be aware of this alternation! +*/ + new_bh = (bhs[0 ] ==NULL ); +for (i =0 ; i < nr ; i++) {if (bhs[i] ==NULL ) { bhs[i] =sb_getblk (osb->sb, block++);if (bhs[i] ==NULL ) { status = -ENOMEM ;mlog_errno (status); - goto bail; +break ; } } bh = bhs[i];
@@ -156,9 +165,26 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,submit_bh (REQ_OP_READ ,0 , bh); } +read_failure:for (i = nr; i >0 ; i--) { bh = bhs[i -1 ]; +if (unlikely (status)) { +if (new_bh && bh) { +/* If middle bh fails, let previous bh +* finish its read and then put it to +* aovoid bh leak +*/ +if (!buffer_jbd (bh)) +wait_on_buffer (bh); +put_bh (bh); + bhs[i -1 ] =NULL ; + }else if (bh &&buffer_uptodate (bh)) { +clear_buffer_uptodate (bh); + } +continue ; + } +/* No need to wait on the buffer if it's managed by JBD. */ if (!buffer_jbd (bh))wait_on_buffer (bh);
@@ -168,8 +194,7 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,* so we can safely record this and loop back * to cleanup the other buffers. */ status = -EIO ; -put_bh (bh); - bhs[i -1 ] =NULL ; + goto read_failure; } }
@@ -177,6 +202,9 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,return status; } +/* Caller must provide a bhs[] with all NULL or non-NULL entries, so it +* will be easier to handle read failure. +*/ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, struct buffer_head *bhs[], int flags, int (*validate)(struct super_block *sb,
@@ -186,6 +214,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,int i, ignore_cache =0 ;struct buffer_head *bh;struct super_block *sb =ocfs2_metadata_cache_get_super (ci); +int new_bh =0 ;trace_ocfs2_read_blocks_begin (ci, (unsigned long long )block, nr, flags);
@@ -211,6 +240,11 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, goto bail; } +/* Don't put buffer head and re-assign it to NULL if it is allocated +* outside since the caller can't be aware of this alternation! +*/ + new_bh = (bhs[0 ] ==NULL ); +ocfs2_metadata_cache_io_lock (ci);for (i =0 ; i < nr ; i++) {if (bhs[i] ==NULL ) {
@@ -219,7 +253,8 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,ocfs2_metadata_cache_io_unlock (ci); status = -ENOMEM ;mlog_errno (status); - goto bail; +/* Don't forget to put previous bh! */ +break ; } } bh = bhs[i];
@@ -313,16 +348,27 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, } } - status =0 ; - +read_failure:for (i = (nr -1 ); i >=0 ; i--) { bh = bhs[i];if (!(flags &OCFS2_BH_READAHEAD )) { -if (status) { -/* Clear the rest of the buffers on error */ -put_bh (bh); - bhs[i] =NULL ; +if (unlikely (status)) { +/* Clear the buffers on error including those +* ever succeeded in reading +*/ +if (new_bh && bh) { +/* If middle bh fails, let previous bh +* finish its read and then put it to +* aovoid bh leak +*/ +if (!buffer_jbd (bh)) +wait_on_buffer (bh); +put_bh (bh); + bhs[i] =NULL ; + }else if (bh &&buffer_uptodate (bh)) { +clear_buffer_uptodate (bh); + }continue ; }/* We know this can't have changed as we hold the
@@ -340,9 +386,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,* uptodate. */ status = -EIO ;clear_buffer_needs_validate (bh); -put_bh (bh); - bhs[i] =NULL ; -continue ; + goto read_failure; }if (buffer_needs_validate (bh)) {
@@ -352,11 +396,8 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,BUG_ON (buffer_jbd (bh));clear_buffer_needs_validate (bh); status =validate (sb, bh); -if (status) { -put_bh (bh); - bhs[i] =NULL ; -continue ; - } +if (status) + goto read_failure; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/151 net: do not abort bulk send on BQL status
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit fe60faa5063822f2d555f4f326c7dd72a60929bf ]
Before calling dev_hard_start_xmit(), upper layers tried to cook optimal skb list based on BQL budget.
Problem is that GSO packets can end up comsuming more than the BQL budget.
Breaking the loop is not useful, since requeued packets are ahead of any packets still in the qdisc.
It is also more expensive, since next TX completion will push these packets later, while skbs are not in cpu caches.
It is also a behavior difference with TSO packets, that can break the BQL limit by a large amount.
Note that drivers should use __netdev_tx_sent_queue() in order to have optimal xmit_more support, and avoid useless atomic operations as shown in the following patch.
--- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/dev.c +1 -1
@@ -2997,7 +2997,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *first, struct net_device *de } skb = next; -if (netif_xmit_stopped (txq) && skb) { +if (netif_tx_queue_stopped (txq) && skb) { rc =NETDEV_TX_BUSY ;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/151 audit: print empty EXECVE args
In reply to Greg Kroah-HartmanFrom: Richard Guy Briggs <[email protected]>
[ Upstream commit ea956d8be91edc702a98b7fe1f9463e7ca8c42ab ]
Empty executable arguments were being skipped when printing out the list of arguments in an EXECVE record, making it appear they were somehow lost. Include empty arguments as an itemized empty string.
Reproducer:
autrace /bin/ls "" "/etc" ausearch --start recent -m execve -i | grep EXECVE type=EXECVE msg=audit(10/03/2018 13:04:03.208:1391) : argc=3 a0=/bin/ls a2=/etc
With fix:
type=EXECVE msg=audit(10/03/2018 21:51:38.290:194) : argc=3 a0=/bin/ls a1= a2=/etc type=EXECVE msg=audit(1538617898.290:194): argc=3 a0="/bin/ls" a1="" a2="/etc"
Passes audit-testsuite. GH issue tracker at
https://github.com/linux-audit/audit-kernel/issues/99
--- kernel/auditsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/auditsc.c +1 -1
@@ -1096,7 +1096,7 @@ static void audit_log_execve_info(struct audit_context *context, }/* write as much as we can to the audit log */ -if (len_buf >0 ) { +if (len_buf >=0 ) {/* NOTE: some magic numbers here - basically if we * can't fit a reasonable amount of data into the * existing audit buffer, flush it and start with
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/151 rtl8xxxu: Fix missing break in switch
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 307b00c5e695857ca92fc6a4b8ab6c48f988a1b1 ]
Add missing break statement in order to prevent the code from falling through to the default case.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1 -0
@@ -5660,6 +5660,7 @@ static int rtl8xxxu_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,break ;case WLAN_CIPHER_SUITE_TKIP : key->flags |=IEEE80211_KEY_FLAG_GENERATE_MMIC ; +break ;default :return -EOPNOTSUPP ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/151 brcmsmac: never log "tid x is not aggable" by default
In reply to Greg Kroah-HartmanFrom: Ali MJ Al-Nasrawy <[email protected]>
[ Upstream commit 96fca788e5788b7ea3b0050eb35a343637e0a465 ]
This message greatly spams the log under heavy Tx of frames with BK access class which is especially true when operating as AP. It is also not informative as the "agg'ablity" of TIDs are set once and never change.
Fix this by logging only in debug mode.
--- .../net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +2 -2
@@ -846,8 +846,8 @@ brcms_ops_ampdu_action(struct ieee80211_hw *hw, status =brcms_c_aggregatable (wl->wlc, tid);spin_unlock_bh (&wl->lock);if (!status) { -brcms_err (wl->wlc->hw->d11core, -"START: tid %d is not agg\'able\n" , tid); +brcms_dbg_ht (wl->wlc->hw->d11core, +"START: tid %d is not agg\'able\n" , tid);return -EINVAL ; }ieee80211_start_tx_ba_cb_irqsafe (vif, sta->addr, tid);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/151 macsec: update operstate when lower device changes
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit e6ac075882b2afcdf2d5ab328ce4ab42a1eb9593 ]
Like all other virtual devices (macvlan, vlan), the operstate of a macsec device should match the state of its lower device. This is done by calling netif_stacked_transfer_operstate from its netdevice notifier.
We also need to call netif_stacked_transfer_operstate when a new macsec device is created, so that its operstate is set properly. This is only relevant when we try to bring the device up directly when we create it.
Radu Rendec proposed a similar patch, inspired from the 802.1q driver, that included changing the administrative state of the macsec device, instead of just the operstate. This version is similar to what the macvlan driver does, and updates only the operstate.
--- drivers/net/macsec.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/net/macsec.c +17 -0
@@ -3275,6 +3275,9 @@ static int macsec_newlink(struct net *net, struct net_device *dev,if (err <0 ) goto del_dev; +netif_stacked_transfer_operstate (real_dev, dev); +linkwatch_fire_event (dev); + macsec_generation++;return 0 ;
@@ -3446,6 +3449,20 @@ static int macsec_notify(struct notifier_block *this, unsigned long event,return NOTIFY_DONE ;switch (event) { +case NETDEV_DOWN : +case NETDEV_UP : +case NETDEV_CHANGE : { +struct macsec_dev *m, *n; +struct macsec_rxh_data *rxd; + + rxd =macsec_data_rtnl (real_dev); +list_for_each_entry_safe (m, n, &rxd->secys, secys) { +struct net_device *dev = m->secy.netdev; + +netif_stacked_transfer_operstate (real_dev, dev); + } +break ; + }case NETDEV_UNREGISTER : {struct macsec_dev *m, *n;struct macsec_rxh_data *rxd;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/151 wireless: airo: potential buffer overflow in sprintf()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 3d39e1bb1c88f32820c5f9271f2c8c2fb9a52bac ]
It looks like we wanted to print a maximum of BSSList_rid.ssidLen bytes of the ssid, but we accidentally use "%*s" (width) instead of "%.*s" (precision) so if the ssid doesn't have a NUL terminator this could lead to an overflow.
Static analysis. Not tested.
--- drivers/net/wireless/cisco/airo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/cisco/airo.c +1 -1
@@ -5472,7 +5472,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {we have to add a spin lock... */ rc =readBSSListRid (ai, doLoseSync, &BSSList_rid);while (rc ==0 && BSSList_rid.index !=cpu_to_le16 (0xffff )) { - ptr += sprintf(ptr, "%pM %*s rssi = %d", + ptr += sprintf(ptr, "%pM %.*s rssi = %d", BSSList_rid.bssid, (int)BSSList_rid.ssidLen, BSSList_rid.ssid,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/151 rtlwifi: rtl8192de: Fix misleading REG_MCUFWDL information
In reply to Greg Kroah-HartmanFrom: Shaokun Zhang <[email protected]>
[ Upstream commit 7d129adff3afbd3a449bc3593f2064ac546d58d3 ]
RT_TRACE shows REG_MCUFWDL value as a decimal value with a '0x' prefix, which is somewhat misleading.
Fix it to print hexadecimal, as was intended.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c +1 -1
@@ -234,7 +234,7 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw) rtl_read_byte(rtlpriv, FW_MAC1_READY)); }RT_TRACE (rtlpriv,COMP_FW ,DBG_DMESG , -"Polling FW ready fail!! REG_MCUFWDL:0x%08ul\n" , +"Polling FW ready fail!! REG_MCUFWDL:0x%08x\n" ,rtl_read_dword (rtlpriv,REG_MCUFWDL ));return -1 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/151 scsi: mpt3sas: Fix Sync cache command failure during driver unload
In reply to Greg Kroah-HartmanFrom: Suganath Prabu <[email protected]>
[ Upstream commit 9029a72500b95578a35877a43473b82cb0386c53 ]
This is to fix SYNC CACHE and START STOP command failures with DID_NO_CONNECT during driver unload.
In driver's IO submission patch (i.e. in driver's .queuecommand()) driver won't allow any SCSI commands to the IOC when ioc->remove_host flag is set and hence SYNC CACHE commands which are issued to the target drives (where write cache is enabled) during driver unload time is failed with DID_NO_CONNECT status.
Now modified the driver to allow SYNC CACHE and START STOP commands to IOC, even when remove_host flag is set.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 36 +++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +35 -1
@@ -3297,6 +3297,40 @@ _scsih_tm_tr_complete(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,return _scsih_check_for_pending_tm (ioc, smid); } +/** _scsih_allow_scmd_to_device - check whether scmd needs to +* issue to IOC or not. +* @ioc: per adapter object +* @scmd: pointer to scsi command object +* +* Returns true if scmd can be issued to IOC otherwise returns false. +*/ +inline bool _scsih_allow_scmd_to_device (struct MPT3SAS_ADAPTER *ioc, +struct scsi_cmnd *scmd) +{ + +if (ioc->pci_error_recovery) +return false; + +if (ioc->hba_mpi_version_belonged ==MPI2_VERSION ) { +if (ioc->remove_host) +return false; + +return true; + } + +if (ioc->remove_host) { + +switch (scmd->cmnd[0 ]) { +case SYNCHRONIZE_CACHE : +case START_STOP : +return true; +default : +return false; + } + } + +return true; +}/** * _scsih_sas_control_complete - completion routine
@@ -4059,7 +4093,7 @@ scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd)return 0 ; } -if (ioc->pci_error_recovery || ioc->remove_host) { +if (!(_scsih_allow_scmd_to_device (ioc, scmd))) { scmd->result =DID_NO_CONNECT <<16 ; scmd->scsi_done (scmd);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/151 scsi: megaraid_sas: Fix msleep granularity
In reply to Greg Kroah-HartmanFrom: Shivasharan S <[email protected]>
[ Upstream commit 9155cf30a3c4ef97e225d6daddf9bd4b173267e8 ]
In megasas_transition_to_ready() driver waits 180seconds for controller to change FW state. Here we are calling msleep(1) in a loop for this. As explained in timers-howto.txt, msleep(1) will actually sleep longer than 1ms. If a faulty controller is connected, we will end up waiting for much more than 180 seconds causing unnecessary delays during load.
Change the granularity of msleep() call from 1ms to 1000ms.
--- 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 *1000 ); i++) { +for (i =0 ; i < max_wait; i++) { curr_abs_state = instance->instancet->read_fw_status_reg (instance->reg_set);if (abs_state == curr_abs_state) { -msleep (1 ); +msleep (1000 ); }else break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/151 scsi: lpfc: fcoe: Fix link down issue after 1000+ link bounces
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 036cad1f1ac9ce03e2db94b8460f98eaf1e1ee4c ]
On FCoE adapters, when running link bounce test in a loop, initiator failed to login with switch switch and required driver reload to recover. Switch reached a point where all subsequent FLOGIs would be LS_RJT'd. Further testing showed the condition to be related to not performing FCF discovery between FLOGI's.
Fix by monitoring FLOGI failures and once a repeated error is seen repeat FCF discovery.
--- drivers/scsi/lpfc/lpfc_els.c | 2 ++ drivers/scsi/lpfc/lpfc_hbadisc.c | 20 ++++++++++++++++++++ drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 11 ++--------- drivers/scsi/lpfc/lpfc_sli4.h | 1 + 5 files changed, 26 insertions(+), 10 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +2 -0
@@ -1141,6 +1141,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, phba->fcf.fcf_flag &= ~FCF_DISCOVERY ; phba->hba_flag &= ~(FCF_RR_INPROG |HBA_DEVLOSS_TMO );spin_unlock_irq (&phba->hbalock); + phba->fcf.fcf_redisc_attempted =0 ;/* reset */ goto out; }if (!rc) {
@@ -1155,6 +1156,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, phba->fcf.fcf_flag &= ~FCF_DISCOVERY ; phba->hba_flag &= ~(FCF_RR_INPROG |HBA_DEVLOSS_TMO );spin_unlock_irq (&phba->hbalock); + phba->fcf.fcf_redisc_attempted =0 ;/* reset */ goto out; } }
drivers/scsi/lpfc/lpfc_hbadisc.c +20 -0
@@ -1969,6 +1969,26 @@ int lpfc_sli4_fcf_rr_next_proc(struct lpfc_vport *vport, uint16_t fcf_index)"failover and change port state:x%x/x%x\n" , phba->pport->port_state, LPFC_VPORT_UNKNOWN); phba->pport->port_state =LPFC_VPORT_UNKNOWN ; + +if (!phba->fcf.fcf_redisc_attempted) { +lpfc_unregister_fcf (phba); + + rc =lpfc_sli4_redisc_fcf_table (phba); +if (!rc) { +lpfc_printf_log (phba,KERN_INFO ,LOG_FIP , +"3195 Rediscover FCF table\n" ); + phba->fcf.fcf_redisc_attempted =1 ; +lpfc_sli4_clear_fcf_rr_bmask (phba); + }else { +lpfc_printf_log (phba,KERN_WARNING ,LOG_FIP , +"3196 Rediscover FCF table " +"failed. Status:x%x\n" , rc); + } + }else { +lpfc_printf_log (phba,KERN_WARNING ,LOG_FIP , +"3197 Already rediscover FCF table " +"attempted. No more retry\n" ); + } goto stop_flogi_current_fcf; }else { lpfc_printf_log(phba, KERN_INFO, LOG_FIP | LOG_ELS,
drivers/scsi/lpfc/lpfc_init.c +1 -1
@@ -4444,7 +4444,7 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba,break ; }/* If fast FCF failover rescan event is pending, do nothing */ -if (phba->fcf.fcf_flag &FCF_REDISC_EVT ) { +if (phba->fcf.fcf_flag & (FCF_REDISC_EVT |FCF_REDISC_PEND )) {spin_unlock_irq (&phba->hbalock);break ; }
drivers/scsi/lpfc/lpfc_sli.c +2 -9
@@ -16553,15 +16553,8 @@ lpfc_sli4_fcf_rr_next_index_get(struct lpfc_hba *phba) goto initial_priority;lpfc_printf_log (phba,KERN_WARNING ,LOG_FIP ,"2844 No roundrobin failover FCF available\n" ); -if (next_fcf_index >=LPFC_SLI4_FCF_TBL_INDX_MAX ) -return LPFC_FCOE_FCF_NEXT_NONE ; -else { -lpfc_printf_log (phba,KERN_WARNING ,LOG_FIP , -"3063 Only FCF available idx %d, flag %x\n" , - next_fcf_index, - phba->fcf.fcf_pri[next_fcf_index].fcf_rec.flag); -return next_fcf_index; - } + +return LPFC_FCOE_FCF_NEXT_NONE ; } if (next_fcf_index < LPFC_SLI4_FCF_TBL_INDX_MAX &&
drivers/scsi/lpfc/lpfc_sli4.h +1 -0
@@ -237,6 +237,7 @@ struct lpfc_fcf {#define FCF_REDISC_EVT 0x100/* FCF rediscovery event to worker thread */ #define FCF_REDISC_FOV 0x200/* Post FCF rediscovery fast failover */ #define FCF_REDISC_PROG (FCF_REDISC_PEND | FCF_REDISC_EVT) +uint16_t fcf_redisc_attempted;uint32_t addr_mode;uint32_t eligible_fcf_cnt;struct lpfc_fcf_rec current_rec;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/151 dlm: fix invalid free
In reply to Greg Kroah-HartmanFrom: Tycho Andersen <[email protected]>
[ Upstream commit d968b4e240cfe39d39d80483bac8bca8716fd93c ]
dlm_config_nodes() does not allocate nodes on failure, so we should not free() nodes when it fails.
--- fs/dlm/member.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/dlm/member.c +3 -2
@@ -683,7 +683,7 @@ int dlm_ls_start(struct dlm_ls *ls) error =dlm_config_nodes (ls->ls_name, &nodes, &count);if (error <0 ) - goto fail; + goto fail_rv;spin_lock (&ls->ls_recover_lock);
@@ -715,8 +715,9 @@ int dlm_ls_start(struct dlm_ls *ls)return 0 ; fail: -kfree (rv);kfree (nodes); + fail_rv: +kfree (rv);return error; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/151 dlm: dont leak kernel pointer to userspace
In reply to Greg Kroah-HartmanFrom: Tycho Andersen <[email protected]>
[ Upstream commit 9de30f3f7f4d31037cfbb7c787e1089c1944b3a7 ]
In copy_result_to_user(), we first create a struct dlm_lock_result, which contains a struct dlm_lksb, the last member of which is a pointer to the lvb. Unfortunately, we copy the entire struct dlm_lksb to the result struct, which is then copied to userspace at the end of the function, leaking the contents of sb_lvbptr, which is a valid kernel pointer in some cases (indeed, later in the same function the data it points to is copied to userspace).
It is an error to leak kernel pointers to userspace, as it undermines KASLR protections (see e.g. 65eea8edc31 ("floppy: Do not copy a kernel pointer to user memory in FDGETPRM ioctl") for another example of this).
--- fs/dlm/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/dlm/user.c +1 -1
@@ -700,7 +700,7 @@ static int copy_result_to_user(struct dlm_user_args *ua, int compat, result.version[0 ] =DLM_DEVICE_VERSION_MAJOR ; result.version[1 ] =DLM_DEVICE_VERSION_MINOR ; result.version[2 ] =DLM_DEVICE_VERSION_PATCH ; -memcpy (&result.lksb, &ua->lksb,sizeof (struct dlm_lksb )); +memcpy (&result.lksb, &ua->lksb, offsetof(struct dlm_lksb , sb_lvbptr)); result.user_lksb = ua->user_lksb;/* FIXME: dlm1 provides for the user's bastparam/addr to not be updated
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/151 ACPICA: Use %d for signed int print formatting instead of %u
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit f8ddf49b420112e28bdd23d7ad52d7991a0ccbe3 ]
Fix warnings found using static analysis with cppcheck, use %d printf format specifier for signed ints rather than %u
--- tools/power/acpi/tools/acpidump/apmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/power/acpi/tools/acpidump/apmain.c +1 -1
@@ -139,7 +139,7 @@ static int ap_insert_action(char *argument, u32 to_be_done) current_action++;if (current_action >AP_MAX_ACTIONS ) { -fprintf (stderr,"Too many table options (max %u)\n" , +fprintf (stderr,"Too many table options (max %d)\n" ,AP_MAX_ACTIONS );return (-1 ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/151 net: bcmgenet: return correct value ret from bcmgenet_power_down
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 0db55093b56618088b9a1d445eb6e43b311bea33 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/ethernet/broadcom/genet/bcmgenet.c: In function 'bcmgenet_power_down':drivers/net/ethernet/broadcom/genet/bcmgenet.c:1136:6: warning:
variable 'ret' set but not used [-Wunused-but-set-variable]
bcmgenet_power_down should return 'ret' instead of 0.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -1
@@ -1078,7 +1078,7 @@ static int bcmgenet_power_down(struct bcmgenet_priv *priv,break ; } -return 0 ; +return ret; } static void bcmgenet_power_up(struct bcmgenet_priv *priv,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/151 pinctrl: lpc18xx: Use define directive for PIN_CONFIG_GPIO_PIN_INT
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit f24bfb39975c241374cadebbd037c17960cf1412 ]
Clang warns when one enumerated type is implicitly converted to another:
drivers/pinctrl/pinctrl-lpc18xx.c:643:29: warning: implicit conversion from enumeration type 'enum lpc18xx_pin_config_param' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
{"nxp,gpio-pin-interrupt", PIN_CONFIG_GPIO_PIN_INT, 0},
~ ^~~~~~~~~~~~~~~~~~~~~~~drivers/pinctrl/pinctrl-lpc18xx.c:648:12: warning: implicit conversion from enumeration type 'enum lpc18xx_pin_config_param' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
PCONFDUMP(PIN_CONFIG_GPIO_PIN_INT, "gpio pin int", NULL, true), ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~./include/linux/pinctrl/pinconf-generic.h:163:11: note: expanded from macro 'PCONFDUMP'
.param = a, .display = b, .format = c, .has_arg = d \
^2 warnings generated.
It is expected that pinctrl drivers can extend pin_config_param because of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion isn't an issue. Most drivers that take advantage of this define the PIN_CONFIG variables as constants, rather than enumerated values. Do the same thing here so that Clang no longer warns.
--- drivers/pinctrl/pinctrl-lpc18xx.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/pinctrl/pinctrl-lpc18xx.c +2 -8
@@ -630,14 +630,8 @@ static const struct pinctrl_pin_desc lpc18xx_pins[] = { LPC18XX_PIN(i2c0_sda, PIN_I2C0_SDA), }; -/** -* enum lpc18xx_pin_config_param - possible pin configuration parameters -* @PIN_CONFIG_GPIO_PIN_INT: route gpio to the gpio pin interrupt -* controller. -*/ -enum lpc18xx_pin_config_param { -PIN_CONFIG_GPIO_PIN_INT =PIN_CONFIG_END +1 , -}; +/* PIN_CONFIG_GPIO_PIN_INT: route gpio to the gpio pin interrupt controller */ +#define PIN_CONFIG_GPIO_PIN_INT (PIN_CONFIG_END + 1)static const struct pinconf_generic_params lpc18xx_params[] = { {"nxp,gpio-pin-interrupt" ,PIN_CONFIG_GPIO_PIN_INT ,0 },
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/151 macsec: let the administrator set UP state even if lowerdev is down
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 07bddef9839378bd6f95b393cf24c420529b4ef1 ]
Currently, the kernel doesn't let the administrator set a macsec device up unless its lower device is currently up. This is inconsistent, as a macsec device that is up won't automatically go down when its lower device goes down.
Now that linkstate propagation works, there's really no reason for this limitation, so let's remove it.
--- drivers/net/macsec.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/macsec.c +0 -3
@@ -2798,9 +2798,6 @@ static int macsec_dev_open(struct net_device *dev)struct net_device *real_dev = macsec->real_dev;int err; -if (!(real_dev->flags &IFF_UP )) -return -ENETDOWN ; - err =dev_uc_add (real_dev, dev->dev_addr);if (err <0 )return err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/151 pinctrl: zynq: Use define directive for PIN_CONFIG_IO_STANDARD
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit cd8a145a066a1a3beb0ae615c7cb2ee4217418d7 ]
Clang warns when one enumerated type is implicitly converted to another:
drivers/pinctrl/pinctrl-zynq.c:985:18: warning: implicit conversion from enumeration type 'enum zynq_pin_config_param' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
{"io-standard", PIN_CONFIG_IOSTANDARD, zynq_iostd_lvcmos18},
~ ^~~~~~~~~~~~~~~~~~~~~drivers/pinctrl/pinctrl-zynq.c:990:16: warning: implicit conversion from enumeration type 'enum zynq_pin_config_param' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
= { PCONFDUMP(PIN_CONFIG_IOSTANDARD, "IO-standard", NULL, true),
~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~./include/linux/pinctrl/pinconf-generic.h:163:11: note: expanded from macro 'PCONFDUMP'
.param = a, .display = b, .format = c, .has_arg = d \
^2 warnings generated.
It is expected that pinctrl drivers can extend pin_config_param because of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion isn't an issue. Most drivers that take advantage of this define the PIN_CONFIG variables as constants, rather than enumerated values. Do the same thing here so that Clang no longer warns.
--- drivers/pinctrl/pinctrl-zynq.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/pinctrl/pinctrl-zynq.c +3 -6
@@ -967,15 +967,12 @@ enum zynq_io_standards {zynq_iostd_max }; -/** -* enum zynq_pin_config_param - possible pin configuration parameters -* @PIN_CONFIG_IOSTANDARD: if the pin can select an IO standard, the argument to +/* +* PIN_CONFIG_IOSTANDARD: if the pin can select an IO standard, the argument to * this parameter (on a custom format) tells the driver which alternative * IO standard to use. */ -enum zynq_pin_config_param { -PIN_CONFIG_IOSTANDARD =PIN_CONFIG_END +1 , -}; +#define PIN_CONFIG_IOSTANDARD (PIN_CONFIG_END + 1)static const struct pinconf_generic_params zynq_dt_params[] = { {"io-standard" ,PIN_CONFIG_IOSTANDARD , zynq_iostd_lvcmos18},
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/151 PCI: keystone: Use quirk to limit MRRS for K2G
In reply to Greg Kroah-HartmanFrom: Kishon Vijay Abraham I <[email protected]>
[ Upstream commit 148e340c0696369fadbbddc8f4bef801ed247d71 ]
PCI controller in K2G also has a limitation that memory read request size (MRRS) must not exceed 256 bytes. Use the quirk to limit MRRS (added for K2HK, K2L and K2E) for K2G as well.
--- drivers/pci/host/pci-keystone.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/host/pci-keystone.c +3 -0
@@ -43,6 +43,7 @@#define PCIE_RC_K2HK 0xb008#define PCIE_RC_K2E 0xb009#define PCIE_RC_K2L 0xb00a +#define PCIE_RC_K2G 0xb00b#define to_keystone_pcie (x) container_of(x, struct keystone_pcie, pp)
@@ -57,6 +58,8 @@ static void quirk_limit_mrrs(struct pci_dev *dev) .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, { PCI_DEVICE(PCI_VENDOR_ID_TI, PCIE_RC_K2L), .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, + { PCI_DEVICE(PCI_VENDOR_ID_TI, PCIE_RC_K2G), + .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, { 0, }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/151 linux/bitmap.h: handle constant zero-size bitmaps correctly
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit 7275b097851a5e2e0dd4da039c7e96b59ac5314e ]
The static inlines in bitmap.h do not handle a compile-time constant nbits==0 correctly (they dereference the passed src or dst pointers, despite only 0 words being valid to access). I had the 0-day buildbot chew on a patch [1] that would cause build failures for such cases without complaining, suggesting that we don't have any such users currently, at least for the 70 .config/arch combinations that was built. Should any turn up, make sure they use the out-of-line versions, which do handle nbits==0 correctly.
This is of course not the most efficient, but it's much less churn than teaching all the static inlines an "if (zero_const_nbits())", and since we don't have any current instances, this doesn't affect existing code at all.
[1] lkml.kernel.org/r/[email protected]
--- include/linux/bitmap.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
include/linux/bitmap.h +6 -1
@@ -185,8 +185,13 @@ extern int bitmap_print_to_pagebuf(bool list, char *buf,#define BITMAP_FIRST_WORD_MASK (start) (~0UL << ((start) & (BITS_PER_LONG - 1)))#define BITMAP_LAST_WORD_MASK (nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1))) +/* +* The static inlines below do not handle constant nbits==0 correctly, +* so make such users (should any ever turn up) call the out-of-line +* versions. +*/ #define small_const_nbits (nbits) \ - (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG) + (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG && (nbits) > 0)static inline void bitmap_zero (unsigned long *dst,unsigned int nbits) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/151 um: Make line/tty semantics use true write IRQ
In reply to Greg Kroah-HartmanFrom: Anton Ivanov <[email protected]>
[ Upstream commit 917e2fd2c53eb3c4162f5397555cbd394390d4bc ]
This fixes a long standing bug where large amounts of output could freeze the tty (most commonly seen on stdio console). While the bug has always been there it became more pronounced after moving to the new interrupt controller.
The line semantics are now changed to have true IRQ write semantics which should further improve the tty/line subsystem stability and performance
--- arch/um/drivers/line.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/drivers/line.c +1 -1
@@ -260,7 +260,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)if (err ==0 ) {spin_unlock (&line->lock);return IRQ_NONE ; - }else if (err <0 ) { + }else if ((err <0 ) && (err != -EAGAIN )) { line->head = line->buffer; line->tail = line->buffer; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/151 hfsplus: fix BUG on bnode parent update
In reply to Greg Kroah-HartmanFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 19a9d0f1acf75e8be8cfba19c1a34e941846fa2b ]
Creating, renaming or deleting a file may hit BUG_ON() if the first record of both a leaf node and its parent are changed, and if this forces the parent to be split. This bug is triggered by xfstests generic/027, somewhat rarely; here is a more reliable reproducer:
truncate -s 50M fs.iso
mkfs.hfsplus fs.iso
mount fs.iso /mnt
i=1000
while [ $i -le 2400 ]; do
touch /mnt/$i &>/dev/null
((++i))
done
i=2400
while [ $i -ge 1000 ]; do
mv /mnt/$i /mnt/$(perl -e "print $i x61") &>/dev/null
((--i))
doneThe issue is that a newly created bnode is being put twice. Reset new_node to NULL in hfs_brec_update_parent() before reaching goto again.
--- fs/hfsplus/brec.c | 1 + 1 file changed, 1 insertion(+)
fs/hfsplus/brec.c +1 -0
@@ -447,6 +447,7 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd)/* restore search_key */ hfs_bnode_read_key (node, fd->search_key,14 ); } + new_node =NULL ; }if (!rec && node->parent)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/151 sparc64: Rework xchg() definition to avoid warnings.
In reply to Greg Kroah-HartmanFrom: David S. Miller <[email protected]>
[ Upstream commit 6c2fc9cddc1ffdef8ada1dc8404e5affae849953 ]
Such as:
fs/ocfs2/file.c: In function ‘ocfs2_file_write_iter’:./arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value]
#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
and
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: In function ‘ixgbevf_xdp_setup’:./arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value]
#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
--- arch/sparc/include/asm/cmpxchg_64.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/sparc/include/asm/cmpxchg_64.h +6 -1
@@ -40,7 +40,12 @@ static inline unsigned long xchg64(__volatile__ unsigned long *m, unsigned longreturn val; } -#define xchg (ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) +#define xchg (ptr,x) \ +({ __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))); \ + __ret; \ +})void __xchg_called_with_bad_pointer (void );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/151 mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock
In reply to Greg Kroah-HartmanFrom: zhong jiang <[email protected]>
[ Upstream commit d2ab99403ee00d8014e651728a4702ea1ae5e52c ]
When adding the memory by probing memory block in sysfs interface, there is an obvious issue that we will unlock the device_hotplug_lock when fails to takes it.
That issue was introduced in Commit 8df1d0e4a265 ("mm/memory_hotplug: make add_memory() take the device_hotplug_lock")
We should drop out in time when fails to take the device_hotplug_lock.
--- drivers/base/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/memory.c +1 -1
@@ -502,7 +502,7 @@ memory_probe_store(struct device *dev, struct device_attribute *attr, ret =lock_device_hotplug_sysfs ();if (ret) - goto out; +return ret; nid =memory_add_physaddr_to_nid (phys_addr); ret = __add_memory(nid, phys_addr,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/151 ARC: perf: Accommodate big-endian CPU
In reply to Greg Kroah-HartmanFrom: Alexey Brodkin <[email protected]>
commit 5effc09c4907901f0e71e68e5f2e14211d9a203f upstream.
8-letter strings representing ARC perf events are stores in two 32-bit registers as ASCII characters like that: "IJMP", "IALL", "IJMPTAK" etc.
And the same order of bytes in the word is used regardless CPU endianness.
Which means in case of big-endian CPU core we need to swap bytes to get the same order as if it was on little-endian CPU.
Otherwise we're seeing the following error message on boot:
------------------------->8----------------------
ARC perf : 8 counters (32 bits), 40 conditions, [overflow IRQ support]
sysfs: cannot create duplicate filename '/devices/arc_pct/events/pmji'
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.2.18 #3 Stack Trace: arc_unwind_core+0xd4/0xfc dump_stack+0x64/0x80 sysfs_warn_dup+0x46/0x58 sysfs_add_file_mode_ns+0xb2/0x168 create_files+0x70/0x2a0 ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at kernel/events/core.c:12144 perf_event_sysfs_init+0x70/0xa0 Failed to register pmu: arc_pct, reason -17 Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.2.18 #3 Stack Trace: arc_unwind_core+0xd4/0xfc dump_stack+0x64/0x80 __warn+0x9c/0xd4 warn_slowpath_fmt+0x22/0x2c perf_event_sysfs_init+0x70/0xa0 ---[ end trace a75fb9a9837bd1ec ]---
------------------------->8----------------------
What happens here we're trying to register more than one raw perf event with the same name "PMJI". Why? Because ARC perf events are 4 to 8 letters and encoded into two 32-bit words. In this particular case we deal with 2 events:
* "IJMP____" which counts all jump & branch instructions
* "IJMPC___" which counts only conditional jumps & branches
Those strings are split in two 32-bit words this way "IJMP" + "____" & "IJMP" + "C___" correspondingly. Now if we read them swapped due to CPU core being big-endian then we read "PMJI" + "____" & "PMJI" + "___C".
And since we interpret read array of ASCII letters as a null-terminated string on big-endian CPU we end up with 2 events of the same name "PMJI".
--- arch/arc/kernel/perf_event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arc/kernel/perf_event.c +2 -2
@@ -488,8 +488,8 @@ static int arc_pmu_device_probe(struct p/* loop thru all available h/w condition indexes */ for (j =0 ; j < cc_bcr.c; j++) {write_aux_reg (ARC_REG_CC_INDEX , j); - cc_name.indiv.word0 =read_aux_reg (ARC_REG_CC_NAME0 ); - cc_name.indiv.word1 =read_aux_reg (ARC_REG_CC_NAME1 ); + cc_name.indiv.word0 =le32_to_cpu (read_aux_reg (ARC_REG_CC_NAME0 )); + cc_name.indiv.word1 =le32_to_cpu (read_aux_reg (ARC_REG_CC_NAME1 ));/* See if it has been mapped to a perf event_id */ for (i =0 ; i <ARRAY_SIZE (arc_pmu_ev_hw_map); i++) {
Greg Kroah-Hartman
maintainerPATCH 119/151 x86/insn: Fix awk regexp warnings
In reply to Greg Kroah-HartmanFrom: Alexander Kapshuk <[email protected]>
commit 700c1018b86d0d4b3f1f2d459708c0cdf42b521d upstream.
gawk 5.0.1 generates the following regexp warnings:
GEN /home/sasha/torvalds/tools/objtool/arch/x86/lib/inat-tables.c
awk: ../arch/x86/tools/gen-insn-attr-x86.awk:260: warning: regexp escape sequence `\:' is not a known regexp operator
awk: ../arch/x86/tools/gen-insn-attr-x86.awk:350: (FILENAME=../arch/x86/lib/x86-opcode-map.txt FNR=41) warning: regexp escape sequence `\&' is not a known regexp operator
Ealier versions of gawk are not known to generate these warnings. The gawk manual referenced below does not list characters ':' and '&' as needing escaping, so 'unescape' them. See
https://www.gnu.org/software/gawk/manual/html_node/Escape-Sequences.html
for more info.
Running diff on the output generated by the script before and after applying the patch reported no differences.
[ bp: Massage commit message. ]
--- arch/x86/tools/gen-insn-attr-x86.awk | 4 ++-- tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/tools/gen-insn-attr-x86.awk +2 -2
@@ -68,7 +68,7 @@ BEGIN { lprefix1_expr = "\\((66|!F3)\\)" lprefix2_expr = "\\(F3\\)" - lprefix3_expr = "\\((F2|!F3|66\\&F2)\\)" + lprefix3_expr = "\\((F2|!F3|66&F2)\\)" lprefix_expr = "\\((66|F2|F3)\\)" max_lprefix = 4
@@ -256,7 +256,7 @@ function convert_operands(count,opnd, return add_flags(imm, mod) } -/^[0-9a-f]+\:/ { +/^[0-9a-f]+:/ { if (NR == 1) next # get index
tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk +2 -2
@@ -68,7 +68,7 @@ BEGIN { lprefix1_expr = "\\((66|!F3)\\)" lprefix2_expr = "\\(F3\\)" - lprefix3_expr = "\\((F2|!F3|66\\&F2)\\)" + lprefix3_expr = "\\((F2|!F3|66&F2)\\)" lprefix_expr = "\\((66|F2|F3)\\)" max_lprefix = 4
@@ -256,7 +256,7 @@ function convert_operands(count,opnd, return add_flags(imm, mod) } -/^[0-9a-f]+\:/ { +/^[0-9a-f]+:/ { if (NR == 1) next # get index
Greg Kroah-Hartman
maintainerPATCH 120/151 x86/speculation: Fix incorrect MDS/TAA mitigation status
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
commit 64870ed1b12e235cfca3f6c6da75b542c973ff78 upstream.
For MDS vulnerable processors with TSX support, enabling either MDS or TAA mitigations will enable the use of VERW to flush internal processor buffers at the right code path. IOW, they are either both mitigated or both not. However, if the command line options are inconsistent, the vulnerabilites sysfs files may not report the mitigation status correctly.
For example, with only the "mds=off" option:
vulnerabilities/mds:Vulnerable; SMT vulnerable vulnerabilities/tsx_async_abort:Mitigation: Clear CPU buffers; SMT vulnerable
The mds vulnerabilities file has wrong status in this case. Similarly, the taa vulnerability file will be wrong with mds mitigation on, but taa off.
Change taa_select_mitigation() to sync up the two mitigation status and have them turned off if both "mds=off" and "tsx_async_abort=off" are present.
Update documentation to emphasize the fact that both "mds=off" and "tsx_async_abort=off" have to be specified together for processors that are affected by both TAA and MDS to be effective.
[ bp: Massage and add kernel-parameters.txt change too. ]
--- Documentation/hw-vuln/mds.rst | 7 +++++-- Documentation/hw-vuln/tsx_async_abort.rst | 5 ++++- Documentation/kernel-parameters.txt | 11 +++++++++++ arch/x86/kernel/cpu/bugs.c | 17 +++++++++++++++-- 4 files changed, 35 insertions(+), 5 deletions(-)
Documentation/hw-vuln/mds.rst +5 -2
@@ -265,8 +265,11 @@ time with the option "mds=". The valid a ============ ============================================================= -Not specifying this option is equivalent to "mds=full". - +Not specifying this option is equivalent to "mds=full". For processors +that are affected by both TAA (TSX Asynchronous Abort) and MDS, +specifying just "mds=off" without an accompanying "tsx_async_abort=off" +will have no effect as the same mitigation is used for both +vulnerabilities. Mitigation selection guide --------------------------
Documentation/hw-vuln/tsx_async_abort.rst +4 -1
@@ -174,7 +174,10 @@ the option "tsx_async_abort=". The valid CPU is not vulnerable to cross-thread TAA attacks. ============ ============================================================= -Not specifying this option is equivalent to "tsx_async_abort=full". +Not specifying this option is equivalent to "tsx_async_abort=full". For +processors that are affected by both TAA and MDS, specifying just +"tsx_async_abort=off" without an accompanying "mds=off" will have no +effect as the same mitigation is used for both vulnerabilities. The kernel command line also allows to control the TSX feature using the parameter "tsx=" on CPUs which support TSX control. MSR_IA32_TSX_CTRL is used
Documentation/kernel-parameters.txt +11 -0
@@ -2365,6 +2365,12 @@ bytes respectively. Such letter suffixes SMT on vulnerable CPUs off - Unconditionally disable MDS mitigation + On TAA-affected machines, mds=off can be prevented by + an active TAA mitigation as both vulnerabilities are + mitigated with the same mechanism so in order to disable + this mitigation, you need to specify tsx_async_abort=off + too. + Not specifying this option is equivalent to mds=full.
@@ -4599,6 +4605,11 @@ bytes respectively. Such letter suffixes vulnerable to cross-thread TAA attacks. off - Unconditionally disable TAA mitigation + On MDS-affected machines, tsx_async_abort=off can be + prevented by an active MDS mitigation as both vulnerabilities + are mitigated with the same mechanism so in order to disable + this mitigation, you need to specify mds=off too. + Not specifying this option is equivalent to tsx_async_abort=full. On CPUs which are MDS affected and deploy MDS mitigation, TAA mitigation is not
arch/x86/kernel/cpu/bugs.c +15 -2
@@ -303,8 +303,12 @@ static void __init taa_select_mitigationreturn ; } -/* TAA mitigation is turned off on the cmdline (tsx_async_abort=off) */ -if (taa_mitigation ==TAA_MITIGATION_OFF ) +/* +* TAA mitigation via VERW is turned off if both +* tsx_async_abort=off and mds=off are specified. +*/ +if (taa_mitigation ==TAA_MITIGATION_OFF && + mds_mitigation ==MDS_MITIGATION_OFF ) goto out;if (boot_cpu_has (X86_FEATURE_MD_CLEAR ))
@@ -338,6 +342,15 @@ static void __init taa_select_mitigationif (taa_nosmt ||cpu_mitigations_auto_nosmt ())cpu_smt_disable (false); +/* +* Update MDS mitigation, if necessary, as the mds_user_clear is +* now enabled for TAA mitigation. +*/ +if (mds_mitigation ==MDS_MITIGATION_OFF && +boot_cpu_has_bug (X86_BUG_MDS )) { + mds_mitigation =MDS_MITIGATION_FULL ; +mds_select_mitigation (); + } out:pr_info ("%s\n" , taa_strings[taa_mitigation]); }
Greg Kroah-Hartman
maintainerPATCH 123/151 l2tp: dont use l2tp_tunnel_find() in l2tp_ip and l2tp_ip6
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
commit 8f7dc9ae4a7aece9fbc3e6637bdfa38b36bcdf09 upstream.
Using l2tp_tunnel_find() in l2tp_ip_recv() is wrong for two reasons:
* It doesn't take a reference on the returned tunnel, which makes the call racy wrt. concurrent tunnel deletion.
* The lookup is only based on the tunnel identifier, so it can return a tunnel that doesn't match the packet's addresses or protocol.
For example, a packet sent to an L2TPv3 over IPv6 tunnel can be delivered to an L2TPv2 over UDPv4 tunnel. This is worse than a simple
cross-talk: when delivering the packet to an L2TP over UDP tunnel, the corresponding socket is UDP, where ->sk_backlog_rcv() is NULL. Calling sk_receive_skb() will then crash the kernel by trying to execute this callback.
And l2tp_tunnel_find() isn't even needed here. __l2tp_ip_bind_lookup() properly checks the socket binding and connection settings. It was used as a fallback mechanism for finding tunnels that didn't have their data path registered yet. But it's not limited to this case and can be used to replace l2tp_tunnel_find() in the general case.
Fix l2tp_ip6 in the same way.
--- net/l2tp/l2tp_ip.c | 24 +++++++++--------------- net/l2tp/l2tp_ip6.c | 24 +++++++++--------------- 2 files changed, 18 insertions(+), 30 deletions(-)
net/l2tp/l2tp_ip.c +9 -15
@@ -116,6 +116,7 @@ static int l2tp_ip_recv(struct sk_buff *unsigned char *ptr, *optr;struct l2tp_session *session;struct l2tp_tunnel *tunnel =NULL ; +struct iphdr *iph;int length;if (!pskb_may_pull (skb,4 ))
@@ -174,24 +175,17 @@ pass_up: goto discard; tunnel_id =ntohl (*(__be32 *) &skb->data[4 ]); - tunnel =l2tp_tunnel_find (net, tunnel_id); -if (tunnel) { - sk = tunnel->sock; -sock_hold (sk); - }else { -struct iphdr *iph = (struct iphdr *)skb_network_header (skb); - -read_lock_bh (&l2tp_ip_lock); - sk =__l2tp_ip_bind_lookup (net, iph->daddr, iph->saddr, -inet_iif (skb), tunnel_id); -if (!sk) { -read_unlock_bh (&l2tp_ip_lock); - goto discard; - } + iph = (struct iphdr *)skb_network_header (skb); -sock_hold (sk); +read_lock_bh (&l2tp_ip_lock); + sk =__l2tp_ip_bind_lookup (net, iph->daddr, iph->saddr,inet_iif (skb), + tunnel_id); +if (!sk) {read_unlock_bh (&l2tp_ip_lock); + goto discard; } +sock_hold (sk); +read_unlock_bh (&l2tp_ip_lock);if (!xfrm4_policy_check (sk,XFRM_POLICY_IN , skb)) goto discard_put;
net/l2tp/l2tp_ip6.c +9 -15
@@ -128,6 +128,7 @@ static int l2tp_ip6_recv(struct sk_buffunsigned char *ptr, *optr;struct l2tp_session *session;struct l2tp_tunnel *tunnel =NULL ; +struct ipv6hdr *iph;int length;if (!pskb_may_pull (skb,4 ))
@@ -187,24 +188,17 @@ pass_up: goto discard; tunnel_id =ntohl (*(__be32 *) &skb->data[4 ]); - tunnel =l2tp_tunnel_find (net, tunnel_id); -if (tunnel) { - sk = tunnel->sock; -sock_hold (sk); - }else { -struct ipv6hdr *iph =ipv6_hdr (skb); - -read_lock_bh (&l2tp_ip6_lock); - sk =__l2tp_ip6_bind_lookup (net, &iph->daddr, &iph->saddr, -inet6_iif (skb), tunnel_id); -if (!sk) { -read_unlock_bh (&l2tp_ip6_lock); - goto discard; - } + iph =ipv6_hdr (skb); -sock_hold (sk); +read_lock_bh (&l2tp_ip6_lock); + sk =__l2tp_ip6_bind_lookup (net, &iph->daddr, &iph->saddr, +inet6_iif (skb), tunnel_id); +if (!sk) {read_unlock_bh (&l2tp_ip6_lock); + goto discard; } +sock_hold (sk); +read_unlock_bh (&l2tp_ip6_lock);if (!xfrm6_policy_check (sk,XFRM_POLICY_IN , skb)) goto discard_put;
Greg Kroah-Hartman
maintainerPATCH 121/151 x86/speculation: Fix redundant MDS mitigation message
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
commit cd5a2aa89e847bdda7b62029d94e95488d73f6b2 upstream.
Since MDS and TAA mitigations are inter-related for processors that are affected by both vulnerabilities, the followiing confusing messages can be printed in the kernel log:
MDS: Vulnerable
MDS: Mitigation: Clear CPU buffers
To avoid the first incorrect message, defer the printing of MDS mitigation after the TAA mitigation selection has been done. However, that has the side effect of printing TAA mitigation first before MDS mitigation.
[ bp: Check box is affected/mitigations are disabled first before
printing and massage. ]
--- arch/x86/kernel/cpu/bugs.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/x86/kernel/cpu/bugs.c +13 -0
@@ -38,6 +38,7 @@ static void __init spectre_v2_select_mitstatic void __init ssb_select_mitigation (void );static void __init l1tf_select_mitigation (void );static void __init mds_select_mitigation (void ); +static void __init mds_print_mitigation (void );static void __init taa_select_mitigation (void );/* The base value of the SPEC_CTRL MSR that always has to be preserved. */
@@ -107,6 +108,12 @@ void __init check_bugs(void)mds_select_mitigation ();taa_select_mitigation (); +/* +* As MDS and TAA mitigations are inter-related, print MDS +* mitigation until after TAA mitigation selection is done. +*/ +mds_print_mitigation (); +arch_smt_update ();#ifdef CONFIG_X86_32
@@ -244,6 +251,12 @@ static void __init mds_select_mitigation (mds_nosmt || cpu_mitigations_auto_nosmt()))cpu_smt_disable (false); } +} + +static void __init mds_print_mitigation (void ) +{ +if (!boot_cpu_has_bug (X86_BUG_MDS ) ||cpu_mitigations_off ()) +return ;pr_info ("%s\n" , mds_strings[mds_mitigation]); }
Greg Kroah-Hartman
maintainerPATCH 124/151 media: vivid: Set vid_cap_streaming and vid_out_streaming to true
In reply to Greg Kroah-HartmanFrom: Vandana BN <[email protected]>
commit b4add02d2236fd5f568db141cfd8eb4290972eb3 upstream.
When vbi stream is started, followed by video streaming,
the vid_cap_streaming and vid_out_streaming were not being set to true, which would cause the video stream to stop when vbi stream is stopped. This patch allows to set vid_cap_streaming and vid_out_streaming to true. According to Hans Verkuil it appears that these 'if (dev->kthread_vid_cap)' checks are a left-over from the original vivid development and should never have been there.
--- drivers/media/platform/vivid/vivid-vid-cap.c | 3 --- drivers/media/platform/vivid/vivid-vid-out.c | 3 --- 2 files changed, 6 deletions(-)
drivers/media/platform/vivid/vivid-vid-cap.c +0 -3
@@ -236,9 +236,6 @@ static int vid_cap_start_streaming(strucif (vb2_is_streaming (&dev->vb_vid_out_q)) dev->can_loop_video =vivid_vid_can_loop (dev); -if (dev->kthread_vid_cap) -return 0 ; - dev->vid_cap_seq_count =0 ;dprintk (dev,1 ,"%s\n" , __func__);for (i =0 ; i <VIDEO_MAX_FRAME ; i++)
drivers/media/platform/vivid/vivid-vid-out.c +0 -3
@@ -158,9 +158,6 @@ static int vid_out_start_streaming(strucif (vb2_is_streaming (&dev->vb_vid_cap_q)) dev->can_loop_video =vivid_vid_can_loop (dev); -if (dev->kthread_vid_out) -return 0 ; - dev->vid_out_seq_count =0 ;dprintk (dev,1 ,"%s\n" , __func__);if (dev->start_streaming_error) {
Greg Kroah-Hartman
maintainerPATCH 126/151 media: usbvision: Fix races among open, close, and disconnect
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 9e08117c9d4efc1e1bc6fce83dab856d9fd284b6 upstream.
Visual inspection of the usbvision driver shows that it suffers from three races between its open, close, and disconnect handlers. In particular, the driver is careful to update its usbvision->user and usbvision->remove_pending flags while holding the private mutex, but:
usbvision_v4l2_close() and usbvision_radio_close() don't hold the mutex while they check the value of usbvision->remove_pending;
usbvision_disconnect() doesn't hold the mutex while checking the value of usbvision->user; and
also, usbvision_v4l2_open() and usbvision_radio_open() don't check whether the device has been unplugged before allowing the user to open the device files.
Each of these can potentially lead to usbvision_release() being called twice and use-after-free errors.
This patch fixes the races by reading the flags while the mutex is still held and checking for pending removes before allowing an open to succeed.
--- drivers/media/usb/usbvision/usbvision-video.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/media/usb/usbvision/usbvision-video.c +18 -3
@@ -332,6 +332,10 @@ static int usbvision_v4l2_open(struct fiif (mutex_lock_interruptible (&usbvision->v4l2_lock))return -ERESTARTSYS ; +if (usbvision->remove_pending) { + err_code = -ENODEV ; + goto unlock; + }if (usbvision->user) { err_code = -EBUSY ; }else {
@@ -395,6 +399,7 @@ unlock:static int usbvision_v4l2_close (struct file *file) {struct usb_usbvision *usbvision =video_drvdata (file); +int r;PDEBUG (DBG_IO ,"close" );
@@ -409,9 +414,10 @@ static int usbvision_v4l2_close(struct fusbvision_scratch_free (usbvision); usbvision->user--; + r = usbvision->remove_pending;mutex_unlock (&usbvision->v4l2_lock); -if (usbvision->remove_pending) { +if (r) {printk (KERN_INFO "%s: Final disconnect\n" , __func__);usbvision_release (usbvision);return 0 ;
@@ -1095,6 +1101,11 @@ static int usbvision_radio_open(struct fif (mutex_lock_interruptible (&usbvision->v4l2_lock))return -ERESTARTSYS ; + +if (usbvision->remove_pending) { + err_code = -ENODEV ; + goto out; + } err_code =v4l2_fh_open (file);if (err_code) goto out;
@@ -1127,6 +1138,7 @@ out:static int usbvision_radio_close (struct file *file) {struct usb_usbvision *usbvision =video_drvdata (file); +int r;PDEBUG (DBG_IO ,"" );
@@ -1139,9 +1151,10 @@ static int usbvision_radio_close(structusbvision_audio_off (usbvision); usbvision->radio =0 ; usbvision->user--; + r = usbvision->remove_pending;mutex_unlock (&usbvision->v4l2_lock); -if (usbvision->remove_pending) { +if (r) {printk (KERN_INFO "%s: Final disconnect\n" , __func__);v4l2_fh_release (file);usbvision_release (usbvision);
@@ -1568,6 +1581,7 @@ err_usb:static void usbvision_disconnect (struct usb_interface *intf) {struct usb_usbvision *usbvision =to_usbvision (usb_get_intfdata (intf)); +int u;PDEBUG (DBG_PROBE ,"" );
@@ -1584,13 +1598,14 @@ static void usbvision_disconnect(structv4l2_device_disconnect (&usbvision->v4l2_dev);usbvision_i2c_unregister (usbvision); usbvision->remove_pending =1 ;/* Now all ISO data will be ignored */ + u = usbvision->user;usb_put_dev (usbvision->dev); usbvision->dev =NULL ;/* USB device is no more */ mutex_unlock (&usbvision->v4l2_lock); -if (usbvision->user) { +if (u) {printk (KERN_INFO "%s: In use, disconnect pending\n" , __func__);wake_up_interruptible (&usbvision->wait_frame);
Greg Kroah-Hartman
maintainerPATCH 127/151 cpufreq: Add NULL checks to show() and store() methods of cpufreq
In reply to Greg Kroah-HartmanFrom: Kai Shen <[email protected]>
commit e6e8df07268c1f75dd9215536e2ce4587b70f977 upstream.
Add NULL checks to show() and store() in cpufreq.c to avoid attempts to invoke a NULL callback.
Though some interfaces of cpufreq are set as read-only, users can still get write permission using chmod which can lead to a kernel crash, as follows:
chmod +w /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq echo 1 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
This bug was found in linux 4.19.
--- drivers/cpufreq/cpufreq.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/cpufreq/cpufreq.c +6 -0
@@ -875,6 +875,9 @@ static ssize_t show(struct kobject *kobjstruct freq_attr *fattr =to_attr (attr);ssize_t ret; +if (!fattr->show) +return -EIO ; +down_read (&policy->rwsem); ret = fattr->show (policy, buf);up_read (&policy->rwsem);
@@ -889,6 +892,9 @@ static ssize_t store(struct kobject *kobstruct freq_attr *fattr =to_attr (attr);ssize_t ret = -EINVAL ; +if (!fattr->store) +return -EIO ; +get_online_cpus ();if (cpu_online (policy->cpu)) {
Greg Kroah-Hartman
maintainerPATCH 110/151 Bluetooth: Fix invalid-free in bcsp_close()
In reply to Greg Kroah-HartmanFrom: Tomas Bortoli <[email protected]>
commit cf94da6f502d8caecabd56b194541c873c8a7a3c upstream.
Syzbot reported an invalid-free that I introduced fixing a memleak.
bcsp_recv() also frees bcsp->rx_skb but never nullifies its value. Nullify bcsp->rx_skb every time it is freed.
--- drivers/bluetooth/hci_bcsp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/hci_bcsp.c +3 -0
@@ -605,6 +605,7 @@ static int bcsp_recv(struct hci_uart *huif (*ptr ==0xc0 ) {BT_ERR ("Short BCSP packet" );kfree_skb (bcsp->rx_skb); + bcsp->rx_skb =NULL ; bcsp->rx_state =BCSP_W4_PKT_START ; bcsp->rx_count =0 ; }else
@@ -620,6 +621,7 @@ static int bcsp_recv(struct hci_uart *hu bcsp->rx_skb->data[2])) != bcsp->rx_skb->data[3]) {BT_ERR ("Error in BCSP hdr checksum" );kfree_skb (bcsp->rx_skb); + bcsp->rx_skb =NULL ; bcsp->rx_state =BCSP_W4_PKT_DELIMITER ; bcsp->rx_count =0 ;continue ;
@@ -644,6 +646,7 @@ static int bcsp_recv(struct hci_uart *hu bscp_get_crc(bcsp));kfree_skb (bcsp->rx_skb); + bcsp->rx_skb =NULL ; bcsp->rx_state =BCSP_W4_PKT_DELIMITER ; bcsp->rx_count =0 ;continue ;
Greg Kroah-Hartman
maintainerPATCH 128/151 media: uvcvideo: Fix error path in control parsing failure
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
commit 8c279e9394cade640ed86ec6c6645a0e7df5e0b6 upstream.
When parsing the UVC control descriptors fails, the error path tries to cleanup a media device that hasn't been initialised, potentially resulting in a crash. Fix this by initialising the media device before the error handling path can be reached.
--- drivers/media/usb/uvc/uvc_driver.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
drivers/media/usb/uvc/uvc_driver.c +16 -14
@@ -2021,6 +2021,21 @@ static int uvc_probe(struct usb_interfacle16_to_cpu (udev->descriptor.idVendor), le16_to_cpu(udev->descriptor.idProduct)); +/* Initialize the media device. */ +#ifdef CONFIG_MEDIA_CONTROLLER + dev->mdev.dev = &intf->dev; +strscpy (dev->mdev.model, dev->name,sizeof (dev->mdev.model)); +if (udev->serial) +strscpy (dev->mdev.serial, udev->serial, +sizeof (dev->mdev.serial)); +usb_make_path (udev, dev->mdev.bus_info,sizeof (dev->mdev.bus_info)); + dev->mdev.hw_revision =le16_to_cpu (udev->descriptor.bcdDevice); + dev->mdev.driver_version =LINUX_VERSION_CODE ; +media_device_init (&dev->mdev); + + dev->vdev.mdev = &dev->mdev; +#endif +/* Parse the Video Class control descriptor. */ if (uvc_parse_control (dev) <0 ) { uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC "
@@ -2041,20 +2056,7 @@ static int uvc_probe(struct usb_interfac "linux-uvc-devel mailing list.\n"); } -/* Initialize the media device and register the V4L2 device. */ -#ifdef CONFIG_MEDIA_CONTROLLER - dev->mdev.dev = &intf->dev; -strlcpy (dev->mdev.model, dev->name,sizeof (dev->mdev.model)); -if (udev->serial) -strlcpy (dev->mdev.serial, udev->serial, -sizeof (dev->mdev.serial)); -strcpy (dev->mdev.bus_info, udev->devpath); - dev->mdev.hw_revision =le16_to_cpu (udev->descriptor.bcdDevice); - dev->mdev.driver_version =LINUX_VERSION_CODE ; -media_device_init (&dev->mdev); - - dev->vdev.mdev = &dev->mdev; -#endif +/* Register the V4L2 device. */ if (v4l2_device_register (&intf->dev, &dev->vdev) <0 ) goto error;
Greg Kroah-Hartman
maintainerPATCH 130/151 media: cxusb: detect cxusb_ctrl_msg error in query
In reply to Greg Kroah-HartmanFrom: Vito Caputo <[email protected]>
commit ca8f245f284eeffa56f3b7a5eb6fc503159ee028 upstream.
Don't use uninitialized ircode[] in cxusb_rc_query() when cxusb_ctrl_msg() fails to populate its contents.
syzbot reported:
dvb-usb: bulk message failed: -22 (1/-30591)
=====================================================
BUG: KMSAN: uninit-value in ir_lookup_by_scancode drivers/media/rc/rc-main.c:494 [inline] BUG: KMSAN: uninit-value in rc_g_keycode_from_table drivers/media/rc/rc-main.c:582 [inline] BUG: KMSAN: uninit-value in rc_keydown+0x1a6/0x6f0 drivers/media/rc/rc-main.c:816 CPU: 1 PID: 11436 Comm: kworker/1:2 Not tainted 5.3.0-rc7+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: events dvb_usb_read_remote_control Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x191/0x1f0 lib/dump_stack.c:113 kmsan_report+0x13a/0x2b0 mm/kmsan/kmsan_report.c:108 __msan_warning+0x73/0xe0 mm/kmsan/kmsan_instr.c:250 bsearch+0x1dd/0x250 lib/bsearch.c:41 ir_lookup_by_scancode drivers/media/rc/rc-main.c:494 [inline] rc_g_keycode_from_table drivers/media/rc/rc-main.c:582 [inline] rc_keydown+0x1a6/0x6f0 drivers/media/rc/rc-main.c:816 cxusb_rc_query+0x2e1/0x360 drivers/media/usb/dvb-usb/cxusb.c:548 dvb_usb_read_remote_control+0xf9/0x290 drivers/media/usb/dvb-usb/dvb-usb-remote.c:261 process_one_work+0x1572/0x1ef0 kernel/workqueue.c:2269 worker_thread+0x111b/0x2460 kernel/workqueue.c:2415 kthread+0x4b5/0x4f0 kernel/kthread.c:256 ret_from_fork+0x35/0x40 arch/x86/entry/entry_64.S:355
Uninit was stored to memory at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:150 [inline] kmsan_internal_chain_origin+0xd2/0x170 mm/kmsan/kmsan.c:314 __msan_chain_origin+0x6b/0xe0 mm/kmsan/kmsan_instr.c:184 rc_g_keycode_from_table drivers/media/rc/rc-main.c:583 [inline] rc_keydown+0x2c4/0x6f0 drivers/media/rc/rc-main.c:816 cxusb_rc_query+0x2e1/0x360 drivers/media/usb/dvb-usb/cxusb.c:548 dvb_usb_read_remote_control+0xf9/0x290 drivers/media/usb/dvb-usb/dvb-usb-remote.c:261 process_one_work+0x1572/0x1ef0 kernel/workqueue.c:2269 worker_thread+0x111b/0x2460 kernel/workqueue.c:2415 kthread+0x4b5/0x4f0 kernel/kthread.c:256 ret_from_fork+0x35/0x40 arch/x86/entry/entry_64.S:355
Local variable description: ----ircode@cxusb_rc_query Variable was created at:
cxusb_rc_query+0x4d/0x360 drivers/media/usb/dvb-usb/cxusb.c:543 dvb_usb_read_remote_control+0xf9/0x290 drivers/media/usb/dvb-usb/dvb-usb-remote.c:261
--- drivers/media/usb/dvb-usb/cxusb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb/cxusb.c +2 -1
@@ -437,7 +437,8 @@ static int cxusb_rc_query(struct dvb_usbu8 ircode[4 ];int i; -cxusb_ctrl_msg (d,CMD_GET_IR_CODE ,NULL ,0 , ircode,4 ); +if (cxusb_ctrl_msg (d,CMD_GET_IR_CODE ,NULL ,0 , ircode,4 ) <0 ) +return 0 ; *event =0 ; *state =REMOTE_NO_KEY_PRESSED ;
Greg Kroah-Hartman
maintainerPATCH 131/151 media: imon: invalid dereference in imon_touch_event
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit f3f5ba42c58d56d50f539854d8cc188944e96087 upstream.
The touch timer is set up in intf1. If the second interface does not exist, the timer and touch input device are not setup and we get the following error, when touch events are reported via intf0.
kernel BUG at kernel/time/timer.c:956!
invalid opcode: 0000 [#1] SMP KASAN
CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.4.0-rc1+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:__mod_timer kernel/time/timer.c:956 [inline] RIP: 0010:__mod_timer kernel/time/timer.c:949 [inline] RIP: 0010:mod_timer+0x5a2/0xb50 kernel/time/timer.c:1100 Code: 45 10 c7 44 24 14 ff ff ff ff 48 89 44 24 08 48 8d 45 20 48 c7 44 24 18 00 00 00 00 48 89 04 24 e9 5a fc ff ff e8 ae ce 0e 00 <0f> 0b e8 a7 ce 0e 00 4c 89 74 24 20 e9 37 fe ff ff e8 98 ce 0e 00 RSP: 0018:ffff8881db209930 EFLAGS: 00010006 RAX: ffffffff86c2b200 RBX: 00000000ffffa688 RCX: ffffffff83efc583 RDX: 0000000000000100 RSI: ffffffff812f4d82 RDI: ffff8881d2356200 RBP: ffff8881d23561e8 R08: ffffffff86c2b200 R09: ffffed103a46abeb R10: ffffed103a46abea R11: ffff8881d2355f53 R12: dffffc0000000000 R13: 1ffff1103b64132d R14: ffff8881d2355f50 R15: 0000000000000006 FS: 0000000000000000(0000) GS:ffff8881db200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f75e2799000 CR3: 00000001d3b07000 CR4: 00000000001406f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <IRQ> imon_touch_event drivers/media/rc/imon.c:1348 [inline] imon_incoming_packet.isra.0+0x2546/0x2f10 drivers/media/rc/imon.c:1603 usb_rx_callback_intf0+0x151/0x1e0 drivers/media/rc/imon.c:1734 __usb_hcd_giveback_urb+0x1f2/0x470 drivers/usb/core/hcd.c:1654 usb_hcd_giveback_urb+0x368/0x420 drivers/usb/core/hcd.c:1719 dummy_timer+0x120f/0x2fa2 drivers/usb/gadget/udc/dummy_hcd.c:1965 call_timer_fn+0x179/0x650 kernel/time/timer.c:1404 expire_timers kernel/time/timer.c:1449 [inline] __run_timers kernel/time/timer.c:1773 [inline] __run_timers kernel/time/timer.c:1740 [inline] run_timer_softirq+0x5e3/0x1490 kernel/time/timer.c:1786 __do_softirq+0x221/0x912 kernel/softirq.c:292 invoke_softirq kernel/softirq.c:373 [inline] irq_exit+0x178/0x1a0 kernel/softirq.c:413 exiting_irq arch/x86/include/asm/apic.h:536 [inline] smp_apic_timer_interrupt+0x12f/0x500 arch/x86/kernel/apic/apic.c:1137 apic_timer_interrupt+0xf/0x20 arch/x86/entry/entry_64.S:830 </IRQ> RIP: 0010:default_idle+0x28/0x2e0 arch/x86/kernel/process.c:581 Code: 90 90 41 56 41 55 65 44 8b 2d 44 3a 8f 7a 41 54 55 53 0f 1f 44 00 00 e8 36 ee d0 fb e9 07 00 00 00 0f 00 2d fa dd 4f 00 fb f4 <65> 44 8b 2d 20 3a 8f 7a 0f 1f 44 00 00 5b 5d 41 5c 41 5d 41 5e c3 RSP: 0018:ffffffff86c07da8 EFLAGS: 00000246 ORIG_RAX: ffffffffffffff13 RAX: 0000000000000007 RBX: ffffffff86c2b200 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000006 RDI: ffffffff86c2ba4c RBP: fffffbfff0d85640 R08: ffffffff86c2b200 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 cpuidle_idle_call kernel/sched/idle.c:154 [inline] do_idle+0x3b6/0x500 kernel/sched/idle.c:263 cpu_startup_entry+0x14/0x20 kernel/sched/idle.c:355 start_kernel+0x82a/0x864 init/main.c:784 secondary_startup_64+0xa4/0xb0 arch/x86/kernel/head_64.S:241 Modules linked in:
--- drivers/media/rc/imon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/rc/imon.c +1 -2
@@ -1644,8 +1644,7 @@ static void imon_incoming_packet(structspin_unlock_irqrestore (&ictx->kc_lock, flags);/* send touchscreen events through input subsystem if touchpad data */ -if (ictx->display_type ==IMON_DISPLAY_TYPE_VGA && len ==8 && - buf[7 ] ==0x86 ) { +if (ictx->touch && len ==8 && buf[7 ] ==0x86 ) {imon_touch_event (ictx, buf);return ;
Greg Kroah-Hartman
maintainerPATCH 132/151 virtio_console: reset on out of memory
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit 5c60300d68da32ca77f7f978039dc72bfc78b06b ]
When out of memory and we can't add ctrl vq buffers, probe fails. Unfortunately the error handling is out of spec: it calls del_vqs without bothering to reset the device first.
To fix, call the full cleanup function in this case.
--- drivers/char/virtio_console.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/char/virtio_console.c +10 -7
@@ -2073,6 +2073,7 @@ static int virtcons_probe(struct virtio_device *vdev)spin_lock_init (&portdev->ports_lock);INIT_LIST_HEAD (&portdev->ports); +INIT_LIST_HEAD (&portdev->list);virtio_device_ready (portdev->vdev);
@@ -2090,8 +2091,15 @@ static int virtcons_probe(struct virtio_device *vdev)if (!nr_added_bufs) {dev_err (&vdev->dev,"Error allocating buffers for control queue\n" ); - err = -ENOMEM ; - goto free_vqs; +/* +* The host might want to notify mgmt sw about device +* add failure. +*/ +__send_control_msg (portdev,VIRTIO_CONSOLE_BAD_ID , +VIRTIO_CONSOLE_DEVICE_READY ,0 ); +/* Device was functional: we need full cleanup. */ +virtcons_remove (vdev); +return -ENOMEM ; } }else {/*
@@ -2122,11 +2130,6 @@ static int virtcons_probe(struct virtio_device *vdev)return 0 ; -free_vqs: -/* The host might want to notify mgmt sw about device add failure */ -__send_control_msg (portdev,VIRTIO_CONSOLE_BAD_ID , -VIRTIO_CONSOLE_DEVICE_READY ,0 ); -remove_vqs (portdev); free_chrdev:unregister_chrdev (portdev->chr_major,"virtio-portsdev" ); free:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/151 virtio_console: allocate inbufs in add_port() only if it is needed
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit d791cfcbf98191122af70b053a21075cb450d119 ]
When we hot unplug a virtserialport and then try to hot plug again, it fails:
(qemu) chardev-add socket,id=serial0,path=/tmp/serial0,server,nowait (qemu) device_add virtserialport,bus=virtio-serial0.0,nr=2,\
chardev=serial0,id=serial0,name=serial0
(qemu) device_del serial0
(qemu) device_add virtserialport,bus=virtio-serial0.0,nr=2,\
chardev=serial0,id=serial0,name=serial0
kernel error:
virtio-ports vport2p2: Error allocating inbufs
qemu error:
virtio-serial-bus: Guest failure in adding port 2 for device \
virtio-serial0.0
This happens because buffers for the in_vq are allocated when the port is added but are not released when the port is unplugged.
They are only released when virtconsole is removed (see a7a69ec0d8e4)
To avoid the problem and to be symmetric, we could allocate all the buffers in init_vqs() as they are released in remove_vqs(), but it sounds like a waste of memory.
Rather than that, this patch changes add_port() logic to ignore ENOSPC error in fill_queue(), which means queue has already been filled.
--- drivers/char/virtio_console.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/char/virtio_console.c +13 -15
@@ -1369,24 +1369,24 @@ static void set_console_size(struct port *port, u16 rows, u16 cols) port->cons.ws.ws_col = cols; } -static unsigned int fill_queue (struct virtqueue *vq,spinlock_t *lock) +static int fill_queue (struct virtqueue *vq,spinlock_t *lock) {struct port_buffer *buf; -unsigned int nr_added_bufs; +int nr_added_bufs;int ret; nr_added_bufs =0 ; do { buf = alloc_buf(vq->vdev, PAGE_SIZE, 0); if (!buf) - break; + return -ENOMEM; spin_lock_irq(lock); ret = add_inbuf(vq, buf); if (ret < 0) { spin_unlock_irq(lock); free_buf(buf, true); - break; + return ret; } nr_added_bufs++; spin_unlock_irq(lock);
@@ -1406,7 +1406,6 @@ static int add_port(struct ports_device *portdev, u32 id)char debugfs_name[16 ];struct port *port;dev_t devt; -unsigned int nr_added_bufs;int err; port =kmalloc (sizeof (*port),GFP_KERNEL );
@@ -1465,11 +1464,13 @@ static int add_port(struct ports_device *portdev, u32 id)spin_lock_init (&port->outvq_lock);init_waitqueue_head (&port->waitqueue); -/* Fill the in_vq with buffers so the host can send us data. */ - nr_added_bufs =fill_queue (port->in_vq, &port->inbuf_lock); -if (!nr_added_bufs) { +/* We can safely ignore ENOSPC because it means +* the queue already has buffers. Buffers are removed +* only by virtcons_remove(), not by unplug_port() +*/ + err =fill_queue (port->in_vq, &port->inbuf_lock); +if (err <0 && err != -ENOSPC ) {dev_err (port->dev,"Error allocating inbufs\n" ); - err = -ENOMEM ; goto free_device; }
@@ -2081,14 +2082,11 @@ static int virtcons_probe(struct virtio_device *vdev)INIT_WORK (&portdev->control_work, &control_work_handler);if (multiport) { -unsigned int nr_added_bufs; -spin_lock_init (&portdev->c_ivq_lock);spin_lock_init (&portdev->c_ovq_lock); - nr_added_bufs =fill_queue (portdev->c_ivq, - &portdev->c_ivq_lock); -if (!nr_added_bufs) { + err =fill_queue (portdev->c_ivq, &portdev->c_ivq_lock); +if (err <0 ) {dev_err (&vdev->dev,"Error allocating buffers for control queue\n" );/*
@@ -2099,7 +2097,7 @@ static int virtcons_probe(struct virtio_device *vdev) VIRTIO_CONSOLE_DEVICE_READY, 0);/* Device was functional: we need full cleanup. */ virtcons_remove (vdev); -return -ENOMEM ; +return err; } }else {/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/151 virtio_console: dont tie bufs to a vq
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit 2855b33514d290c51d52d94e25d3ef942cd4d578 ]
an allocated buffer doesn't need to be tied to a vq - only vq->vdev is ever used. Pass the function the just what it needs - the vdev.
--- drivers/char/virtio_console.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/char/virtio_console.c +7 -7
@@ -422,7 +422,7 @@ static void reclaim_dma_bufs(void) } } -static struct port_buffer *alloc_buf (struct virtqueue *vq,size_t buf_size, +static struct port_buffer *alloc_buf (struct virtio_device *vdev,size_t buf_size,int pages) {struct port_buffer *buf;
@@ -445,7 +445,7 @@ static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size,return buf; } -if (is_rproc_serial (vq->vdev)) { +if (is_rproc_serial (vdev)) {/* * Allocate DMA memory from ancestor. When a virtio * device is created by remoteproc, the DMA memory is
@@ -455,9 +455,9 @@ static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size,* DMA_MEMORY_INCLUDES_CHILDREN had been supported * in dma-coherent.c */ -if (!vq->vdev->dev.parent || !vq->vdev->dev.parent->parent) +if (!vdev->dev.parent || !vdev->dev.parent->parent) goto free_buf; - buf->dev = vq->vdev->dev.parent->parent; + buf->dev = vdev->dev.parent->parent;/* Increase device refcnt to avoid freeing it */ get_device (buf->dev);
@@ -841,7 +841,7 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, count =min ((size_t )(32 *1024 ), count); - buf =alloc_buf (port->out_vq, count,0 ); + buf =alloc_buf (port->portdev->vdev, count,0 );if (!buf)return -ENOMEM ;
@@ -960,7 +960,7 @@ static ssize_t port_fops_splice_write(struct pipe_inode_info *pipe,if (ret <0 ) goto error_out; - buf =alloc_buf (port->out_vq,0 , pipe->nrbufs); + buf =alloc_buf (port->portdev->vdev,0 , pipe->nrbufs);if (!buf) { ret = -ENOMEM ; goto error_out;
@@ -1377,7 +1377,7 @@ static unsigned int fill_queue(struct virtqueue *vq, spinlock_t *lock) nr_added_bufs =0 ; do { - buf = alloc_buf(vq, PAGE_SIZE, 0); + buf = alloc_buf(vq->vdev, PAGE_SIZE, 0); if (!buf) break;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/151 virtio_console: fix uninitialized variable use
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit 2055997f983c6db7b5c3940ce5f8f822657d5bc3 ]
We try to disable callbacks on c_ivq even without multiport even though that vq is not initialized in this configuration.
--- drivers/char/virtio_console.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/char/virtio_console.c +4 -2
@@ -2203,14 +2203,16 @@ static int virtcons_freeze(struct virtio_device *vdev) vdev->config->reset (vdev); -virtqueue_disable_cb (portdev->c_ivq); +if (use_multiport (portdev)) +virtqueue_disable_cb (portdev->c_ivq);cancel_work_sync (&portdev->control_work);cancel_work_sync (&portdev->config_work);/* * Once more: if control_work_handler() was running, it would * enable the cb as the last step. */ -virtqueue_disable_cb (portdev->c_ivq); +if (use_multiport (portdev)) +virtqueue_disable_cb (portdev->c_ivq);remove_controlq_data (portdev);list_for_each_entry (port, &portdev->ports, list) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/151 virtio_console: drop custom control queue cleanup
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit 61a8950c5c5708cf2068b29ffde94e454e528208 ]
We now cleanup all VQs on device removal - no need to handle the control VQ specially.
--- drivers/char/virtio_console.c | 17 ----------------- 1 file changed, 17 deletions(-)
drivers/char/virtio_console.c +0 -17
@@ -1993,21 +1993,6 @@ static void remove_vqs(struct ports_device *portdev)kfree (portdev->out_vqs); } -static void remove_controlq_data (struct ports_device *portdev) -{ -struct port_buffer *buf; -unsigned int len; - -if (!use_multiport (portdev)) -return ; - -while ((buf =virtqueue_get_buf (portdev->c_ivq, &len))) -free_buf (buf, true); - -while ((buf =virtqueue_detach_unused_buf (portdev->c_ivq))) -free_buf (buf, true); -} -/* * Once we're further in boot, we get probed like any other virtio * device.
@@ -2168,7 +2153,6 @@ static void virtcons_remove(struct virtio_device *vdev)* have to just stop using the port, as the vqs are going * away. */ -remove_controlq_data (portdev);remove_vqs (portdev);kfree (portdev); }
@@ -2213,7 +2197,6 @@ static int virtcons_freeze(struct virtio_device *vdev)*/ if (use_multiport (portdev))virtqueue_disable_cb (portdev->c_ivq); -remove_controlq_data (portdev);list_for_each_entry (port, &portdev->ports, list) {virtqueue_disable_cb (port->in_vq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/151 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit a78986aae9b2988f8493f9f65a587ee433e83bc3 upstream.
Explicitly exempt ZONE_DEVICE pages from kvm_is_reserved_pfn() and instead manually handle ZONE_DEVICE on a case-by-case basis. For things like page refcounts, KVM needs to treat ZONE_DEVICE pages like normal pages, e.g. put pages grabbed via gup(). But for flows such as setting A/D bits or shifting refcounts for transparent huge pages, KVM needs to to avoid processing ZONE_DEVICE pages as the flows in question lack the underlying machinery for proper handling of ZONE_DEVICE pages.
This fixes a hang reported by Adam Borowski[*] in dev_pagemap_cleanup() when running a KVM guest backed with /dev/dax memory, as KVM straight up doesn't put any references to ZONE_DEVICE pages acquired by gup().
Note, Dan Williams proposed an alternative solution of doing put_page() on ZONE_DEVICE pages immediately after gup() in order to simplify the auditing needed to ensure is_zone_device_page() is called if and only if the backing device is pinned (via gup()). But that approach would break kvm_vcpu_{un}map() as KVM requires the page to be pinned from map() 'til unmap() when accessing guest memory, unlike KVM's secondary MMU, which coordinates with mmu_notifier invalidations to avoid creating stale page references, i.e. doesn't rely on pages being pinned.
[*] http://lkml.kernel.org/r/[email protected]
--- arch/x86/kvm/mmu.c | 8 ++++---- include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 26 +++++++++++++++++++++++--- 3 files changed, 28 insertions(+), 7 deletions(-)
arch/x86/kvm/mmu.c +4 -4
@@ -2934,7 +2934,7 @@ static void transparent_hugepage_adjust(* here. */ if (!is_error_noslot_pfn (pfn) && !kvm_is_reserved_pfn (pfn) && - level ==PT_PAGE_TABLE_LEVEL && + !kvm_is_zone_device_pfn (pfn) && level ==PT_PAGE_TABLE_LEVEL &&PageTransCompoundMap (pfn_to_page (pfn)) && !mmu_gfn_lpage_is_disallowed (vcpu, gfn,PT_DIRECTORY_LEVEL )) {unsigned long mask;
@@ -4890,9 +4890,9 @@ restart:* the guest, and the guest page table is using 4K page size * mapping if the indirect sp has level = 1. */ -if (sp->role.direct && - !kvm_is_reserved_pfn (pfn) && -PageTransCompoundMap (pfn_to_page (pfn))) { +if (sp->role.direct && !kvm_is_reserved_pfn (pfn) && + !kvm_is_zone_device_pfn (pfn) && +PageTransCompoundMap (pfn_to_page (pfn))) {drop_spte (kvm, sptep); need_tlb_flush =1 ; goto restart;
include/linux/kvm_host.h +1 -0
@@ -843,6 +843,7 @@ int kvm_cpu_has_pending_timer(struct kvmvoid kvm_vcpu_kick (struct kvm_vcpu *vcpu);bool kvm_is_reserved_pfn (kvm_pfn_t pfn); +bool kvm_is_zone_device_pfn (kvm_pfn_t pfn);struct kvm_irq_ack_notifier {struct hlist_node link;
virt/kvm/kvm_main.c +23 -3
@@ -131,10 +131,30 @@ __weak void kvm_arch_mmu_notifier_invali { } +bool kvm_is_zone_device_pfn (kvm_pfn_t pfn) +{ +/* +* The metadata used by is_zone_device_page() to determine whether or +* not a page is ZONE_DEVICE is guaranteed to be valid if and only if +* the device has been pinned, e.g. by get_user_pages(). WARN if the +* page_count() is zero to help detect bad usage of this helper. +*/ +if (!pfn_valid (pfn) ||WARN_ON_ONCE (!page_count (pfn_to_page (pfn)))) +return false; + +return is_zone_device_page (pfn_to_page (pfn)); +} +bool kvm_is_reserved_pfn (kvm_pfn_t pfn) { +/* +* ZONE_DEVICE pages currently set PG_reserved, but from a refcounting +* perspective they are "normal" pages, albeit with slightly different +* usage rules. +*/ if (pfn_valid (pfn)) -return PageReserved (pfn_to_page (pfn)); +return PageReserved (pfn_to_page (pfn)) && + !kvm_is_zone_device_pfn (pfn);return true; }
@@ -1758,7 +1778,7 @@ static void kvm_release_pfn_dirty(kvm_pfvoid kvm_set_pfn_dirty (kvm_pfn_t pfn) { -if (!kvm_is_reserved_pfn (pfn)) { +if (!kvm_is_reserved_pfn (pfn) && !kvm_is_zone_device_pfn (pfn)) {struct page *page =pfn_to_page (pfn);if (!PageReserved (page))
@@ -1769,7 +1789,7 @@ EXPORT_SYMBOL_GPL(kvm_set_pfn_dirty);void kvm_set_pfn_accessed (kvm_pfn_t pfn) { -if (!kvm_is_reserved_pfn (pfn)) +if (!kvm_is_reserved_pfn (pfn) && !kvm_is_zone_device_pfn (pfn))mark_page_accessed (pfn_to_page (pfn)); }EXPORT_SYMBOL_GPL (kvm_set_pfn_accessed);
Greg Kroah-Hartman
maintainerPATCH 140/151 usb-serial: cp201x: support Mark-10 digital force gauge
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit 347bc8cb26388791c5881a3775cb14a3f765a674 upstream.
Add support for the Mark-10 digital force gauge device to the cp201x driver.
Based on a report and a larger patch from Joel Jennings
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -122,6 +122,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */ { USB_DEVICE(0x10C4, 0x8382) }, /* Cygnal Integrated Products, Inc. */ { USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */ + { USB_DEVICE(0x10C4, 0x83AA) }, /* Mark-10 Digital Force Gauge */ { USB_DEVICE(0x10C4, 0x83D8) }, /* DekTec DTA Plus VHF/UHF Booster/Attenuator */ { USB_DEVICE(0x10C4, 0x8411) }, /* Kyocera GPS Module */ { USB_DEVICE(0x10C4, 0x8418) }, /* IRZ Automation Teleport SG-10 GSM/GPRS Modem */
Greg Kroah-Hartman
maintainerPATCH 138/151 virtio_console: move removal code
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit aa44ec867030a72e8aa127977e37dec551d8df19 ]
Will make it reusable for error handling.
--- drivers/char/virtio_console.c | 72 +++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-)
drivers/char/virtio_console.c +36 -36
@@ -1993,6 +1993,42 @@ static void remove_vqs(struct ports_device *portdev)kfree (portdev->out_vqs); } +static void virtcons_remove (struct virtio_device *vdev) +{ +struct ports_device *portdev; +struct port *port, *port2; + + portdev = vdev->priv; + +spin_lock_irq (&pdrvdata_lock); +list_del (&portdev->list); +spin_unlock_irq (&pdrvdata_lock); + +/* Disable interrupts for vqs */ + vdev->config->reset (vdev); +/* Finish up work that's lined up */ +if (use_multiport (portdev)) +cancel_work_sync (&portdev->control_work); +else +cancel_work_sync (&portdev->config_work); + +list_for_each_entry_safe (port, port2, &portdev->ports, list) +unplug_port (port); + +unregister_chrdev (portdev->chr_major,"virtio-portsdev" ); + +/* +* When yanking out a device, we immediately lose the +* (device-side) queues. So there's no point in keeping the +* guest side around till we drop our final reference. This +* also means that any ports which are in an open state will +* have to just stop using the port, as the vqs are going +* away. +*/ +remove_vqs (portdev); +kfree (portdev); +} +/* * Once we're further in boot, we get probed like any other virtio * device.
@@ -2121,42 +2157,6 @@ fail:return err; } -static void virtcons_remove (struct virtio_device *vdev) -{ -struct ports_device *portdev; -struct port *port, *port2; - - portdev = vdev->priv; - -spin_lock_irq (&pdrvdata_lock); -list_del (&portdev->list); -spin_unlock_irq (&pdrvdata_lock); - -/* Disable interrupts for vqs */ - vdev->config->reset (vdev); -/* Finish up work that's lined up */ -if (use_multiport (portdev)) -cancel_work_sync (&portdev->control_work); -else -cancel_work_sync (&portdev->config_work); - -list_for_each_entry_safe (port, port2, &portdev->ports, list) -unplug_port (port); - -unregister_chrdev (portdev->chr_major,"virtio-portsdev" ); - -/* -* When yanking out a device, we immediately lose the -* (device-side) queues. So there's no point in keeping the -* guest side around till we drop our final reference. This -* also means that any ports which are in an open state will -* have to just stop using the port, as the vqs are going -* away. -*/ -remove_vqs (portdev); -kfree (portdev); -} -static struct virtio_device_id id_table[] = { {VIRTIO_ID_CONSOLE ,VIRTIO_DEV_ANY_ID }, {0 },
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/151 USB: chaoskey: fix error case of a timeout
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 92aa5986f4f7b5a8bf282ca0f50967f4326559f5 upstream.
In case of a timeout or if a signal aborts a read communication with the device needs to be ended lest we overwrite an active URB the next time we do IO to the device, as the URB may still be active.
--- drivers/usb/misc/chaoskey.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/usb/misc/chaoskey.c +21 -3
@@ -412,13 +412,17 @@ static int _chaoskey_fill(struct chaoske !dev->reading, (started ? NAK_TIMEOUT : ALEA_FIRST_TIMEOUT) ); -if (result <0 ) +if (result <0 ) { +usb_kill_urb (dev->urb); goto out; + } -if (result ==0 ) +if (result ==0 ) { result = -ETIMEDOUT ; -else +usb_kill_urb (dev->urb); + }else { result = dev->valid; + } out:/* Let the device go back to sleep eventually */ usb_autopm_put_interface (dev->interface);
@@ -554,7 +558,21 @@ static int chaoskey_suspend(struct usb_istatic int chaoskey_resume (struct usb_interface *interface) { +struct chaoskey *dev; +struct usb_device *udev =interface_to_usbdev (interface); +usb_dbg (interface,"resume" ); + dev =usb_get_intfdata (interface); + +/* +* We may have lost power. +* In that case the device that needs a long time +* for the first requests needs an extended timeout +* again +*/ +if (le16_to_cpu (udev->descriptor.idVendor) ==ALEA_VENDOR_ID ) + dev->reads_started = false; +return 0 ; }#else
Greg Kroah-Hartman
maintainerPATCH 142/151 appledisplay: fix error handling in the scheduled work
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 91feb01596e5efc0cc922cc73f5583114dccf4d2 upstream.
The work item can operate on
1. stale memory left over from the last transfer the actual length of the data transfered needs to be checked
2. memory already freed
the error handling in appledisplay_probe() needs to cancel the work in that case
--- drivers/usb/misc/appledisplay.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/usb/misc/appledisplay.c +7 -1
@@ -182,7 +182,12 @@ static int appledisplay_bl_get_brightnes0 , pdata->msgdata,2 , ACD_USB_TIMEOUT); - brightness = pdata->msgdata[1 ]; +if (retval <2 ) { +if (retval >=0 ) + retval = -EMSGSIZE ; + }else { + brightness = pdata->msgdata[1 ]; + }mutex_unlock (&pdata->sysfslock);if (retval <0 )
@@ -324,6 +329,7 @@ error:if (pdata) {if (pdata->urb) {usb_kill_urb (pdata->urb); +cancel_delayed_work_sync (&pdata->work);if (pdata->urbdata)usb_free_coherent (pdata->udev,ACD_URB_BUFFER_LEN , pdata->urbdata, pdata->urb->transfer_dma);
Greg Kroah-Hartman
maintainerPATCH 143/151 USB: serial: mos7840: add USB ID to support Moxa UPort 2210
In reply to Greg Kroah-HartmanFrom: Pavel Löbl <[email protected]>
commit e696d00e65e81d46e911f24b12e441037bf11b38 upstream.
Add USB ID for MOXA UPort 2210. This device contains mos7820 but it passes GPIO0 check implemented by driver and it's detected as mos7840. Hence product id check is added to force mos7820 mode.
--- drivers/usb/serial/mos7840.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/usb/serial/mos7840.c +11 -0
@@ -131,11 +131,15 @@/* This driver also supports * ATEN UC2324 device using Moschip MCS7840 * ATEN UC2322 device using Moschip MCS7820 +* MOXA UPort 2210 device using Moschip MCS7820 */ #define USB_VENDOR_ID_ATENINTL 0x0557#define ATENINTL_DEVICE_ID_UC2324 0x2011#define ATENINTL_DEVICE_ID_UC2322 0x7820 +#define USB_VENDOR_ID_MOXA 0x110a +#define MOXA_DEVICE_ID_2210 0x2210 +/* Interrupt Routine Defines */ #define SERIAL_IIR_RLS 0x06
@@ -206,6 +210,7 @@ static const struct usb_device_id id_tab {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)}, + {USB_DEVICE(USB_VENDOR_ID_MOXA, MOXA_DEVICE_ID_2210)}, {} /* terminating entry */ };MODULE_DEVICE_TABLE (usb, id_table);
@@ -2089,6 +2094,7 @@ static int mos7840_probe(struct usb_seri const struct usb_device_id *id) {u16 product =le16_to_cpu (serial->dev->descriptor.idProduct); +u16 vid =le16_to_cpu (serial->dev->descriptor.idVendor);u8 *buf;int device_type;
@@ -2098,6 +2104,11 @@ static int mos7840_probe(struct usb_seri goto out; } +if (vid ==USB_VENDOR_ID_MOXA && product ==MOXA_DEVICE_ID_2210 ) { + device_type =MOSCHIP_DEVICE_ID_7820 ; + goto out; + } + buf =kzalloc (VENDOR_READ_LENGTH ,GFP_KERNEL );if (!buf)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 145/151 USB: serial: mos7840: fix remote wakeup
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 92fe35fb9c70a00d8fbbf5bd6172c921dd9c7815 upstream.
The driver was setting the device remote-wakeup feature during probe in violation of the USB specification (which says it should only be set just prior to suspending the device). This could potentially waste power during suspend as well as lead to spurious wakeups.
Note that USB core would clear the remote-wakeup feature at first resume.
--- drivers/usb/serial/mos7840.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/usb/serial/mos7840.c +0 -5
@@ -2361,11 +2361,6 @@ out: goto error; }else dev_dbg (&port->dev,"ZLP_REG5 Writing success status%d\n" , status); - -/* setting configuration feature to one */ -usb_control_msg (serial->dev,usb_sndctrlpipe (serial->dev,0 ), -0x03 ,0x00 ,0x01 ,0x00 ,NULL ,0x00 , -MOS_WDR_TIMEOUT ); }return 0 ; error:
Greg Kroah-Hartman
maintainerPATCH 144/151 USB: serial: mos7720: fix remote wakeup
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit ea422312a462696093b5db59d294439796cba4ad upstream.
The driver was setting the device remote-wakeup feature during probe in violation of the USB specification (which says it should only be set just prior to suspending the device). This could potentially waste power during suspend as well as lead to spurious wakeups.
Note that USB core would clear the remote-wakeup feature at first resume.
--- drivers/usb/serial/mos7720.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/usb/serial/mos7720.c +0 -4
@@ -1941,10 +1941,6 @@ static int mos7720_startup(struct usb_se } } -/* setting configuration feature to one */ -usb_control_msg (serial->dev,usb_sndctrlpipe (serial->dev,0 ), - (__u8 )0x03 ,0x00 ,0x01 ,0x00 ,NULL ,0x00 ,5000 ); -#ifdef CONFIG_USB_SERIAL_MOS7715_PARPORT if (product ==MOSCHIP_DEVICE_ID_7715 ) { ret_val =mos7715_parport_init (serial);
Greg Kroah-Hartman
maintainerPATCH 146/151 USB: serial: option: add support for DW5821e with eSIM support
In reply to Greg Kroah-HartmanFrom: Aleksander Morgado <[email protected]>
commit 957c31ea082e3fe5196f46d5b04018b10de47400 upstream.
The device exposes AT, NMEA and DIAG ports in both USB configurations. Exactly same layout as the default DW5821e module, just a different vid/pid.
P: Vendor=413c ProdID=81e0 Rev=03.18 S: Manufacturer=Dell Inc. S: Product=DW5821e-eSIM Snapdragon X20 LTE S: SerialNumber=0123456789ABCDEF C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
P: Vendor=413c ProdID=81e0 Rev=03.18 S: Manufacturer=Dell Inc. S: Product=DW5821e-eSIM Snapdragon X20 LTE S: SerialNumber=0123456789ABCDEF C: #Ifs= 7 Cfg#= 2 Atr=a0 MxPwr=500mA I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option I: If#=0x6 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
--- drivers/usb/serial/option.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/option.c +3 -0
@@ -200,6 +200,7 @@ static void option_instat_callback(struc#define DELL_PRODUCT_5804_MINICARD_ATT 0x819b/* Novatel E371 */ #define DELL_PRODUCT_5821E 0x81d7 +#define DELL_PRODUCT_5821E_ESIM 0x81e0#define KYOCERA_VENDOR_ID 0x0c88#define KYOCERA_PRODUCT_KPC650 0x17da
@@ -1043,6 +1044,8 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5804_MINICARD_ATT, 0xff, 0xff, 0xff) }, { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5821E), .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, + { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5821E_ESIM), + .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, /* ADU-E100, ADU-310 */ { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },
Greg Kroah-Hartman
maintainerPATCH 112/151 ath9k_hw: fix uninitialized variable data
In reply to Greg Kroah-HartmanFrom: Denis Efremov <[email protected]>
commit 80e84f36412e0c5172447b6947068dca0d04ee82 upstream.
Currently, data variable in ar9003_hw_thermo_cal_apply() could be uninitialized if ar9300_otp_read_word() will fail to read the value. Initialize data variable with 0 to prevent an undefined behavior. This will be enough to handle error case when ar9300_otp_read_word() fails.
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +1 -1
@@ -4115,7 +4115,7 @@ static void ar9003_hw_thermometer_apply(static void ar9003_hw_thermo_cal_apply (struct ath_hw *ah) { -u32 data, ko, kg; +u32 data =0 , ko, kg;if (!AR_SREV_9462_20_OR_LATER (ah))return ;
Greg Kroah-Hartman
maintainerPATCH 148/151 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error
In reply to Greg Kroah-HartmanFrom: Bernd Porr <[email protected]>
commit 5618332e5b955b4bff06d0b88146b971c8dd7b32 upstream.
The userspace comedilib function 'get_cmd_generic_timed' fills the cmd structure with an informed guess and then calls the function 'usbduxfast_ai_cmdtest' in this driver repeatedly while 'usbduxfast_ai_cmdtest' is modifying the cmd struct until it no longer changes. However, because of rounding errors this never converged because 'steps = (cmd->convert_arg * 30) / 1000' and then back to 'cmd->convert_arg = (steps * 1000) / 30' won't be the same because of rounding errors. 'Steps' should only be converted back to the 'convert_arg' if 'steps' has actually been modified. In addition the case of steps being 0 wasn't checked which is also now done.
--- drivers/staging/comedi/drivers/usbduxfast.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/staging/comedi/drivers/usbduxfast.c +14 -7
@@ -1,5 +1,5 @@/* -* Copyright (C) 2004-2014 Bernd Porr, [email protected] +* Copyright (C) 2004-2019 Bernd Porr, [email protected] * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@* Description: University of Stirling USB DAQ & INCITE Technology Limited * Devices: [ITL] USB-DUX-FAST (usbduxfast) * Author: Bernd Porr <[email protected]> -* Updated: 10 Oct 2014 +* Updated: 16 Nov 2019 * Status: stable */
@@ -31,6 +31,7 @@* * * Revision history: +* 1.0: Fixed a rounding error in usbduxfast_ai_cmdtest * 0.9: Dropping the first data packet which seems to be from the last transfer. * Buffer overflows in the FX2 are handed over to comedi. * 0.92: Dropping now 4 packets. The quad buffer has to be emptied.
@@ -359,6 +360,7 @@ static int usbduxfast_ai_cmdtest(struct struct comedi_cmd *cmd) {int err =0 ; +int err2 =0 ;unsigned int steps;unsigned int arg;
@@ -408,11 +410,16 @@ static int usbduxfast_ai_cmdtest(struct*/ steps = (cmd->convert_arg *30 ) /1000 ;if (cmd->chanlist_len !=1 ) - err |=comedi_check_trigger_arg_min (&steps, -MIN_SAMPLING_PERIOD ); - err |=comedi_check_trigger_arg_max (&steps,MAX_SAMPLING_PERIOD ); - arg = (steps *1000 ) /30 ; - err |=comedi_check_trigger_arg_is (&cmd->convert_arg, arg); + err2 |=comedi_check_trigger_arg_min (&steps, +MIN_SAMPLING_PERIOD ); +else + err2 |=comedi_check_trigger_arg_min (&steps,1 ); + err2 |=comedi_check_trigger_arg_max (&steps,MAX_SAMPLING_PERIOD ); +if (err2) { + err |= err2; + arg = (steps *1000 ) /30 ; + err |=comedi_check_trigger_arg_is (&cmd->convert_arg, arg); + }if (cmd->stop_src ==TRIG_COUNT ) err |=comedi_check_trigger_arg_min (&cmd->stop_arg,1 );
Greg Kroah-Hartman
maintainerPATCH 149/151 powerpc/64s: support nospectre_v2 cmdline option
In reply to Greg Kroah-HartmanFrom: "Christopher M. Riedl" <[email protected]>
commit d8f0e0b073e1ec52a05f0c2a56318b47387d2f10 upstream.
Add support for disabling the kernel implemented spectre v2 mitigation (count cache flush on context switch) via the nospectre_v2 and mitigations=off cmdline options.
--- arch/powerpc/kernel/security.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
arch/powerpc/kernel/security.c +16 -3
@@ -29,7 +29,7 @@ static enum count_cache_flush_type countbool barrier_nospec_enabled;static bool no_nospec;static bool btb_flush_enabled; -#ifdef CONFIG_PPC_FSL_BOOK3E +#if defined(CONFIG_PPC_FSL_BOOK3E ) || defined(CONFIG_PPC_BOOK3S_64 )static bool no_spectrev2;#endif
@@ -107,7 +107,7 @@ static __init int barrier_nospec_debugfsdevice_initcall (barrier_nospec_debugfs_init);#endif /* CONFIG_DEBUG_FS */ -#ifdef CONFIG_PPC_FSL_BOOK3E +#if defined(CONFIG_PPC_FSL_BOOK3E ) || defined(CONFIG_PPC_BOOK3S_64 )static int __init handle_nospectre_v2 (char *p) { no_spectrev2 = true;
@@ -115,6 +115,9 @@ static int __init handle_nospectre_v2(chreturn 0 ; }early_param ("nospectre_v2" , handle_nospectre_v2); +#endif /* CONFIG_PPC_FSL_BOOK3E || CONFIG_PPC_BOOK3S_64 */ + +#ifdef CONFIG_PPC_FSL_BOOK3E void setup_spectre_v2 (void ) {if (no_spectrev2)
@@ -392,7 +395,17 @@ static void toggle_count_cache_flush(boovoid setup_count_cache_flush (void ) { -toggle_count_cache_flush (true); +bool enable = true; + +if (no_spectrev2 ||cpu_mitigations_off ()) { +if (security_ftr_enabled (SEC_FTR_BCCTRL_SERIALISED ) || +security_ftr_enabled (SEC_FTR_COUNT_CACHE_DISABLED )) +pr_warn ("Spectre v2 mitigations not under software control, can't disable\n" ); + + enable = false; + } + +toggle_count_cache_flush (enable); }#ifdef CONFIG_DEBUG_FS
Greg Kroah-Hartman
maintainerPATCH 150/151 powerpc/book3s64: Fix link stack flush on context switch
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit 39e72bf96f5847ba87cc5bd7a3ce0fed813dc9ad upstream.
In commit ee13cb249fab ("powerpc/64s: Add support for software count cache flush"), I added support for software to flush the count cache (indirect branch cache) on context switch if firmware told us that was the required mitigation for Spectre v2.
As part of that code we also added a software flush of the link stack (return address stack), which protects against Spectre-RSB between user processes.
That is all correct for CPUs that activate that mitigation, which is currently Power9 Nimbus DD2.3.
What I got wrong is that on older CPUs, where firmware has disabled the count cache, we also need to flush the link stack on context switch.
To fix it we create a new feature bit which is not set by firmware, which tells us we need to flush the link stack. We set that when firmware tells us that either of the existing Spectre v2 mitigations are enabled.
Then we adjust the patching code so that if we see that feature bit we enable the link stack flush. If we're also told to flush the count cache in software then we fall through and do that also.
On the older CPUs we don't need to do do the software count cache flush, firmware has disabled it, so in that case we patch in an early return after the link stack flush.
The naming of some of the functions is awkward after this patch, because they're called "count cache" but they also do link stack. But we'll fix that up in a later commit to ease backporting.
This is the fix for CVE-2019-18660.
--- arch/powerpc/include/asm/asm-prototypes.h | 1 arch/powerpc/include/asm/security_features.h | 3 + arch/powerpc/kernel/entry_64.S | 6 +++ arch/powerpc/kernel/security.c | 48 ++++++++++++++++++++++++--- 4 files changed, 54 insertions(+), 4 deletions(-)
arch/powerpc/include/asm/asm-prototypes.h +1 -0
@@ -124,6 +124,7 @@ extern int __ucmpdi2(u64, u64);/* Patch sites */ extern s32 patch__call_flush_count_cache;extern s32 patch__flush_count_cache_return; +extern s32 patch__flush_link_stack_return;extern long flush_count_cache;
arch/powerpc/include/asm/security_features.h +3 -0
@@ -81,6 +81,9 @@ static inline bool security_ftr_enabled(// Software required to flush count cache on context switch #define SEC_FTR_FLUSH_COUNT_CACHE 0x0000000000000400ull +// Software required to flush link stack on context switch +#define SEC_FTR_FLUSH_LINK_STACK 0x0000000000001000ull +// Features enabled by default #define SEC_FTR_DEFAULT \
arch/powerpc/kernel/entry_64.S +6 -0
@@ -510,6 +510,7 @@ flush_count_cache: /* Save LR into r9 */ mflr r9 + // Flush the link stack .rept 64 bl .+4 .endr
@@ -519,6 +520,11 @@ flush_count_cache: .balign 32 /* Restore LR */ 1: mtlr r9 + + // If we're just flushing the link stack, return here +3: nop + patch_site 3b patch__flush_link_stack_return + li r9,0x7fff mtctr r9
arch/powerpc/kernel/security.c +44 -4
90 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 114/151 arm64: fix for bad_mode() handler to always result in panic
In reply to Greg Kroah-HartmanFrom: Hari Vyas <[email protected]>
commit e4ba15debcfd27f60d43da940a58108783bff2a6 upstream.
The bad_mode() handler is called if we encounter an uunknown exception, with the expectation that the subsequent call to panic() will halt the system. Unfortunately, if the exception calling bad_mode() is taken from EL0, then the call to die() can end up killing the current user task and calling schedule() instead of falling through to panic().
Remove the die() call altogether, since we really want to bring down the machine in this "impossible" case.
--- arch/arm64/kernel/traps.c | 1 - 1 file changed, 1 deletion(-)
arch/arm64/kernel/traps.c +0 -1
@@ -611,7 +611,6 @@ asmlinkage void bad_mode(struct pt_regs handler[reason],smp_processor_id (), esr, esr_get_class_string(esr)); -die ("Oops - bad mode" , regs,0 );local_irq_disable ();panic ("bad mode" ); }
Greg Kroah-Hartman
maintainerPATCH 115/151 cpufreq: Skip cpufreq resume if its not suspended
In reply to Greg Kroah-HartmanFrom: Bo Yan <[email protected]>
commit 703cbaa601ff3fb554d1246c336ba727cc083ea0 upstream.
cpufreq_resume can be called even without preceding cpufreq_suspend. This can happen in following scenario:
suspend_devices_and_enter
--> dpm_suspend_start
--> dpm_prepare
--> device_prepare : this function errors out
--> dpm_suspend: this is skipped due to dpm_prepare failure
this means cpufreq_suspend is skipped over
--> goto Recover_platform, due to previous error
--> goto Resume_devices
--> dpm_resume_end
--> dpm_resume
--> cpufreq_resumeIn case schedutil is used as frequency governor, cpufreq_resume will eventually call sugov_start, which does following:
memset(sg_cpu, 0, sizeof(*sg_cpu));
....This effectively erases function pointer for frequency update, causing crash later on. The function pointer would have been set correctly if subsequent cpufreq_add_update_util_hook runs successfully, but that function returns earlier because cpufreq_suspend was not called:
if (WARN_ON(per_cpu(cpufreq_update_util_data, cpu)))
return;
The fix is to check cpufreq_suspended first, if it's false, that means cpufreq_suspend was not called in the first place, so do not resume cpufreq.
--- drivers/cpufreq/cpufreq.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/cpufreq/cpufreq.c +3 -0
@@ -1646,6 +1646,9 @@ void cpufreq_resume(void)if (!cpufreq_driver)return ; +if (unlikely (!cpufreq_suspended)) +return ; + cpufreq_suspended = false;if (!has_target () && !cpufreq_driver->resume)
Greg Kroah-Hartman
maintainerPATCH 116/151 ocfs2: remove ocfs2_is_o2cb_active()
In reply to Greg Kroah-HartmanFrom: Gang He <[email protected]>
commit a634644751c46238df58bbfe992e30c1668388db upstream.
Remove ocfs2_is_o2cb_active(). We have similar functions to identify which cluster stack is being used via osb->osb_cluster_stack.
Secondly, the current implementation of ocfs2_is_o2cb_active() is not totally safe. Based on the design of stackglue, we need to get ocfs2_stack_lock before using ocfs2_stack related data structures, and that active_stack pointer can be NULL in the case of mount failure.
--- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/stackglue.c | 6 ------ fs/ocfs2/stackglue.h | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-)
fs/ocfs2/dlmglue.c +1 -1
@@ -3421,7 +3421,7 @@ static int ocfs2_downconvert_lock(struct* we can recover correctly from node failure. Otherwise, we may get * invalid LVB in LKB, but without DLM_SBF_VALNOTVALID being set. */ -if (!ocfs2_is_o2cb_active () && +if (ocfs2_userspace_stack (osb) && lockres->l_ops->flags &LOCK_TYPE_USES_LVB ) lvb =1 ;
fs/ocfs2/stackglue.c +0 -6
@@ -48,12 +48,6 @@ static char ocfs2_hb_ctl_path[OCFS2_MAX_*/ static struct ocfs2_stack_plugin *active_stack; -inline int ocfs2_is_o2cb_active (void ) -{ -return !strcmp (active_stack->sp_name,OCFS2_STACK_PLUGIN_O2CB ); -} -EXPORT_SYMBOL_GPL (ocfs2_is_o2cb_active); -static struct ocfs2_stack_plugin *ocfs2_stack_lookup (const char *name) {struct ocfs2_stack_plugin *p;
fs/ocfs2/stackglue.h +0 -3
@@ -298,9 +298,6 @@ void ocfs2_stack_glue_set_max_proto_versint ocfs2_stack_glue_register (struct ocfs2_stack_plugin *plugin);void ocfs2_stack_glue_unregister (struct ocfs2_stack_plugin *plugin); -/* In ocfs2_downconvert_lock(), we need to know which stack we are using */ -int ocfs2_is_o2cb_active (void ); -extern struct kset *ocfs2_kset;#endif /* STACKGLUE_H */
Greg Kroah-Hartman
maintainerPATCH 108/151 spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch
In reply to Greg Kroah-HartmanFrom: Vignesh R <[email protected]>
[ Upstream commit baf8b9f8d260c55a86405f70a384c29cda888476 ]
Commit b682cffa3ac6 ("spi: omap2-mcspi: Set FIFO DMA trigger level to word length") broke SPI transfers where bits_per_word != 8. This is because of mimsatch between McSPI FIFO level event trigger size (SPI word length) and DMA request size(word length * maxburst). This leads to data corruption, lockup and errors like:
spi1.0: EOW timed out
Fix this by setting DMA maxburst size to 1 so that McSPI FIFO level event trigger size matches DMA request size.
--- drivers/spi/spi-omap2-mcspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-omap2-mcspi.c +2 -2
@@ -625,8 +625,8 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) cfg.dst_addr = cs->phys +OMAP2_MCSPI_TX0 ; cfg.src_addr_width = width; cfg.dst_addr_width = width; - cfg.src_maxburst = es; - cfg.dst_maxburst = es; + cfg.src_maxburst =1 ; + cfg.dst_maxburst =1 ; rx = xfer->rx_buf; tx = xfer->tx_buf;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/151 ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary
In reply to Greg Kroah-HartmanFrom: Chester Lin <[email protected]>
commit 1d31999cf04c21709f72ceb17e65b54a401330da upstream.
adjust_lowmem_bounds() checks every memblocks in order to find the boundary between lowmem and highmem. However some memblocks could be marked as NOMAP so they are not used by kernel, which should be skipped while calculating the boundary.
--- arch/arm/mm/mmu.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mm/mmu.c +3 -0
@@ -1188,6 +1188,9 @@ void __init adjust_lowmem_bounds(void)phys_addr_t block_start = reg->base;phys_addr_t block_end = reg->base + reg->size; +if (memblock_is_nomap (reg)) +continue ; +if (reg->base < vmalloc_limit) {if (block_end > lowmem_limit)/*
Greg Kroah-Hartman
maintainerPATCH 113/151 dm: use blk_set_queue_dying() in __dm_destroy()
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
commit 2e91c3694181dc500faffec16c5aaa0ac5e15449 upstream.
After QUEUE_FLAG_DYING has been set any code that is waiting in get_request() should be woken up. But to get this behaviour blk_set_queue_dying() must be used instead of only setting QUEUE_FLAG_DYING.
--- drivers/md/dm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/md/dm.c +1 -3
@@ -1946,9 +1946,7 @@ static void __dm_destroy(struct mapped_dset_bit (DMF_FREEING , &md->flags);spin_unlock (&_minor_lock); -spin_lock_irq (q->queue_lock); -queue_flag_set (QUEUE_FLAG_DYING , q); -spin_unlock_irq (q->queue_lock); +blk_set_queue_dying (q);if (dm_request_based (md) && md->kworker_task)kthread_flush_worker (&md->kworker);
Greg Kroah-Hartman
maintainerPATCH 151/151 KVM: PPC: Book3S HV: Flush link stack on guest exit to host kernel
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit af2e8c68b9c5403f77096969c516f742f5bb29e0 upstream.
On some systems that are vulnerable to Spectre v2, it is up to software to flush the link stack (return address stack), in order to protect against Spectre-RSB.
When exiting from a guest we do some house keeping and then potentially exit to C code which is several stack frames deep in the host kernel. We will then execute a series of returns without preceeding calls, opening up the possiblity that the guest could have poisoned the link stack, and direct speculative execution of the host to a gadget of some sort.
To prevent this we add a flush of the link stack on exit from a guest.
--- arch/powerpc/include/asm/asm-prototypes.h | 2 ++ arch/powerpc/kernel/security.c | 9 +++++++++ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 27 +++++++++++++++++++++++++++ 3 files changed, 38 insertions(+)
arch/powerpc/include/asm/asm-prototypes.h +2 -0
@@ -125,7 +125,9 @@ extern int __ucmpdi2(u64, u64);extern s32 patch__call_flush_count_cache;extern s32 patch__flush_count_cache_return;extern s32 patch__flush_link_stack_return; +extern s32 patch__call_kvm_flush_link_stack;extern long flush_count_cache; +extern long kvm_flush_link_stack;#endif /* _ASM_POWERPC_ASM_PROTOTYPES_H */
arch/powerpc/kernel/security.c +9 -0
@@ -393,6 +393,9 @@ static void toggle_count_cache_flush(booif (!enable) {patch_instruction_site (&patch__call_flush_count_cache,PPC_INST_NOP ); +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE +patch_instruction_site (&patch__call_kvm_flush_link_stack,PPC_INST_NOP ); +#endif pr_info ("link-stack-flush: software flush disabled.\n" ); link_stack_flush_enabled = false;no_count_cache_flush ();
@@ -403,6 +406,12 @@ static void toggle_count_cache_flush(boopatch_branch_site (&patch__call_flush_count_cache, (u64)&flush_count_cache,BRANCH_SET_LINK ); +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE +// This enables the branch from guest_exit_cont to kvm_flush_link_stack +patch_branch_site (&patch__call_kvm_flush_link_stack, + (u64)&kvm_flush_link_stack,BRANCH_SET_LINK ); +#endif +pr_info ("link-stack-flush: software flush enabled.\n" ); link_stack_flush_enabled = true;
arch/powerpc/kvm/book3s_hv_rmhandlers.S +27 -0
@@ -18,6 +18,7 @@ */ #include <asm/ppc_asm.h> +#include <asm/code-patching-asm.h> #include <asm/kvm_asm.h> #include <asm/reg.h> #include <asm/mmu.h>
@@ -1266,6 +1267,10 @@ mc_cont: bl kvmhv_accumulate_time #endif + /* Possibly flush the link stack here. */ +1: nop + patch_site 1b patch__call_kvm_flush_link_stack + stw r12, STACK_SLOT_TRAP(r1) mr r3, r12 /* Increment exit count, poke other threads to exit */
@@ -1685,6 +1690,28 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) mtlr r0 blr +.balign 32 +.global kvm_flush_link_stack +kvm_flush_link_stack: + /* Save LR into r0 */ + mflr r0 + + /* Flush the link stack. On Power8 it's up to 32 entries in size. */ + .rept 32 + bl .+4 + .endr + + /* And on Power9 it's up to 64. */ +BEGIN_FTR_SECTION + .rept 32 + bl .+4 + .endr +END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) + + /* Restore LR */ + mtlr r0 + blr + /* * Check whether an HDSI is an HPTE not found fault or something else. * If it is an HPTE not found fault that is due to the guest accessing
Greg Kroah-Hartman
maintainerPATCH 147/151 USB: serial: option: add support for Foxconn T77W968 LTE modules
In reply to Greg Kroah-HartmanFrom: Aleksander Morgado <[email protected]>
commit f0797095423e6ea3b4be61134ee353c7f504d440 upstream.
These are the Foxconn-branded variants of the Dell DW5821e modules, same USB layout as those. The device exposes AT, NMEA and DIAG ports in both USB configurations.
P: Vendor=0489 ProdID=e0b4 Rev=03.18 S: Manufacturer=FII S: Product=T77W968 LTE S: SerialNumber=0123456789ABCDEF C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
P: Vendor=0489 ProdID=e0b4 Rev=03.18 S: Manufacturer=FII S: Product=T77W968 LTE S: SerialNumber=0123456789ABCDEF C: #Ifs= 7 Cfg#= 2 Atr=a0 MxPwr=500mA I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option I: If#=0x6 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -1990,6 +1990,10 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x13) }, { USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x14) }, { USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x1b) }, + { USB_DEVICE(0x0489, 0xe0b4), /* Foxconn T77W968 */ + .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, + { USB_DEVICE(0x0489, 0xe0b5), /* Foxconn T77W968 ESIM */ + .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, { USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 */ .driver_info = RSVD(4) | RSVD(5) | RSVD(6) }, { USB_DEVICE(0x2cb7, 0x0104), /* Fibocom NL678 series */
Greg Kroah-Hartman
maintainerPATCH 139/151 usbip: tools: fix fd leakage in the function of read_attr_usbip_status
In reply to Greg Kroah-HartmanFrom: Hewenliang <[email protected]>
commit 26a4d4c00f85cb844dd11dd35e848b079c2f5e8f upstream.
We should close the fd before the return of read_attr_usbip_status.
--- tools/usb/usbip/libsrc/usbip_host_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/usb/usbip/libsrc/usbip_host_common.c +1 -1
@@ -69,7 +69,7 @@ static int32_t read_attr_usbip_status(st } value =atoi (status); - +close (fd);return value; }
Greg Kroah-Hartman
maintainerPATCH 135/151 virtio_ring: fix return code on DMA mapping fails
In reply to Greg Kroah-HartmanFrom: Halil Pasic <[email protected]>
[ Upstream commit f7728002c1c7bfa787b276a31c3ef458739b8e7c ]
Commit 780bc7903a32 ("virtio_ring: Support DMA APIs") makes virtqueue_add() return -EIO when we fail to map our I/O buffers. This is a very realistic scenario for guests with encrypted memory, as swiotlb may run out of space, depending on it's size and the I/O load.
The virtio-blk driver interprets -EIO form virtqueue_add() as an IO error, despite the fact that swiotlb full is in absence of bugs a recoverable condition.
Let us change the return code to -ENOMEM, and make the block layer recover form these failures when virtio-blk encounters the condition described above.
--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virtio/virtio_ring.c +1 -1
@@ -427,7 +427,7 @@ unmap_release:kfree (desc);END_USE (vq); -return -EIO ; +return -ENOMEM ; }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/151 media: b2c2-flexcop-usb: add sanity checking
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 1b976fc6d684e3282914cdbe7a8d68fdce19095c upstream.
The driver needs an isochronous endpoint to be present. It will oops in its absence. Add checking for it.
--- drivers/media/usb/b2c2/flexcop-usb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/usb/b2c2/flexcop-usb.c +3 -0
@@ -538,6 +538,9 @@ static int flexcop_usb_probe(struct usb_struct flexcop_device *fc =NULL ;int ret; +if (intf->cur_altsetting->desc.bNumEndpoints <1 ) +return -ENODEV ; +if ((fc =flexcop_device_kmalloc (sizeof (struct flexcop_usb ))) ==NULL ) {err ("out of memory\n" );return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 125/151 media: vivid: Fix wrong locking that causes race conditions on streaming stop
In reply to Greg Kroah-HartmanFrom: Alexander Popov <[email protected]>
commit 6dcd5d7a7a29c1e4b8016a06aed78cd650cd8c27 upstream.
There is the same incorrect approach to locking implemented in vivid_stop_generating_vid_cap(), vivid_stop_generating_vid_out() and sdr_cap_stop_streaming().
These functions are called during streaming stopping with vivid_dev.mutex locked. And they all do the same mistake while stopping their kthreads, which need to lock this mutex as well. See the example from vivid_stop_generating_vid_cap():
/* shutdown control thread */
vivid_grab_controls(dev, false);
mutex_unlock(&dev->mutex); kthread_stop(dev->kthread_vid_cap);
dev->kthread_vid_cap = NULL;
mutex_lock(&dev->mutex);
But when this mutex is unlocked, another vb2_fop_read() can lock it instead of vivid_thread_vid_cap() and manipulate the buffer queue. That causes a use-after-free access later.
To fix those issues let's:
1. avoid unlocking the mutex in vivid_stop_generating_vid_cap(),vivid_stop_generating_vid_out() and sdr_cap_stop_streaming();
2. use mutex_trylock() with schedule_timeout_uninterruptible() in
the loops of the vivid kthread handlers.
--- drivers/media/platform/vivid/vivid-kthread-cap.c | 8 +++++--- drivers/media/platform/vivid/vivid-kthread-out.c | 8 +++++--- drivers/media/platform/vivid/vivid-sdr-cap.c | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-)
drivers/media/platform/vivid/vivid-kthread-cap.c +5 -3
@@ -777,7 +777,11 @@ static int vivid_thread_vid_cap(void *daif (kthread_should_stop ())break ; -mutex_lock (&dev->mutex); +if (!mutex_trylock (&dev->mutex)) { +schedule_timeout_uninterruptible (1 ); +continue ; + } + cur_jiffies = jiffies;if (dev->cap_seq_resync) { dev->jiffies_vid_cap = cur_jiffies;
@@ -930,8 +934,6 @@ void vivid_stop_generating_vid_cap(struc/* shutdown control thread */ vivid_grab_controls (dev, false); -mutex_unlock (&dev->mutex);kthread_stop (dev->kthread_vid_cap); dev->kthread_vid_cap =NULL ; -mutex_lock (&dev->mutex); }
drivers/media/platform/vivid/vivid-kthread-out.c +5 -3
@@ -147,7 +147,11 @@ static int vivid_thread_vid_out(void *daif (kthread_should_stop ())break ; -mutex_lock (&dev->mutex); +if (!mutex_trylock (&dev->mutex)) { +schedule_timeout_uninterruptible (1 ); +continue ; + } + cur_jiffies = jiffies;if (dev->out_seq_resync) { dev->jiffies_vid_out = cur_jiffies;
@@ -301,8 +305,6 @@ void vivid_stop_generating_vid_out(struc/* shutdown control thread */ vivid_grab_controls (dev, false); -mutex_unlock (&dev->mutex);kthread_stop (dev->kthread_vid_out); dev->kthread_vid_out =NULL ; -mutex_lock (&dev->mutex); }
drivers/media/platform/vivid/vivid-sdr-cap.c +5 -3
@@ -149,7 +149,11 @@ static int vivid_thread_sdr_cap(void *daif (kthread_should_stop ())break ; -mutex_lock (&dev->mutex); +if (!mutex_trylock (&dev->mutex)) { +schedule_timeout_uninterruptible (1 ); +continue ; + } + cur_jiffies = jiffies;if (dev->sdr_cap_seq_resync) { dev->jiffies_sdr_cap = cur_jiffies;
@@ -309,10 +313,8 @@ static void sdr_cap_stop_streaming(struc }/* shutdown control thread */ -mutex_unlock (&dev->mutex);kthread_stop (dev->kthread_sdr_cap); dev->kthread_sdr_cap =NULL ; -mutex_lock (&dev->mutex); }const struct vb2_ops vivid_sdr_cap_qops = {
Greg Kroah-Hartman
maintainerPATCH 122/151 nfc: port100: handle command failure cleanly
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 5f9f0b11f0816b35867f2cf71e54d95f53f03902 upstream.
If starting the transfer of a command suceeds but the transfer for the reply fails, it is not enough to initiate killing the transfer for the command may still be running. You need to wait for the killing to finish before you can reuse URB and buffer.
--- drivers/nfc/port100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nfc/port100.c +1 -1
@@ -791,7 +791,7 @@ static int port100_send_frame_async(stru rc =port100_submit_urb_for_ack (dev,GFP_KERNEL );if (rc) -usb_unlink_urb (dev->out_urb); +usb_kill_urb (dev->out_urb); exit:mutex_unlock (&dev->out_urb_lock);
Greg Kroah-Hartman
maintainerPATCH 70/151 linux/bitmap.h: fix type of nbits in bitmap_shift_right()
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit d9873969fa8725dc6a5a21ab788c057fd8719751 ]
Most other bitmap API, including the OOL version __bitmap_shift_right, take unsigned nbits. This was accidentally left out from 2fbad29917c98.
--- include/linux/bitmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bitmap.h +1 -1
@@ -321,7 +321,7 @@ static __always_inline int bitmap_weight(const unsigned long *src, unsigned int }static inline void bitmap_shift_right (unsigned long *dst,const unsigned long *src, -unsigned int shift,int nbits) +unsigned int shift,unsigned int nbits) {if (small_const_nbits (nbits)) *dst = (*src &BITMAP_LAST_WORD_MASK (nbits)) >> shift;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/151 hfs: fix BUG on bnode parent update
In reply to Greg Kroah-HartmanFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit ef75bcc5763d130451a99825f247d301088b790b ]
hfs_brec_update_parent() may hit BUG_ON() if the first record of both a leaf node and its parent are changed, and if this forces the parent to be split. It is not possible for this to happen on a valid hfs filesystem because the index nodes have fixed length keys.
For reasons I ignore, the hfs module does have support for a number of hfsplus features. A corrupt btree header may report variable length keys and trigger this BUG, so it's better to fix it.
--- fs/hfs/brec.c | 1 + 1 file changed, 1 insertion(+)
fs/hfs/brec.c +1 -0
@@ -444,6 +444,7 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd)/* restore search_key */ hfs_bnode_read_key (node, fd->search_key,14 ); } + new_node =NULL ; }if (!rec && node->parent)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/151 sock: Reset dst when changing sk_mark via setsockopt
In reply to Greg Kroah-HartmanFrom: David Barmann <[email protected]>
[ Upstream commit 50254256f382c56bde87d970f3d0d02fdb76ec70 ]
When setting the SO_MARK socket option, if the mark changes, the dst needs to be reset so that a new route lookup is performed.
This fixes the case where an application wants to change routing by setting a new sk_mark. If this is done after some packets have already been sent, the dst is cached and has no effect.
--- net/core/sock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/core/sock.c +4 -2
@@ -945,10 +945,12 @@ int sock_setsockopt(struct socket *sock, int level, int optname,clear_bit (SOCK_PASSSEC , &sock->flags);break ;case SO_MARK : -if (!ns_capable (sock_net (sk)->user_ns,CAP_NET_ADMIN )) +if (!ns_capable (sock_net (sk)->user_ns,CAP_NET_ADMIN )) { ret = -EPERM ; -else + }else if (val != sk->sk_mark) { sk->sk_mark = val; +sk_dst_reset (sk); + }break ;case SO_RXQ_OVFL :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/151 pinctrl: qcom: spmi-gpio: fix gpio-hog related boot issues
In reply to Greg Kroah-HartmanFrom: Brian Masney <[email protected]>
[ Upstream commit 149a96047237574b756d872007c006acd0cc6687 ]
When attempting to setup up a gpio hog, device probing would repeatedly fail with -EPROBE_DEFERED errors. It was caused by a circular dependency between the gpio and pinctrl frameworks. If the gpio-ranges property is present in device tree, then the gpio framework will handle the gpio pin registration and eliminate the circular dependency.
See Christian Lamparter's commit a86caa9ba5d7 ("pinctrl: msm: fix gpio-hog related boot issues") for a detailed commit message that explains the issue in much more detail. The code comment in this commit came from Christian's commit.
--- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +17 -4
@@ -790,10 +790,23 @@ static int pmic_gpio_probe(struct platform_device *pdev)return ret; } - ret =gpiochip_add_pin_range (&state->chip,dev_name (dev),0 ,0 , npins); -if (ret) { -dev_err (dev,"failed to add pin range\n" ); - goto err_range; +/* +* For DeviceTree-supported systems, the gpio core checks the +* pinctrl's device node for the "gpio-ranges" property. +* If it is present, it takes care of adding the pin ranges +* for the driver. In this case the driver can skip ahead. +* +* In order to remain compatible with older, existing DeviceTree +* files which don't set the "gpio-ranges" property or systems that +* utilize ACPI the driver has to call gpiochip_add_pin_range(). +*/ +if (!of_property_read_bool (dev->of_node,"gpio-ranges" )) { + ret =gpiochip_add_pin_range (&state->chip,dev_name (dev),0 ,0 , + npins); +if (ret) { +dev_err (dev,"failed to add pin range\n" ); + goto err_range; + } }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/151 scsi: mpt3sas: Fix driver modifying persistent data in Manufacturing page11
In reply to Greg Kroah-HartmanFrom: Suganath Prabu <[email protected]>
[ Upstream commit 97f35194093362a63b33caba2485521ddabe2c95 ]
Currently driver is modifying both current & NVRAM/persistent data in Manufacturing page11. Driver should change only current copy of Manufacturing page11. It should not modify the persistent data.
So removed the section of code where driver is modifying the persistent data of Manufacturing page11.
--- drivers/scsi/mpt3sas/mpt3sas_config.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_config.c +0 -4
@@ -674,10 +674,6 @@ mpt3sas_config_set_manufacturing_pg11(struct MPT3SAS_ADAPTER *ioc, r =_config_request (ioc, &mpi_request, mpi_reply,MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT , config_page,sizeof (*config_page)); - mpi_request.Action =MPI2_CONFIG_ACTION_PAGE_WRITE_NVRAM ; - r =_config_request (ioc, &mpi_request, mpi_reply, -MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT , config_page, -sizeof (*config_page)); out:return r; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/151 wlcore: Fix the return value in case of error in wlcore_vendor_cmd_smart_config_start()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 3419348a97bcc256238101129d69b600ceb5cc70 ]
We return 0 unconditionally at the end of 'wlcore_vendor_cmd_smart_config_start()'.
However, 'ret' is set to some error codes in several error handling paths and we already return some error codes at the beginning of the function.
Return 'ret' instead to propagate the error code.
--- drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ti/wlcore/vendor_cmd.c +1 -1
@@ -66,7 +66,7 @@ wlcore_vendor_cmd_smart_config_start(struct wiphy *wiphy, out:mutex_unlock (&wl->mutex); -return 0 ; +return ret; } static int
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/151 ocfs2: fix clusters leak in ocfs2_defrag_extent()
In reply to Greg Kroah-HartmanFrom: Larry Chen <[email protected]>
[ Upstream commit 6194ae4242dec0c9d604bc05df83aa9260a899e4 ]
ocfs2_defrag_extent() might leak allocated clusters. When the file system has insufficient space, the number of claimed clusters might be less than the caller wants. If that happens, the original code might directly commit the transaction without returning clusters.
This patch is based on code in ocfs2_add_clusters_in_btree().
--- fs/ocfs2/move_extents.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/ocfs2/move_extents.c +17 -0
@@ -25,6 +25,7 @@#include "ocfs2_ioctl.h" #include "alloc.h" +#include "localalloc.h" #include "aops.h" #include "dlmglue.h" #include "extent_map.h"
@@ -222,6 +223,7 @@ static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,struct ocfs2_refcount_tree *ref_tree =NULL ;u32 new_phys_cpos, new_len;u64 phys_blkno =ocfs2_clusters_to_blocks (inode->i_sb, phys_cpos); +int need_free =0 ;if ((ext_flags &OCFS2_EXT_REFCOUNTED ) && *len) {
@@ -315,6 +317,7 @@ static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,if (!partial) { context->range->me_flags &= ~OCFS2_MOVE_EXT_FL_COMPLETE ; ret = -ENOSPC ; + need_free =1 ; goto out_commit; } }
@@ -339,6 +342,20 @@ static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,mlog_errno (ret); out_commit: +if (need_free && context->data_ac) { +struct ocfs2_alloc_context *data_ac = context->data_ac; + +if (context->data_ac->ac_which ==OCFS2_AC_USE_LOCAL ) +ocfs2_free_local_alloc_bits (osb, handle, data_ac, + new_phys_cpos, new_len); +else +ocfs2_free_clusters (handle, + data_ac->ac_inode, + data_ac->ac_bh, +ocfs2_clusters_to_blocks (osb->sb, new_phys_cpos), + new_len); + } +ocfs2_commit_trans (osb, handle); out_unlock_mutex:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/151 sched/fair: Dont increase sd->balance_interval on newidle balance
In reply to Greg Kroah-HartmanFrom: Valentin Schneider <[email protected]>
[ Upstream commit 3f130a37c442d5c4d66531b240ebe9abfef426b5 ]
When load_balance() fails to move some load because of task affinity, we end up increasing sd->balance_interval to delay the next periodic balance in the hopes that next time we look, that annoying pinned task(s) will be gone.
However, idle_balance() pays no attention to sd->balance_interval, yet it will still lead to an increase in balance_interval in case of pinned tasks.
If we're going through several newidle balances (e.g. we have a periodic task), this can lead to a huge increase of the balance_interval in a very small amount of time.
To prevent that, don't increase the balance interval when going through a newidle balance.
This is a similar approach to what is done in commit 58b26c4c0257 ("sched: Increment cache_nice_tries only on periodic lb"), where we disregard newidle balance and rely on periodic balance for more stable results.
--- kernel/sched/fair.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
kernel/sched/fair.c +11 -2
@@ -7950,13 +7950,22 @@ static int load_balance(int this_cpu, struct rq *this_rq, sd->nr_balance_failed =0 ; out_one_pinned: + ld_moved =0 ; + +/* +* idle_balance() disregards balance intervals, so we could repeatedly +* reach this code, which would lead to balance_interval skyrocketting +* in a short amount of time. Skip the balance_interval increase logic +* to avoid that. +*/ +if (env.idle ==CPU_NEWLY_IDLE ) + goto out; +/* tune up the balancing interval */ if (((env.flags &LBF_ALL_PINNED ) && sd->balance_interval <MAX_PINNED_INTERVAL ) || (sd->balance_interval < sd->max_interval)) sd->balance_interval *=2 ; - - ld_moved =0 ; out:return ld_moved; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/151 igb: shorten maximum PHC timecounter update interval
In reply to Greg Kroah-HartmanFrom: Miroslav Lichvar <[email protected]>
[ Upstream commit 094bf4d0e9657f6ea1ee3d7e07ce3970796949ce ]
The timecounter needs to be updated at least once per ~550 seconds in order to avoid a 40-bit SYSTIM timestamp to be misinterpreted as an old timestamp.
Since commit 500462a9d ("timers: Switch to a non-cascading wheel"), scheduling of delayed work seems to be less accurate and a requested delay of 540 seconds may actually be longer than 550 seconds. Shorten the delay to 480 seconds to be sure the timecounter is updated in time.
This fixes an issue with HW timestamps on 82580/I350/I354 being off by ~1100 seconds for few seconds every ~9 minutes.
--- drivers/net/ethernet/intel/igb/igb_ptp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igb/igb_ptp.c +7 -1
@@ -65,9 +65,15 @@* * The 40 bit 82580 SYSTIM overflows every * 2^40 * 10^-9 / 60 = 18.3 minutes. +* +* SYSTIM is converted to real time using a timecounter. As +* timecounter_cyc2time() allows old timestamps, the timecounter +* needs to be updated at least once per half of the SYSTIM interval. +* Scheduling of delayed work is not very accurate, so we aim for 8 +* minutes to be sure the actual interval is shorter than 9.16 minutes. */ -#define IGB_SYSTIM_OVERFLOW_PERIOD (HZ * 60 * 9) +#define IGB_SYSTIM_OVERFLOW_PERIOD (HZ * 60 * 8)#define IGB_PTP_TX_TIMEOUT (HZ * 15)#define INCPERIOD_82576 BIT(E1000_TIMINCA_16NS_SHIFT)#define INCVALUE_82576_MASK GENMASK(E1000_TIMINCA_16NS_SHIFT - 1, 0)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/151 hfs: update timestamp on truncate()
In reply to Greg Kroah-HartmanFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 8cd3cb5061730af085a3f9890a3352f162b4e20c ]
The vfs takes care of updating mtime on ftruncate(), but on truncate() it must be done by the module.
--- fs/hfs/inode.c | 2 ++ 1 file changed, 2 insertions(+)
fs/hfs/inode.c +2 -0
@@ -641,6 +641,8 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)truncate_setsize (inode, attr->ia_size);hfs_file_truncate (inode); + inode->i_atime = inode->i_mtime = inode->i_ctime = +current_time (inode); }setattr_copy (inode, attr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/151 hfs: fix return value of hfs_get_block()
In reply to Greg Kroah-HartmanFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 1267a07be5ebbff2d2739290f3d043ae137c15b4 ]
Direct writes to empty inodes fail with EIO. The generic direct-io code is in part to blame (a patch has been submitted as "direct-io: allow direct writes to empty inodes"), but hfs is worse affected than the other filesystems because the fallback to buffered I/O doesn't happen.
The problem is the return value of hfs_get_block() when called with !create. Change it to be more consistent with the other modules.
--- fs/hfs/extent.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/hfs/extent.c +3 -1
@@ -345,7 +345,9 @@ int hfs_get_block(struct inode *inode, sector_t block, ablock = (u32 )block /HFS_SB (sb)->fs_div;if (block >=HFS_I (inode)->fs_blocks) { -if (block >HFS_I (inode)->fs_blocks || !create) +if (!create) +return 0 ; +if (block >HFS_I (inode)->fs_blocks)return -EIO ;if (ablock >=HFS_I (inode)->alloc_blocks) { res =hfs_extend_file (inode);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/151 powerpc/eeh: Fix use of EEH_PE_KEEP on wrong field
In reply to Greg Kroah-HartmanFrom: Sam Bobroff <[email protected]>
[ Upstream commit 473af09b56dc4be68e4af33220ceca6be67aa60d ]
eeh_add_to_parent_pe() sometimes removes the EEH_PE_KEEP flag, but it incorrectly removes it from pe->type, instead of pe->state.
However, rather than clearing it from the correct field, remove it. Inspection of the code shows that it can't ever have had any effect (even if it had been cleared from the correct field), because the field is never tested after it is cleared by the statement in question.
The clear statement was added by commit 807a827d4e74 ("powerpc/eeh:
Keep PE during hotplug"), but it didn't explain why it was necessary.
--- arch/powerpc/kernel/eeh_pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/eeh_pe.c +1 -1
@@ -370,7 +370,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)while (parent) {if (!(parent->type &EEH_PE_INVALID ))break ; - parent->type &= ~(EEH_PE_INVALID |EEH_PE_KEEP ); + parent->type &= ~EEH_PE_INVALID ; parent = parent->parent; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/151 thermal: rcar_thermal: Prevent hardware access during system suspend
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 3a31386217628ffe2491695be2db933c25dde785 ]
On r8a7791/koelsch, sometimes the following message is printed during system suspend:
rcar_thermal e61f0000.thermal: thermal sensor was broken
This happens if the workqueue runs while the device is already suspended. Fix this by using the freezable system workqueue instead, cfr. commit 51e20d0e3a60cf46 ("thermal: Prevent polling from happening during system suspend").
--- drivers/thermal/rcar_thermal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thermal/rcar_thermal.c +2 -2
@@ -401,8 +401,8 @@ static irqreturn_t rcar_thermal_irq(int irq, void *data)rcar_thermal_for_each_priv (priv, common) {if (rcar_thermal_had_changed (priv, status)) {rcar_thermal_irq_disable (priv); -schedule_delayed_work (&priv->work, -msecs_to_jiffies (300 )); +queue_delayed_work (system_freezable_wq, &priv->work, +msecs_to_jiffies (300 )); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/151 mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail
In reply to Greg Kroah-HartmanFrom: Chaotian Jing <[email protected]>
[ Upstream commit f38a9774ddde9d79b3487dd888edd8b8623552af ]
when msdc_cmd_is_ready return fail, the req_timeout work has not been inited and cancel_delayed_work() will return false, then, the request return directly and never call mmc_request_done().
so need call mod_delayed_work() before msdc_cmd_is_ready()
--- drivers/mmc/host/mtk-sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/mtk-sd.c +1 -1
@@ -870,6 +870,7 @@ static void msdc_start_command(struct msdc_host *host,WARN_ON (host->cmd); host->cmd = cmd; +mod_delayed_work (system_wq, &host->req_timeout,DAT_TIMEOUT );if (!msdc_cmd_is_ready (host, mrq, cmd))return ;
@@ -881,7 +882,6 @@ static void msdc_start_command(struct msdc_host *host, cmd->error =0 ; rawcmd =msdc_cmd_prepare_raw_cmd (host, mrq, cmd); -mod_delayed_work (system_wq, &host->req_timeout,DAT_TIMEOUT );sdr_set_bits (host->base +MSDC_INTEN , cmd_ints_mask);writel (cmd->arg, host->base +SDC_ARG );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/151 mISDN: Fix type of switch control variable in ctrl_teimanager
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit aeb5e02aca91522733eb1db595ac607d30c87767 ]
Clang warns (trimmed for brevity):
drivers/isdn/mISDN/tei.c:1193:7: warning: overflow converting case value to switch condition type (2147764552 to 18446744071562348872) [-Wswitch]
case IMHOLD_L1:
^
drivers/isdn/mISDN/tei.c:1187:7: warning: overflow converting case value
to switch condition type (2147764550 to 18446744071562348870) [-Wswitch]
case IMCLEAR_L2:
^2 warnings generated.
The root cause is that the _IOC macro can generate really large numbers, which don't find into type int. My research into how GCC and Clang are handling this at a low level didn't prove fruitful and surveying the kernel tree shows that aside from here and a few places in the scsi subsystem, everything that uses _IOC is at least of type 'unsigned int'. Make that change here because as nothing in this function cares about the signedness of the variable and it removes ambiguity, which is never good when dealing with compilers.
While we're here, remove the unnecessary local variable ret (just return -EINVAL and 0 directly).
--- drivers/isdn/mISDN/tei.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/isdn/mISDN/tei.c +3 -4
@@ -1180,8 +1180,7 @@ static int ctrl_teimanager(struct manager *mgr, void *arg) {/* currently we only have one option */ - int *val = (int *)arg; -int ret =0 ; +unsigned int *val = (unsigned int *)arg;switch (val[0 ]) {case IMCLEAR_L2 :
@@ -1197,9 +1196,9 @@ ctrl_teimanager(struct manager *mgr, void *arg)test_and_clear_bit (OPTION_L1_HOLD , &mgr->options);break ;default : - ret = -EINVAL ; +return -EINVAL ; } -return ret; +return 0 ; }/* This function does create a L2 for fixed TEI in NT Mode */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/151 s390/perf: Return error when debug_register fails
In reply to Greg Kroah-HartmanFrom: Thomas Richter <[email protected]>
[ Upstream commit ec0c0bb489727de0d4dca6a00be6970ab8a3b30a ]
Return an error when the function debug_register() fails allocating the debug handle.
Also remove the registered debug handle when the initialization fails later on.
--- arch/s390/kernel/perf_cpum_sf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/s390/kernel/perf_cpum_sf.c +5 -1
@@ -1611,14 +1611,17 @@ static int __init init_cpum_sampling_pmu(void) } sfdbg =debug_register (KMSG_COMPONENT ,2 ,1 ,80 ); -if (!sfdbg) +if (!sfdbg) {pr_err ("Registering for s390dbf failed\n" ); +return -ENOMEM ; + }debug_register_view (sfdbg, &debug_sprintf_view); err =register_external_irq (EXT_IRQ_MEASURE_ALERT , cpumf_measurement_alert);if (err) {pr_cpumsf_err (RS_INIT_FAILURE_ALRT ); +debug_unregister (sfdbg); goto out; }
@@ -1627,6 +1630,7 @@ static int __init init_cpum_sampling_pmu(void)pr_cpumsf_err (RS_INIT_FAILURE_PERF );unregister_external_irq (EXT_IRQ_MEASURE_ALERT , cpumf_measurement_alert); +debug_unregister (sfdbg); goto out; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/151 macintosh/windfarm_smu_sat: Fix debug output
In reply to Greg Kroah-HartmanFrom: Benjamin Herrenschmidt <[email protected]>
[ Upstream commit fc0c8b36d379a046525eacb9c3323ca635283757 ]
There's some antiquated debug output that's trying to do a hand-made hexdump and turning into horrible 1-byte-per-line output these days.
Use print_hex_dump() instead
--- drivers/macintosh/windfarm_smu_sat.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)
drivers/macintosh/windfarm_smu_sat.c +7 -18
@@ -22,14 +22,6 @@#define VERSION "1.0" -#define DEBUG - -#ifdef DEBUG -#define DBG(args...) printk(args) -#else -#define DBG(args...) do { } while(0) -#endif -/* If the cache is older than 800ms we'll refetch it */ #define MAX_AGE msecs_to_jiffies(800)
@@ -106,13 +98,10 @@ struct smu_sdbp_header *smu_sat_get_sdb_partition(unsigned int sat_id, int id, buf[i+2 ] = data[3 ]; buf[i+3 ] = data[2 ]; } -#ifdef DEBUG -DBG (KERN_DEBUG "sat %d partition %x:" , sat_id, id); -for (i =0 ; i < len; ++i) -DBG (" %x" , buf[i]); -DBG ("\n" ); -#endif +printk (KERN_DEBUG "sat %d partition %x:" , sat_id, id); +print_hex_dump (KERN_DEBUG ," " ,DUMP_PREFIX_OFFSET , +16 ,1 , buf, len, false);if (size) *size = len;return (struct smu_sdbp_header *) buf;
@@ -132,13 +121,13 @@ static int wf_sat_read_cache(struct wf_sat *sat)if (err <0 )return err; sat->last_read = jiffies; +#ifdef LOTSA_DEBUG {int i; -DBG (KERN_DEBUG "wf_sat_get: data is" ); -for (i =0 ; i <16 ; ++i) -DBG (" %.2x" , sat->cache[i]); -DBG ("\n" ); +printk (KERN_DEBUG "wf_sat_get: data is" ); +print_hex_dump (KERN_DEBUG ," " ,DUMP_PREFIX_OFFSET , +16 ,1 , sat->cache,16 , false); }#endif return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/151 net: fix warning in af_unix
In reply to Greg Kroah-HartmanFrom: Kyeongdon Kim <[email protected]>
[ Upstream commit 33c4368ee2589c165aebd8d388cbd91e9adb9688 ]
This fixes the "'hash' may be used uninitialized in this function"
net/unix/af_unix.c:1041:20: warning: 'hash' may be used uninitialized in this function [-Wmaybe-uninitialized]
addr->hash = hash ^ sk->sk_type;
--- net/unix/af_unix.c | 2 ++ 1 file changed, 2 insertions(+)
net/unix/af_unix.c +2 -0
@@ -224,6 +224,8 @@ static inline void unix_release_addr(struct unix_address *addr)static int unix_mkname (struct sockaddr_un *sunaddr,int len,unsigned int *hashp) { + *hashp =0 ; +if (len <=sizeof (short ) || len >sizeof (*sunaddr))return -EINVAL ;if (!sunaddr || sunaddr->sun_family !=AF_UNIX )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/151 scsi: ips: fix missing break in switch
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 5d25ff7a544889bc4b749fda31778d6a18dddbcb ]
Add missing break statement in order to prevent the code from falling through to case TEST_UNIT_READY.
Addresses-Coverity-ID: 1357338 ("Missing break in switch")
--- drivers/scsi/ips.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/ips.c +1 -0
@@ -3500,6 +3500,7 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)case START_STOP : scb->scsi_cmd->result =DID_OK <<16 ; +break ;case TEST_UNIT_READY :case INQUIRY :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/151 scsi: isci: Use proper enumerated type in atapi_d2h_reg_frame_handler
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit e9e9a103528c7e199ead6e5374c9c52cf16b5802 ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/scsi/isci/request.c:1629:13: warning: implicit conversion from enumeration type 'enum sci_io_status' to different enumeration type 'enum sci_status' [-Wenum-conversion]
status = SCI_IO_FAILURE_RESPONSE_VALID;
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/scsi/isci/request.c:1631:12: warning: implicit conversion from
enumeration type 'enum sci_io_status' to different enumeration type
'enum sci_status' [-Wenum-conversion]
status = SCI_IO_FAILURE_RESPONSE_VALID;
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~status is of type sci_status but SCI_IO_FAILURE_RESPONSE_VALID is of type sci_io_status. Use SCI_FAILURE_IO_RESPONSE_VALID, which is from sci_status and has SCI_IO_FAILURE_RESPONSE_VALID's exact value since that is what SCI_IO_FAILURE_RESPONSE_VALID is mapped to in the isci.h file.
--- drivers/scsi/isci/request.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/isci/request.c +2 -2
@@ -1626,9 +1626,9 @@ static enum sci_status atapi_d2h_reg_frame_handler(struct isci_request *ireq,if (status ==SCI_SUCCESS ) {if (ireq->stp.rsp.status &ATA_ERR ) - status =SCI_IO_FAILURE_RESPONSE_VALID ; + status =SCI_FAILURE_IO_RESPONSE_VALID ; }else { - status =SCI_IO_FAILURE_RESPONSE_VALID ; + status =SCI_FAILURE_IO_RESPONSE_VALID ; }if (status !=SCI_SUCCESS ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/151 brcmsmac: AP mode: update beacon when TIM changes
In reply to Greg Kroah-HartmanFrom: Ali MJ Al-Nasrawy <[email protected]>
[ Upstream commit 2258ee58baa554609a3cc3996276e4276f537b6d ]
Beacons are not updated to reflect TIM changes. This is not compliant with power-saving client stations as the beacons do not have valid TIM and can cause the network to stall at random occasions and to have highly variable latencies.
Fix it by updating beacon templates on mac80211 set_tim callback.
Addresses an issue described in:
https://marc.info/?i=20180911163534.21312d08%20()%20manjaro
--- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 26 +++++++++++++++++++ .../broadcom/brcm80211/brcmsmac/main.h | 1 + 2 files changed, 27 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +26 -0
@@ -502,6 +502,7 @@ brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) }spin_lock_bh (&wl->lock); + wl->wlc->vif = vif; wl->mute_tx = false;brcms_c_mute (wl->wlc, false);if (vif->type ==NL80211_IFTYPE_STATION )
@@ -519,6 +520,11 @@ brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)static void brcms_ops_remove_interface (struct ieee80211_hw *hw,struct ieee80211_vif *vif) { +struct brcms_info *wl = hw->priv; + +spin_lock_bh (&wl->lock); + wl->wlc->vif =NULL ; +spin_unlock_bh (&wl->lock); }static int brcms_ops_config (struct ieee80211_hw *hw,u32 changed)
@@ -937,6 +943,25 @@ static void brcms_ops_set_tsf(struct ieee80211_hw *hw,spin_unlock_bh (&wl->lock); } +static int brcms_ops_beacon_set_tim (struct ieee80211_hw *hw, +struct ieee80211_sta *sta,bool set) +{ +struct brcms_info *wl = hw->priv; +struct sk_buff *beacon =NULL ; +u16 tim_offset =0 ; + +spin_lock_bh (&wl->lock); +if (wl->wlc->vif) + beacon =ieee80211_beacon_get_tim (hw, wl->wlc->vif, + &tim_offset,NULL ); +if (beacon) +brcms_c_set_new_beacon (wl->wlc, beacon, tim_offset, + wl->wlc->vif->bss_conf.dtim_period); +spin_unlock_bh (&wl->lock); + +return 0 ; +} +static const struct ieee80211_ops brcms_ops = { .tx = brcms_ops_tx, .start = brcms_ops_start,
@@ -955,6 +980,7 @@ static const struct ieee80211_ops brcms_ops = { .flush = brcms_ops_flush, .get_tsf = brcms_ops_get_tsf, .set_tsf = brcms_ops_set_tsf, + .set_tim = brcms_ops_beacon_set_tim, };void brcms_dpc (unsigned long data)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h +1 -0
@@ -563,6 +563,7 @@ struct brcms_c_info {struct wiphy *wiphy;struct scb pri_scb; +struct ieee80211_vif *vif;struct sk_buff *beacon;u16 beacon_tim_offset;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 6/151 gpio: max77620: Fixup debounce delays
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
commit b0391479ae04dfcbd208b9571c375064caad9a57 upstream.
When converting milliseconds to microseconds in commit fffa6af94894 ("gpio: max77620: Use correct unit for debounce times") some ~1 ms gaps were introduced between the various ranges supported by the controller. Fix this by changing the start of each range to the value immediately following the end of the previous range. This way a debounce time of, say 8250 us will translate into 16 ms instead of returning an -EINVAL error.
Typically the debounce delay is only ever set through device tree and specified in milliseconds, so we can never really hit this issue because debounce times are always a multiple of 1000 us.
The only notable exception for this is drivers/mmc/host/mmc-spi.c where the CD GPIO is requested, which passes a 1 us debounce time. According to a comment preceeding that code this should actually be 1 ms (i.e. 1000 us).
--- drivers/gpio/gpio-max77620.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpio/gpio-max77620.c +3 -3
@@ -167,13 +167,13 @@ static int max77620_gpio_set_debounce(stcase 0 : val = MAX77620_CNFG_GPIO_DBNC_None;break ; - case 1000 ... 8000: + case 1 ... 8000: val = MAX77620_CNFG_GPIO_DBNC_8ms;break ; - case 9000 ... 16000: + case 8001 ... 16000: val = MAX77620_CNFG_GPIO_DBNC_16ms;break ; - case 17000 ... 32000: + case 16001 ... 32000: val = MAX77620_CNFG_GPIO_DBNC_32ms;break ;default :
Greg Kroah-Hartman
maintainerPATCH 17/151 powerpc: Fix signedness bug in update_flash_db()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 014704e6f54189a203cc14c7c0bb411b940241bc ]
The "count < sizeof(struct os_area_db)" comparison is type promoted to size_t so negative values of "count" are treated as very high values and we accidentally return success instead of a negative error code.
This doesn't really change runtime much but it fixes a static checker warning.
--- arch/powerpc/platforms/ps3/os-area.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/ps3/os-area.c +1 -1
@@ -664,7 +664,7 @@ static int update_flash_db(void)db_set_64 (db, &os_area_db_id_rtc_diff, saved_params.rtc_diff); count =os_area_flash_write (db,sizeof (struct os_area_db ), pos); -if (count <sizeof (struct os_area_db )) { +if (count <0 || count <sizeof (struct os_area_db )) {pr_debug ("%s: os_area_flash_write failed %zd\n" , __func__, count); error = count <0 ? count : -EIO ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/151 platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 401fee8195d401b2b94dee57383f627050724d5b ]
Commit 78f3ac76d9e5 ("platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey") causes the backlight to be permanently off on various EeePC laptop models using the eeepc-wmi driver (Asus EeePC 1015BX, Asus EeePC 1025C).
The asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL) call added by that commit is made conditional in this commit and only enabled in the quirk_entry structs in the asus-nb-wmi driver fixing the broken display / backlight on various EeePC laptop models.
--- drivers/platform/x86/asus-nb-wmi.c | 8 ++++++++ drivers/platform/x86/asus-wmi.c | 2 +- drivers/platform/x86/asus-wmi.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-)
drivers/platform/x86/asus-nb-wmi.c +8 -0
@@ -78,10 +78,12 @@ static bool asus_q500a_i8042_filter(unsigned char data, unsigned char str,static struct quirk_entry quirk_asus_unknown = { .wapf =0 , + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_q500a = { .i8042_filter = asus_q500a_i8042_filter, + .wmi_backlight_set_devstate = true, };/*
@@ -92,15 +94,18 @@ static struct quirk_entry quirk_asus_q500a = {static struct quirk_entry quirk_asus_x55u = { .wapf =4 , .wmi_backlight_power = true, + .wmi_backlight_set_devstate = true, .no_display_toggle = true, };static struct quirk_entry quirk_asus_wapf4 = { .wapf =4 , + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_x200ca = { .wapf =2 , + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_no_rfkill = {
@@ -114,13 +119,16 @@ static struct quirk_entry quirk_no_rfkill_wapf4 = {static struct quirk_entry quirk_asus_ux303ub = { .wmi_backlight_native = true, + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_x550lb = { + .wmi_backlight_set_devstate = true, .xusb2pr =0x01D9 , };static struct quirk_entry quirk_asus_forceals = { + .wmi_backlight_set_devstate = true, .wmi_force_als_set = true, };
drivers/platform/x86/asus-wmi.c +1 -1
@@ -2154,7 +2154,7 @@ static int asus_wmi_add(struct platform_device *pdev) err =asus_wmi_backlight_init (asus);if (err && err != -ENODEV ) goto fail_backlight; - }else + }else if (asus->driver->quirks->wmi_backlight_set_devstate) err =asus_wmi_set_devstate (ASUS_WMI_DEVID_BACKLIGHT ,2 ,NULL ); status = wmi_install_notify_handler(asus->driver->event_guid,
drivers/platform/x86/asus-wmi.h +1 -0
@@ -45,6 +45,7 @@ struct quirk_entry {bool store_backlight_power;bool wmi_backlight_power;bool wmi_backlight_native; +bool wmi_backlight_set_devstate;bool wmi_force_als_set;int wapf;/*
Signature · 1 line
2.20.1
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.204 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 29 Nov 2019 20:18:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.204-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.9.204-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.9.y
git commit: 3bbfc6b1c25b08b1e400515f8a2c333a6bdc7f26
git describe: v4.9.203-152-g3bbfc6b1c25b
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.9-oe/build/v4.9.203-152-g3bbfc6b1c25b
No regressions (compared to build v4.9.203)
No fixes (compared to build v4.9.203)
Ran 23796 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* network-basic-tests
* ltp-fs-tests
* ltp-open-posix-tests
* prep-tmp-disk
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Jon Hunter
maintainerQuoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.204 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 29 Nov 2019 20:18: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.204-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.
Quoted 5 lines
thanks,
greg k-h
-------------
All tests are passing for Tegra ...
Test results for stable-v4.9:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
24 tests: 24 pass, 0 failLinux version: 4.9.204-rc1-g3bbfc6b1c25b
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.204 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 29 Nov 2019 20:18:09 +0000. Anything received after that time might be too late.
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 356 pass: 356 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.204 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 29 Nov 2019 20:18:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.204-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Boot failed. I am seeing the same panic on 4.14, 4.9, and 4.4 on my system. I will bisect and let you know.
thanks,
-- Shuah