Linux 5.4.195
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.4.195 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/include/asm/io.h | 3 + arch/arm/mm/ioremap.c | 8 +++ arch/arm64/include/asm/io.h | 4 + arch/arm64/mm/ioremap.c | 9 ++++ arch/mips/jz4740/setup.c | 2 arch/s390/Makefile | 10 ++++ drivers/gpu/drm/nouveau/nouveau_backlight.c | 9 ++-- drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 drivers/hwmon/Kconfig | 2 drivers/hwmon/f71882fg.c | 5 +- drivers/hwmon/tmp401.c | 11 +++++ drivers/net/ethernet/intel/i40e/i40e_main.c | 27 ++++++------ drivers/net/ethernet/sfc/ef10.c | 5 ++ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 15 ------- drivers/net/phy/phy.c | 45 ++++++++++++++++++--- drivers/net/wireless/mac80211_hwsim.c | 3 + drivers/s390/net/ctcm_mpc.c | 6 -- drivers/s390/net/ctcm_sysfs.c | 5 +- drivers/s390/net/lcs.c | 7 +-- drivers/slimbus/qcom-ctrl.c | 4 - drivers/tty/n_gsm.c | 12 +++-- drivers/tty/serial/8250/8250_mtk.c | 22 ++++++---- drivers/tty/serial/digicolor-usart.c | 2 drivers/usb/class/cdc-wdm.c | 1 drivers/usb/serial/option.c | 4 + drivers/usb/serial/pl2303.c | 1 drivers/usb/serial/pl2303.h | 1 drivers/usb/serial/qcserial.c | 2 drivers/usb/typec/tcpm/tcpci.c | 2 fs/gfs2/bmap.c | 11 ++--- include/linux/netdev_features.h | 4 - include/net/tc_act/tc_pedit.h | 1 kernel/cgroup/cpuset.c | 7 ++- lib/dim/net_dim.c | 44 ++++++++++---------- net/batman-adv/fragmentation.c | 11 +++++ net/core/secure_seq.c | 12 ++++- net/ipv4/ping.c | 12 +++++ net/ipv4/route.c | 1 net/mac80211/mlme.c | 6 ++ net/netlink/af_netlink.c | 1 net/sched/act_pedit.c | 26 ++++++++++-- net/smc/smc_rx.c | 4 - sound/soc/codecs/max98090.c | 5 +- sound/soc/soc-ops.c | 18 +++++++- 46 files changed, 280 insertions(+), 116 deletions(-)
Alexandra Winter (3):
s390/ctcm: fix variable dereferenced before check s390/ctcm: fix potential memory leak s390/lcs: fix variable dereferenced before check
Andreas Gruenbacher (1):
gfs2: Fix filesystem block deallocation for short writes
AngeloGioacchino Del Regno (2):
serial: 8250_mtk: Fix UART_EFR register address
serial: 8250_mtk: Fix register address for XON/XOFF character
Camel Guo (1):
hwmon: (tmp401) Add OF device ID table
Christophe JAILLET (1):
drm/nouveau: Fix a potential theorical leak in nouveau_get_backlight_name()
Daniel Starke (1):
tty: n_gsm: fix mux activation issues in gsm_config()
Eric Dumazet (2):
netlink: do not reset transport header in netlink_recvmsg()
tcp: resalt the secret every 10 seconds
Ethan Yang (1):
USB: serial: qcserial: add support for Sierra Wireless EM7590
Francesco Dolcini (1):
net: phy: Fix race condition on link status change
Greg Kroah-Hartman (1):
Linux 5.4.195
Guangguan Wang (1):
net/smc: non blocking recvmsg() return -EAGAIN when no data and signal_pending
Jesse Brandeburg (1):
dim: initialize all struct fields
Ji-Ze Hong (Peter Hong) (1):
hwmon: (f71882fg) Fix negative temperature
Johannes Berg (1):
mac80211_hwsim: call ieee80211_tx_prepare_skb under RCU protection
Lokesh Dhoundiyal (1):
ipv4: drop dst in multicast routing path
Manikanta Pubbisetty (1):
mac80211: Reset MBSSID parameters upon connection
Mark Brown (3):
ASoC: max98090: Reject invalid values in custom control put()
ASoC: max98090: Generate notifications on changes for custom control
ASoC: ops: Validate input values in snd_soc_put_volsw_range()
Miaoqian Lin (1):
slimbus: qcom: Fix IRQ check in qcom_slim_probe
Mike Rapoport (1):
arm[64]/memremap: don't abuse pfn_valid() to ensure presence of linear map
Nicolas Dichtel (1):
ping: fix address binding wrt vrf
Paolo Abeni (1):
net/sched: act_pedit: really ensure the skb is writable
Randy Dunlap (1):
hwmon: (ltq-cputemp) restrict it to SOC_XWAY
Robin Murphy (1):
drm/nouveau/tegra: Stop using iommu_present()
Scott Chen (1):
USB: serial: pl2303: add device id for HP LM930 Display
Sergey Ryazanov (1):
usb: cdc-wdm: fix reading stuck on device close
Shravya Kumbham (1):
net: emaclite: Don't advertise 1000BASE-T and do auto negotiation
Sudip Mukherjee (1):
MIPS: fix build with gcc-12
Sven Eckelmann (1):
batman-adv: Don't skb_split skbuffs with frag_list
Sven Schnelle (1):
s390: disable -Warray-bounds
Sven Schwermer (2):
USB: serial: option: add Fibocom L610 modem
USB: serial: option: add Fibocom MA510 modem
Taehee Yoo (1):
net: sfc: ef10: fix memory leak in efx_ef10_mtd_probe()
Tariq Toukan (1):
net: Fix features skip in for_each_netdev_feature()
Uwe Kleine-König (1):
usb: typec: tcpci: Don't skip cleanup in .remove() on error
Waiman Long (1):
cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp()
Xiaomeng Tong (1):
i40e: i40e_main: fix a missing check on list iterator
Yang Yingliang (1):
tty/serial: digicolor: fix possible null-ptr-deref in digicolor_uart_probe()
Zack Rusin (1):
drm/vmwgfx: Initialize drm_mode_fb_cmd2
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 194 +SUBLEVEL = 195 EXTRAVERSION = NAME = Kleptomaniac Octopus
arch/arm/include/asm/io.h +3 -0
@@ -457,6 +457,9 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);extern int valid_phys_addr_range (phys_addr_t addr,size_t size);extern int valid_mmap_phys_addr_range (unsigned long pfn,size_t size);extern int devmem_is_allowed (unsigned long pfn); +extern bool arch_memremap_can_ram_remap (resource_size_t offset,size_t size, +unsigned long flags); +#define arch_memremap_can_ram_remap arch_memremap_can_ram_remap#endif /*
arch/arm/mm/ioremap.c +8 -0
@@ -500,3 +500,11 @@ void __init early_ioremap_init(void) {early_ioremap_setup (); } + +bool arch_memremap_can_ram_remap (resource_size_t offset,size_t size, +unsigned long flags) +{ +unsigned long pfn =PHYS_PFN (offset); + +return memblock_is_map_memory (pfn); +}
arch/arm64/include/asm/io.h +4 -0
@@ -204,4 +204,8 @@ extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);extern int devmem_is_allowed (unsigned long pfn); +extern bool arch_memremap_can_ram_remap (resource_size_t offset,size_t size, +unsigned long flags); +#define arch_memremap_can_ram_remap arch_memremap_can_ram_remap +#endif /* __ASM_IO_H */
arch/arm64/mm/ioremap.c +9 -0
@@ -13,6 +13,7 @@#include <linux/mm.h> #include <linux/vmalloc.h> #include <linux/io.h> +#include <linux/memblock.h> #include <asm/fixmap.h> #include <asm/tlbflush.h>
@@ -100,3 +101,11 @@ void __init early_ioremap_init(void) {early_ioremap_setup (); } + +bool arch_memremap_can_ram_remap (resource_size_t offset,size_t size, +unsigned long flags) +{ +unsigned long pfn =PHYS_PFN (offset); + +return memblock_is_map_memory (pfn); +}
arch/mips/jz4740/setup.c +1 -1
@@ -61,7 +61,7 @@ void __init plat_mem_setup(void)jz4740_reset_init (); -if (__dtb_start != __dtb_end) +if (&__dtb_start != &__dtb_end) dtb = __dtb_start;else dtb = (void *)fw_passed_dtb;
arch/s390/Makefile +10 -0
@@ -31,6 +31,16 @@ KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding) KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member) KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g) KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,)) + +ifdef CONFIG_CC_IS_GCC + ifeq ($(call cc-ifversion, -ge, 1200, y), y) + ifeq ($(call cc-ifversion, -lt, 1300, y), y) + KBUILD_CFLAGS += $(call cc-disable-warning, array-bounds) + KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, array-bounds) + endif + endif +endif + UTS_MACHINE := s390x STACK_SIZE := $(if $(CONFIG_KASAN),65536,16384) CHECKFLAGS += -D__s390__ -D__s390x__
drivers/gpu/drm/nouveau/nouveau_backlight.c +5 -4
@@ -51,8 +51,9 @@ static bool nouveau_get_backlight_name(char backlight_name[BL_NAME_SIZE], struct nouveau_backlight *bl) { - const int nb = ida_simple_get(&bl_ida, 0, 0, GFP_KERNEL); -if (nb <0 || nb >=100 ) + const int nb = ida_alloc_max(&bl_ida, 99, GFP_KERNEL); + +if (nb <0 )return false;if (nb >0 )snprintf (backlight_name,BL_NAME_SIZE ,"nv_backlight%d" , nb);
@@ -280,7 +281,7 @@ nouveau_backlight_init(struct drm_connector *connector) nv_encoder, ops, &props);if (IS_ERR (bl->dev)) {if (bl->id >=0 ) -ida_simple_remove (&bl_ida, bl->id); +ida_free (&bl_ida, bl->id); ret =PTR_ERR (bl->dev); goto fail_alloc; }
@@ -306,7 +307,7 @@ nouveau_backlight_fini(struct drm_connector *connector)return ;if (bl->id >=0 ) -ida_simple_remove (&bl_ida, bl->id); +ida_free (&bl_ida, bl->id);backlight_device_unregister (bl->dev); nv_conn->backlight =NULL ;
drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c +1 -1
@@ -123,7 +123,7 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev)mutex_init (&tdev->iommu.mutex); -if (iommu_present (&platform_bus_type)) { +if (device_iommu_mapped (dev)) { tdev->iommu.domain =iommu_domain_alloc (&platform_bus_type);if (!tdev->iommu.domain) goto error;
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +1 -1
@@ -498,7 +498,7 @@ static int vmw_fb_kms_detach(struct vmw_fb_par *par,static int vmw_fb_kms_framebuffer (struct fb_info *info) { -struct drm_mode_fb_cmd2 mode_cmd; +struct drm_mode_fb_cmd2 mode_cmd = {0 };struct vmw_fb_par *par = info->par;struct fb_var_screeninfo *var = &info->var;struct drm_framebuffer *cur_fb;
drivers/hwmon/Kconfig +1 -1
@@ -802,7 +802,7 @@ config SENSORS_LTC4261 config SENSORS_LTQ_CPUTEMP bool "Lantiq cpu temperature sensor driver" - depends on LANTIQ + depends on SOC_XWAY help If you say yes here you get support for the temperature sensor inside your CPU.
drivers/hwmon/f71882fg.c +3 -2
@@ -1577,8 +1577,9 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr, temp *=125 ;if (sign) temp -=128000 ; - }else - temp = data->temp[nr] *1000 ; + }else { + temp = ((s8 )data->temp[nr]) *1000 ; + }return sprintf (buf,"%d\n" , temp); }
drivers/hwmon/tmp401.c +11 -0
@@ -731,10 +731,21 @@ static int tmp401_probe(struct i2c_client *client,return 0 ; } +static const struct of_device_id __maybe_unused tmp4xx_of_match[] = { + { .compatible ="ti,tmp401" , }, + { .compatible ="ti,tmp411" , }, + { .compatible ="ti,tmp431" , }, + { .compatible ="ti,tmp432" , }, + { .compatible ="ti,tmp435" , }, + { }, +}; +MODULE_DEVICE_TABLE (of, tmp4xx_of_match); +static struct i2c_driver tmp401_driver = { .class =I2C_CLASS_HWMON , .driver = { .name ="tmp401" , + .of_match_table =of_match_ptr (tmp4xx_of_match), }, .probe = tmp401_probe, .id_table = tmp401_id,
drivers/net/ethernet/intel/i40e/i40e_main.c +14 -13
@@ -7120,42 +7120,43 @@ static void i40e_free_macvlan_channels(struct i40e_vsi *vsi)static int i40e_fwd_ring_up (struct i40e_vsi *vsi,struct net_device *vdev,struct i40e_fwd_adapter *fwd) { +struct i40e_channel *ch =NULL , *ch_tmp, *iter;int ret =0 , num_tc =1 , i, aq_err; -struct i40e_channel *ch, *ch_tmp;struct i40e_pf *pf = vsi->back;struct i40e_hw *hw = &pf->hw; -if (list_empty (&vsi->macvlan_list)) -return -EINVAL ; -/* Go through the list and find an available channel */ -list_for_each_entry_safe (ch, ch_tmp, &vsi->macvlan_list, list) { -if (!i40e_is_channel_macvlan (ch)) { - ch->fwd = fwd; +list_for_each_entry_safe (iter, ch_tmp, &vsi->macvlan_list, list) { +if (!i40e_is_channel_macvlan (iter)) { + iter->fwd = fwd;/* record configuration for macvlan interface in vdev */ for (i =0 ; i < num_tc; i++)netdev_bind_sb_channel_queue (vsi->netdev, vdev, i, - ch->num_queue_pairs, - ch->base_queue); -for (i =0 ; i < ch->num_queue_pairs; i++) { + iter->num_queue_pairs, + iter->base_queue); +for (i =0 ; i < iter->num_queue_pairs; i++) {struct i40e_ring *tx_ring, *rx_ring;u16 pf_q; - pf_q = ch->base_queue + i; + pf_q = iter->base_queue + i;/* Get to TX ring ptr */ tx_ring = vsi->tx_rings[pf_q]; - tx_ring->ch = ch; + tx_ring->ch = iter;/* Get the RX ring ptr */ rx_ring = vsi->rx_rings[pf_q]; - rx_ring->ch = ch; + rx_ring->ch = iter; } + ch = iter;break ; } } +if (!ch) +return -EINVAL ; +/* Guarantee all rings are updated before we update the * MAC address filter. */
drivers/net/ethernet/sfc/ef10.c +5 -0
@@ -6160,6 +6160,11 @@ static int efx_ef10_mtd_probe(struct efx_nic *efx) n_parts++; } +if (!n_parts) { +kfree (parts); +return 0 ; + } + rc =efx_mtd_add (efx, &parts[0 ].common, n_parts,sizeof (*parts)); fail:if (rc)
drivers/net/ethernet/xilinx/xilinx_emaclite.c +0 -15
@@ -932,8 +932,6 @@ static int xemaclite_open(struct net_device *dev)xemaclite_disable_interrupts (lp);if (lp->phy_node) { -u32 bmcr; - lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, xemaclite_adjust_link,0 ,PHY_INTERFACE_MODE_MII );
@@ -944,19 +942,6 @@ static int xemaclite_open(struct net_device *dev)/* EmacLite doesn't support giga-bit speeds */ phy_set_max_speed (lp->phy_dev,SPEED_100 ); - -/* Don't advertise 1000BASE-T Full/Half duplex speeds */ -phy_write (lp->phy_dev,MII_CTRL1000 ,0 ); - -/* Advertise only 10 and 100mbps full/half duplex speeds */ -phy_write (lp->phy_dev,MII_ADVERTISE ,ADVERTISE_ALL | -ADVERTISE_CSMA ); - -/* Restart auto negotiation */ - bmcr =phy_read (lp->phy_dev,MII_BMCR ); - bmcr |= (BMCR_ANENABLE |BMCR_ANRESTART ); -phy_write (lp->phy_dev,MII_BMCR , bmcr); -phy_start (lp->phy_dev); }
drivers/net/phy/phy.c +40 -5
67 lines not on this page · raw message
drivers/net/wireless/mac80211_hwsim.c +3 -0
@@ -2062,11 +2062,13 @@ static void hw_scan_work(struct work_struct *work)if (req->ie_len)skb_put_data (probe, req->ie, req->ie_len); +rcu_read_lock ();if (!ieee80211_tx_prepare_skb (hwsim->hw, hwsim->hw_scan_vif, probe, hwsim->tmp_chan->band,NULL )) { +rcu_read_unlock ();kfree_skb (probe);continue ; }
@@ -2074,6 +2076,7 @@ static void hw_scan_work(struct work_struct *work)local_bh_disable ();mac80211_hwsim_tx_frame (hwsim->hw, probe, hwsim->tmp_chan); +rcu_read_unlock ();local_bh_enable (); } }
drivers/s390/net/ctcm_mpc.c +1 -5
@@ -626,8 +626,6 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)ctcm_clear_busy_do (dev); } -kfree (mpcginfo); -return ; }
@@ -1206,10 +1204,10 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) CTCM_FUNTAIL, dev->name); priv->stats.rx_dropped++;/* mpcginfo only used for non-data transfers */ -kfree (mpcginfo);if (do_debug_data)ctcmpc_dump_skb (pskb,-8 ); } +kfree (mpcginfo); } done:
@@ -1991,7 +1989,6 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg) }break ; } -kfree (mpcginfo); CTCM_PR_DEBUG("ctcmpc:%s() %s xid2:%i xid7:%i xidt_p2:%i \n", __func__, ch->id, grp->outstanding_xid2,
@@ -2052,7 +2049,6 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg)mpc_validate_xid (mpcginfo);break ; } -kfree (mpcginfo);return ; }
drivers/s390/net/ctcm_sysfs.c +3 -2
@@ -39,11 +39,12 @@ static ssize_t ctcm_buffer_write(struct device *dev,struct ctcm_priv *priv =dev_get_drvdata (dev);int rc; - ndev = priv->channel[CTCM_READ ]->netdev; -if (!(priv && priv->channel[CTCM_READ ] && ndev)) { +if (!(priv && priv->channel[CTCM_READ ] && + priv->channel[CTCM_READ ]->netdev)) {CTCM_DBF_TEXT (SETUP ,CTC_DBF_ERROR ,"bfnondev" );return -ENODEV ; } + ndev = priv->channel[CTCM_READ ]->netdev; rc =kstrtouint (buf,0 , &bs1);if (rc)
drivers/s390/net/lcs.c +4 -3
@@ -1735,10 +1735,11 @@ lcs_get_control(struct lcs_card *card, struct lcs_cmd *cmd)lcs_schedule_recovery (card);break ;case LCS_CMD_STOPLAN : -pr_warn ("Stoplan for %s initiated by LGW\n" , - card->dev->name); -if (card->dev) +if (card->dev) { +pr_warn ("Stoplan for %s initiated by LGW\n" , + card->dev->name);netif_carrier_off (card->dev); + }break ;default :LCS_DBF_TEXT (5 , trace,"noLGWcmd" );
drivers/slimbus/qcom-ctrl.c +2 -2
@@ -515,9 +515,9 @@ static int qcom_slim_probe(struct platform_device *pdev) } ctrl->irq =platform_get_irq (pdev,0 ); -if (!ctrl->irq) { +if (ctrl->irq <0 ) {dev_err (&pdev->dev,"no slimbus IRQ\n" ); -return -ENODEV ; +return ctrl->irq; } sctrl = &ctrl->ctrl;
drivers/tty/n_gsm.c +8 -4
@@ -2259,6 +2259,7 @@ static void gsm_copy_config_values(struct gsm_mux *gsm,static int gsm_config (struct gsm_mux *gsm,struct gsm_config *c) { +int ret =0 ;int need_close =0 ;int need_restart =0 ;
@@ -2334,10 +2335,13 @@ static int gsm_config(struct gsm_mux *gsm, struct gsm_config *c)* FIXME: We need to separate activation/deactivation from adding * and removing from the mux array */ -if (need_restart) -gsm_activate_mux (gsm); -if (gsm->initiator && need_close) -gsm_dlci_begin_open (gsm->dlci[0 ]); +if (gsm->dead) { + ret =gsm_activate_mux (gsm); +if (ret) +return ret; +if (gsm->initiator) +gsm_dlci_begin_open (gsm->dlci[0 ]); + }return 0 ; }
drivers/tty/serial/8250/8250_mtk.c +13 -9
@@ -36,6 +36,7 @@#define MTK_UART_IER_RTSI 0x40/* Enable RTS Modem status interrupt */ #define MTK_UART_IER_CTSI 0x80/* Enable CTS Modem status interrupt */ +#define MTK_UART_EFR 38/* I/O: Extended Features Register */ #define MTK_UART_EFR_EN 0x10/* Enable enhancement feature */ #define MTK_UART_EFR_RTS 0x40/* Enable hardware rx flow control */ #define MTK_UART_EFR_CTS 0x80/* Enable hardware tx flow control */
@@ -52,6 +53,9 @@#define MTK_UART_TX_TRIGGER 1#define MTK_UART_RX_TRIGGER MTK_UART_RX_SIZE +#define MTK_UART_XON1 40/* I/O: Xon character 1 */ +#define MTK_UART_XOFF1 42/* I/O: Xoff character 1 */ +#ifdef CONFIG_SERIAL_8250_DMA enum dma_rx_status { DMA_RX_START = 0,
@@ -168,7 +172,7 @@ static void mtk8250_dma_enable(struct uart_8250_port *up) MTK_UART_DMA_EN_RX | MTK_UART_DMA_EN_TX);serial_out (up,UART_LCR ,UART_LCR_CONF_MODE_B ); -serial_out (up,UART_EFR ,UART_EFR_ECB ); +serial_out (up,MTK_UART_EFR ,UART_EFR_ECB );serial_out (up,UART_LCR , lcr);if (dmaengine_slave_config (dma->rxchan, &dma->rxconf) !=0 )
@@ -231,7 +235,7 @@ static void mtk8250_set_flow_ctrl(struct uart_8250_port *up, int mode)int lcr =serial_in (up,UART_LCR );serial_out (up,UART_LCR ,UART_LCR_CONF_MODE_B ); -serial_out (up,UART_EFR ,UART_EFR_ECB ); +serial_out (up,MTK_UART_EFR ,UART_EFR_ECB );serial_out (up,UART_LCR , lcr); lcr =serial_in (up,UART_LCR );
@@ -240,7 +244,7 @@ static void mtk8250_set_flow_ctrl(struct uart_8250_port *up, int mode)serial_out (up,MTK_UART_ESCAPE_DAT ,MTK_UART_ESCAPE_CHAR );serial_out (up,MTK_UART_ESCAPE_EN ,0x00 );serial_out (up,UART_LCR ,UART_LCR_CONF_MODE_B ); -serial_out (up,UART_EFR ,serial_in (up,UART_EFR ) & +serial_out (up,MTK_UART_EFR ,serial_in (up,MTK_UART_EFR ) & (~(MTK_UART_EFR_HW_FC |MTK_UART_EFR_SW_FC_MASK )));serial_out (up,UART_LCR , lcr); mtk8250_disable_intrs(up, MTK_UART_IER_XOFFI |
@@ -254,8 +258,8 @@ static void mtk8250_set_flow_ctrl(struct uart_8250_port *up, int mode)serial_out (up,UART_LCR ,UART_LCR_CONF_MODE_B );/*enable hw flow control*/ -serial_out (up,UART_EFR ,MTK_UART_EFR_HW_FC | - (serial_in (up,UART_EFR ) & +serial_out (up,MTK_UART_EFR ,MTK_UART_EFR_HW_FC | + (serial_in (up,MTK_UART_EFR ) & (~(MTK_UART_EFR_HW_FC |MTK_UART_EFR_SW_FC_MASK ))));serial_out (up,UART_LCR , lcr);
@@ -269,12 +273,12 @@ static void mtk8250_set_flow_ctrl(struct uart_8250_port *up, int mode)serial_out (up,UART_LCR ,UART_LCR_CONF_MODE_B );/*enable sw flow control */ -serial_out (up,UART_EFR ,MTK_UART_EFR_XON1_XOFF1 | - (serial_in (up,UART_EFR ) & +serial_out (up,MTK_UART_EFR ,MTK_UART_EFR_XON1_XOFF1 | + (serial_in (up,MTK_UART_EFR ) & (~(MTK_UART_EFR_HW_FC |MTK_UART_EFR_SW_FC_MASK )))); -serial_out (up,UART_XON1 ,START_CHAR (port->state->port.tty)); -serial_out (up,UART_XOFF1 ,STOP_CHAR (port->state->port.tty)); +serial_out (up,MTK_UART_XON1 ,START_CHAR (port->state->port.tty)); +serial_out (up,MTK_UART_XOFF1 ,STOP_CHAR (port->state->port.tty));serial_out (up,UART_LCR , lcr);mtk8250_disable_intrs (up,MTK_UART_IER_CTSI |MTK_UART_IER_RTSI );mtk8250_enable_intrs (up,MTK_UART_IER_XOFFI );
drivers/tty/serial/digicolor-usart.c +1 -1
@@ -472,10 +472,10 @@ static int digicolor_uart_probe(struct platform_device *pdev)return PTR_ERR (uart_clk); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - dp->port.mapbase = res->start; dp->port.membase =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (dp->port.membase))return PTR_ERR (dp->port.membase); + dp->port.mapbase = res->start; irq =platform_get_irq (pdev,0 );if (irq <0 )
drivers/usb/class/cdc-wdm.c +1 -0
@@ -755,6 +755,7 @@ static int wdm_release(struct inode *inode, struct file *file)poison_urbs (desc);spin_lock_irq (&desc->iuspin); desc->resp_count =0 ; +clear_bit (WDM_RESPONDING , &desc->flags);spin_unlock_irq (&desc->iuspin); desc->manage_power (desc->intf,0 );unpoison_urbs (desc);
drivers/usb/serial/option.c +4 -0
@@ -2123,10 +2123,14 @@ static const struct usb_device_id option_ids[] = { .driver_info = RSVD(3) }, { USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 (IOT version) */ .driver_info = RSVD(4) | RSVD(5) | RSVD(6) }, + { USB_DEVICE(0x1782, 0x4d10) }, /* Fibocom L610 (AT mode) */ + { USB_DEVICE_INTERFACE_CLASS(0x1782, 0x4d11, 0xff) }, /* Fibocom L610 (ECM/RNDIS mode) */ { USB_DEVICE(0x2cb7, 0x0104), /* Fibocom NL678 series */ .driver_info = RSVD(4) | RSVD(5) }, { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff), /* Fibocom NL678 series */ .driver_info = RSVD(6) }, + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0106, 0xff) }, /* Fibocom MA510 (ECM mode w/ diag intf.) */ + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x010a, 0xff) }, /* Fibocom MA510 (ECM mode) */ { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) }, /* Fibocom FG150 Diag */ { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) }, /* Fibocom FG150 AT */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */
drivers/usb/serial/pl2303.c +1 -0
@@ -100,6 +100,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(HP_VENDOR_ID, HP_LCM220_PRODUCT_ID) }, { USB_DEVICE(HP_VENDOR_ID, HP_LCM960_PRODUCT_ID) }, { USB_DEVICE(HP_VENDOR_ID, HP_LM920_PRODUCT_ID) }, + { USB_DEVICE(HP_VENDOR_ID, HP_LM930_PRODUCT_ID) }, { USB_DEVICE(HP_VENDOR_ID, HP_LM940_PRODUCT_ID) }, { USB_DEVICE(HP_VENDOR_ID, HP_TD620_PRODUCT_ID) }, { USB_DEVICE(CRESSI_VENDOR_ID, CRESSI_EDY_PRODUCT_ID) },
drivers/usb/serial/pl2303.h +1 -0
@@ -129,6 +129,7 @@#define HP_TD620_PRODUCT_ID 0x0956#define HP_LD960_PRODUCT_ID 0x0b39#define HP_LD381_PRODUCT_ID 0x0f7f +#define HP_LM930_PRODUCT_ID 0x0f9b#define HP_LCM220_PRODUCT_ID 0x3139#define HP_LCM960_PRODUCT_ID 0x3239#define HP_LD220_PRODUCT_ID 0x3524
drivers/usb/serial/qcserial.c +2 -0
@@ -166,6 +166,8 @@ static const struct usb_device_id id_table[] = { {DEVICE_SWI(0x1199, 0x9090)}, /* Sierra Wireless EM7565 QDL */ {DEVICE_SWI(0x1199, 0x9091)}, /* Sierra Wireless EM7565 */ {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9191 QDL */ + {DEVICE_SWI(0x1199, 0xc080)}, /* Sierra Wireless EM7590 QDL */ + {DEVICE_SWI(0x1199, 0xc081)}, /* Sierra Wireless EM7590 */ {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ {DEVICE_SWI(0x413c, 0x81a3)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ {DEVICE_SWI(0x413c, 0x81a4)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */
drivers/usb/typec/tcpm/tcpci.c +1 -1
@@ -611,7 +611,7 @@ static int tcpci_remove(struct i2c_client *client)/* Disable chip interrupts before unregistering port */ err =tcpci_write16 (chip->tcpci,TCPC_ALERT_MASK ,0 );if (err <0 ) -return err; +dev_warn (&client->dev,"Failed to disable irqs (%pe)\n" ,ERR_PTR (err));tcpci_unregister_port (chip->tcpci);
fs/gfs2/bmap.c +5 -6
@@ -1233,13 +1233,12 @@ static int gfs2_iomap_end(struct inode *inode, loff_t pos, loff_t length,if (length != written && (iomap->flags &IOMAP_F_NEW )) {/* Deallocate blocks that were just allocated. */ -loff_t blockmask =i_blocksize (inode) -1 ; -loff_t end = (pos + length) & ~blockmask; +loff_t hstart =round_up (pos + written,i_blocksize (inode)); +loff_t hend = iomap->offset + iomap->length; - pos = (pos + written + blockmask) & ~blockmask; -if (pos < end) { -truncate_pagecache_range (inode, pos, end -1 ); -punch_hole (ip, pos, end - pos); +if (hstart < hend) { +truncate_pagecache_range (inode, hstart, hend -1 ); +punch_hole (ip, hstart, hend - hstart); } }
include/linux/netdev_features.h +2 -2
@@ -151,7 +151,7 @@ enum {#define NETIF_F_HW_TLS_TX __NETIF_F(HW_TLS_TX)#define NETIF_F_HW_TLS_RX __NETIF_F(HW_TLS_RX) -/* Finds the next feature with the highest number of the range of start till 0. +/* Finds the next feature with the highest number of the range of start-1 till 0. */ static inline int find_next_netdev_feature (u64 feature,unsigned long start) {
@@ -170,7 +170,7 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)for ((bit) =find_next_netdev_feature ((mask_addr), \NETDEV_FEATURE_COUNT ); \ (bit) >=0 ; \ - (bit) =find_next_netdev_feature ((mask_addr), (bit) -1 )) + (bit) =find_next_netdev_feature ((mask_addr), (bit)))/* Features valid for ethtool to change */ /* = all defined minus driver/device-class-related */
include/net/tc_act/tc_pedit.h +1 -0
@@ -14,6 +14,7 @@ struct tcf_pedit {struct tc_action common;unsigned char tcfp_nkeys;unsigned char tcfp_flags; +u32 tcfp_off_max_hint;struct tc_pedit_key *tcfp_keys;struct tcf_pedit_key_ex *tcfp_keys_ex; };
kernel/cgroup/cpuset.c +5 -2
@@ -3289,8 +3289,11 @@ static struct notifier_block cpuset_track_online_nodes_nb = {*/ void __init cpuset_init_smp (void ) { -cpumask_copy (top_cpuset.cpus_allowed, cpu_active_mask); - top_cpuset.mems_allowed = node_states[N_MEMORY ]; +/* +* cpus_allowd/mems_allowed set to v2 values in the initial +* cpuset_bind() call will be reset to v1 values in another +* cpuset_bind() call when v1 cpuset is mounted. +*/ top_cpuset.old_mems_allowed = top_cpuset.mems_allowed;cpumask_copy (top_cpuset.effective_cpus, cpu_active_mask);
lib/dim/net_dim.c +22 -22
63 lines not on this page · raw message
net/batman-adv/fragmentation.c +11 -0
@@ -478,6 +478,17 @@ int batadv_frag_send_packet(struct sk_buff *skb, goto free_skb; } +/* GRO might have added fragments to the fragment list instead of +* frags[]. But this is not handled by skb_split and must be +* linearized to avoid incorrect length information after all +* batman-adv fragments were created and submitted to the +* hard-interface +*/ +if (skb_has_frag_list (skb) &&__skb_linearize (skb)) { + ret = -ENOMEM ; + goto free_skb; + } +/* Create one header to be copied to all fragments */ frag_header.packet_type =BATADV_UNICAST_FRAG ; frag_header.version =BATADV_COMPAT_VERSION ;
net/core/secure_seq.c +9 -3
@@ -23,6 +23,8 @@static siphash_key_t net_secret__read_mostly ;static siphash_key_t ts_secret__read_mostly ; +#define EPHEMERAL_PORT_SHUFFLE_PERIOD (10 * HZ) + static __always_inline void net_secret_init(void) {net_get_random_once (&net_secret,sizeof (net_secret));
@@ -101,11 +103,13 @@ u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,const struct {struct in6_addr saddr;struct in6_addr daddr; +unsigned int timeseed;__be16 dport; }__aligned(SIPHASH_ALIGNMENT) combined = { .saddr = *(struct in6_addr *)saddr, .daddr = *(struct in6_addr *)daddr, - .dport = dport + .timeseed = jiffies /EPHEMERAL_PORT_SHUFFLE_PERIOD , + .dport = dport, };net_secret_init (); return siphash(&combined, offsetofend(typeof(combined), dport),
@@ -146,8 +150,10 @@ EXPORT_SYMBOL_GPL(secure_tcp_seq);u32 secure_ipv4_port_ephemeral (__be32 saddr,__be32 daddr,__be16 dport) {net_secret_init (); -return siphash_3u32 ((__force u32 )saddr, (__force u32 )daddr, - (__force u16 )dport, &net_secret); +return siphash_4u32 ((__force u32 )saddr, (__force u32 )daddr, + (__force u16 )dport, + jiffies /EPHEMERAL_PORT_SHUFFLE_PERIOD , + &net_secret); }EXPORT_SYMBOL_GPL (secure_ipv4_port_ephemeral);#endif
net/ipv4/ping.c +11 -1
@@ -304,6 +304,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,struct net *net =sock_net (sk);if (sk->sk_family ==AF_INET ) {struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; +u32 tb_id =RT_TABLE_LOCAL ;int chk_addr_ret;if (addr_len <sizeof (*addr))
@@ -317,7 +318,8 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,pr_debug ("ping_check_bind_addr(sk=%p,addr=%pI4,port=%d)\n" , sk, &addr->sin_addr.s_addr,ntohs (addr->sin_port)); - chk_addr_ret =inet_addr_type (net, addr->sin_addr.s_addr); + tb_id =l3mdev_fib_table_by_index (net, sk->sk_bound_dev_if) ? : tb_id; + chk_addr_ret =inet_addr_type_table (net, addr->sin_addr.s_addr, tb_id);if (addr->sin_addr.s_addr ==htonl (INADDR_ANY )) chk_addr_ret =RTN_LOCAL ;
@@ -358,6 +360,14 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,return -ENODEV ; } } + +if (!dev && sk->sk_bound_dev_if) { + dev =dev_get_by_index_rcu (net, sk->sk_bound_dev_if); +if (!dev) { +rcu_read_unlock (); +return -ENODEV ; + } + } has_addr = pingv6_ops.ipv6_chk_addr (net, &addr->sin6_addr, dev, scoped);rcu_read_unlock ();
net/ipv4/route.c +1 -0
@@ -1775,6 +1775,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,#endif RT_CACHE_STAT_INC (in_slow_mc); +skb_dst_drop (skb);skb_dst_set (skb, &rth->dst);return 0 ; }
net/mac80211/mlme.c +6 -0
@@ -3406,6 +3406,12 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, cbss->transmitted_bss->bssid); bss_conf->bssid_indicator = cbss->max_bssid_indicator; bss_conf->bssid_index = cbss->bssid_index; + }else { + bss_conf->nontransmitted = false; +memset (bss_conf->transmitter_bssid,0 , +sizeof (bss_conf->transmitter_bssid)); + bss_conf->bssid_indicator =0 ; + bss_conf->bssid_index =0 ; }/*
net/netlink/af_netlink.c +0 -1
@@ -1987,7 +1987,6 @@ static int netlink_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, copied = len; } -skb_reset_transport_header (data_skb); err =skb_copy_datagram_msg (data_skb,0 , msg, copied);if (msg->msg_name) {
net/sched/act_pedit.c +22 -4
@@ -148,7 +148,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,struct nlattr *pattr;struct tcf_pedit *p;int ret =0 , err; -int ksize; +int i, ksize;u32 index;if (!nla) {
@@ -227,6 +227,18 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla, p->tcfp_nkeys = parm->nkeys; }memcpy (p->tcfp_keys, parm->keys, ksize); + p->tcfp_off_max_hint =0 ; +for (i =0 ; i < p->tcfp_nkeys; ++i) { +u32 cur = p->tcfp_keys[i].off; + +/* The AT option can read a single byte, we can bound the actual +* value with uchar max. +*/ + cur += (0xff & p->tcfp_keys[i].offmask) >> p->tcfp_keys[i].shift; + +/* Each key touches 4 bytes starting from the computed offset */ + p->tcfp_off_max_hint =max (p->tcfp_off_max_hint, cur +4 ); + } p->tcfp_flags = parm->flags; goto_ch =tcf_action_set_ctrlact (*a, parm->action, goto_ch);
@@ -307,13 +319,18 @@ static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a, struct tcf_result *res) {struct tcf_pedit *p =to_pedit (a); +u32 max_offset;int i; -if (skb_unclone (skb,GFP_ATOMIC )) -return p->tcf_action; -spin_lock (&p->tcf_lock); + max_offset = (skb_transport_header_was_set (skb) ? +skb_transport_offset (skb) : +skb_network_offset (skb)) + + p->tcfp_off_max_hint; +if (skb_ensure_writable (skb,min (skb->len, max_offset))) + goto unlock; +tcf_lastuse_update (&p->tcf_tm);if (p->tcfp_nkeys >0 ) {
@@ -402,6 +419,7 @@ static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a, p->tcf_qstats.overlimits++; done:bstats_update (&p->tcf_bstats, skb); +unlock:spin_unlock (&p->tcf_lock);return p->tcf_action; }
net/smc/smc_rx.c +2 -2
@@ -348,12 +348,12 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg, }break ; } +if (!timeo) +return -EAGAIN ;if (signal_pending (current)) { read_done =sock_intr_errno (timeo);break ; } -if (!timeo) -return -EAGAIN ; }if (!smc_rx_data_available (conn)) {
sound/soc/codecs/max98090.c +4 -1
@@ -413,6 +413,9 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol, val = (val >> mc->shift) & mask; +if (sel <0 || sel > mc->max) +return -EINVAL ; + *select = sel;/* Setting a volume is only valid if it is already On */
@@ -427,7 +430,7 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol, mask << mc->shift, sel << mc->shift); -return 0 ; +return *select != val; } static const char *max98090_perf_pwr_text[] =
sound/soc/soc-ops.c +17 -1
@@ -523,7 +523,15 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,unsigned int mask = (1 <<fls (max)) -1 ;unsigned int invert = mc->invert;unsigned int val, val_mask; -int err, ret; +int err, ret, tmp; + + tmp = ucontrol->value.integer.value[0 ]; +if (tmp <0 ) +return -EINVAL ; +if (mc->platform_max && tmp > mc->platform_max) +return -EINVAL ; +if (tmp > mc->max - mc->min +1 ) +return -EINVAL ;if (invert) val = (max - ucontrol->value.integer.value[0 ]) & mask;
@@ -538,6 +546,14 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol, ret = err;if (snd_soc_volsw_is_stereo (mc)) { + tmp = ucontrol->value.integer.value[1 ]; +if (tmp <0 ) +return -EINVAL ; +if (mc->platform_max && tmp > mc->platform_max) +return -EINVAL ; +if (tmp > mc->max - mc->min +1 ) +return -EINVAL ; +if (invert) val = (max - ucontrol->value.integer.value[1 ]) & mask;else