5.4.89-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 3/92 scsi: ufs-pci: Ensure UFS device is in PowerDown mode for suspend-to-disk ->poweroff()
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit af423534d2de86cd0db729a5ac41f056ca8717de ]
The expectation for suspend-to-disk is that devices will be powered-off, so the UFS device should be put in PowerDown mode. If spm_lvl is not 5, then that will not happen. Change the pm callbacks to force spm_lvl 5 for suspend-to-disk poweroff.
--- drivers/scsi/ufs/ufshcd-pci.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd-pci.c +32 -2
@@ -96,6 +96,30 @@ static int ufshcd_pci_resume(struct device *dev) {return ufshcd_system_resume (dev_get_drvdata (dev)); } + +/** +* ufshcd_pci_poweroff - suspend-to-disk poweroff function +* @dev: pointer to PCI device handle +* +* Returns 0 if successful +* Returns non-zero otherwise +*/ +static int ufshcd_pci_poweroff (struct device *dev) +{ +struct ufs_hba *hba =dev_get_drvdata (dev); +int spm_lvl = hba->spm_lvl; +int ret; + +/* +* For poweroff we need to set the UFS device to PowerDown mode. +* Force spm_lvl to ensure that. +*/ + hba->spm_lvl =5 ; + ret =ufshcd_system_suspend (hba); + hba->spm_lvl = spm_lvl; +return ret; +} +#endif /* !CONFIG_PM_SLEEP */ #ifdef CONFIG_PM
@@ -190,8 +214,14 @@ ufshcd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) }static const struct dev_pm_ops ufshcd_pci_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(ufshcd_pci_suspend, - ufshcd_pci_resume) +#ifdef CONFIG_PM_SLEEP + .suspend = ufshcd_pci_suspend, + .resume = ufshcd_pci_resume, + .freeze = ufshcd_pci_suspend, + .thaw = ufshcd_pci_resume, + .poweroff = ufshcd_pci_poweroff, + .restore = ufshcd_pci_resume, +#endifSET_RUNTIME_PM_OPS (ufshcd_pci_runtime_suspend, ufshcd_pci_runtime_resume, ufshcd_pci_runtime_idle)
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 14/92 net: systemport: set dev->max_mtu to UMAC_MAX_MTU_SIZE
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 54ddbdb024882e226055cc4c3c246592ddde2ee5 ]
The driver is already allocating receive buffers of 2KiB and the Ethernet MAC is configured to accept frames up to UMAC_MAX_MTU_SIZE.
--- drivers/net/ethernet/broadcom/bcmsysport.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/broadcom/bcmsysport.c +1 -0
@@ -2520,6 +2520,7 @@ static int bcm_sysport_probe(struct platNETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM ; dev->hw_features |= dev->features; dev->vlan_features |= dev->features; + dev->max_mtu =UMAC_MAX_MTU_SIZE ;/* Request the WOL interrupt and advertise suspend if available */ priv->wol_irq_disabled =1 ;
Greg Kroah-Hartman
maintainerPATCH 6/92 lib/genalloc: fix the overflow when size is too big
In reply to Greg Kroah-HartmanFrom: Huang Shijie <[email protected]>
[ Upstream commit 36845663843fc59c5d794e3dc0641472e3e572da ]
Some graphic card has very big memory on chip, such as 32G bytes.
In the following case, it will cause overflow:
pool = gen_pool_create(PAGE_SHIFT, NUMA_NO_NODE);
ret = gen_pool_add(pool, 0x1000000, SZ_32G, NUMA_NO_NODE);
va = gen_pool_alloc(pool, SZ_4G);The overflow occurs in gen_pool_alloc_algo_owner():
.... size = nbits << order; ....
The @nbits is "int" type, so it will overflow. Then the gen_pool_avail() will return the wrong value.
This patch converts some "int" to "unsigned long", and changes the compare code in while.
--- lib/genalloc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
lib/genalloc.c +13 -12
@@ -81,14 +81,14 @@ static int clear_bits_ll(unsigned long *addr, unsigned long mask_to_clear)* users set the same bit, one user will return remain bits, otherwise * return 0. */ -static int bitmap_set_ll (unsigned long *map,int start,int nr) +static int bitmap_set_ll (unsigned long *map,unsigned long start,unsigned long nr) {unsigned long *p = map +BIT_WORD (start); -const int size = start + nr; +const unsigned long size = start + nr;int bits_to_set =BITS_PER_LONG - (start %BITS_PER_LONG );unsigned long mask_to_set =BITMAP_FIRST_WORD_MASK (start); -while (nr - bits_to_set >=0 ) { +while (nr >= bits_to_set) {if (set_bits_ll (p, mask_to_set))return nr; nr -= bits_to_set;
@@ -116,14 +116,15 @@ static int bitmap_set_ll(unsigned long *map, int start, int nr)* users clear the same bit, one user will return remain bits, * otherwise return 0. */ -static int bitmap_clear_ll (unsigned long *map,int start,int nr) +static unsigned long +bitmap_clear_ll (unsigned long *map,unsigned long start,unsigned long nr) {unsigned long *p = map +BIT_WORD (start); -const int size = start + nr; +const unsigned long size = start + nr;int bits_to_clear =BITS_PER_LONG - (start %BITS_PER_LONG );unsigned long mask_to_clear =BITMAP_FIRST_WORD_MASK (start); -while (nr - bits_to_clear >=0 ) { +while (nr >= bits_to_clear) {if (clear_bits_ll (p, mask_to_clear))return nr; nr -= bits_to_clear;
@@ -183,8 +184,8 @@ int gen_pool_add_owner(struct gen_pool *pool, unsigned long virt, phys_addr_t ph size_t size, int nid, void *owner) { struct gen_pool_chunk *chunk; -int nbits = size >> pool->min_alloc_order; -int nbytes =sizeof (struct gen_pool_chunk ) + +unsigned long nbits = size >> pool->min_alloc_order; +unsigned long nbytes =sizeof (struct gen_pool_chunk ) +BITS_TO_LONGS (nbits) *sizeof (long ); chunk =vzalloc_node (nbytes, nid);
@@ -242,7 +243,7 @@ void gen_pool_destroy(struct gen_pool *pool)struct list_head *_chunk, *_next_chunk;struct gen_pool_chunk *chunk;int order = pool->min_alloc_order; -int bit, end_bit; +unsigned long bit, end_bit;list_for_each_safe (_chunk, _next_chunk, &pool->chunks) { chunk = list_entry(_chunk, struct gen_pool_chunk, next_chunk);
@@ -278,7 +279,7 @@ unsigned long gen_pool_alloc_algo_owner(struct gen_pool *pool, size_t size,struct gen_pool_chunk *chunk;unsigned long addr =0 ;int order = pool->min_alloc_order; -int nbits, start_bit, end_bit, remain; +unsigned long nbits, start_bit, end_bit, remain;#ifndef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG BUG_ON (in_nmi ());
@@ -487,7 +488,7 @@ void gen_pool_free_owner(struct gen_pool *pool, unsigned long addr, size_t size, {struct gen_pool_chunk *chunk;int order = pool->min_alloc_order; -int start_bit, nbits, remain; +unsigned long start_bit, nbits, remain;#ifndef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG BUG_ON (in_nmi ());
@@ -754,7 +755,7 @@ unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size, index =bitmap_find_next_zero_area (map, size, start, nr,0 );while (index < size) { -int next_bit =find_next_bit (map, size, index + nr); +unsigned long next_bit =find_next_bit (map, size, index + nr);if ((next_bit - index) < len) { len = next_bit - index; start_bit = index;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 24/92 net/ncsi: Use real net-device for response handler
In reply to Greg Kroah-HartmanFrom: John Wang <[email protected]>
[ Upstream commit 427c940558560bff2583d07fc119a21094675982 ]
When aggregating ncsi interfaces and dedicated interfaces to bond interfaces, the ncsi response handler will use the wrong net device to find ncsi_dev, so that the ncsi interface will not work properly. Here, we use the original net device to fix it.
--- net/ncsi/ncsi-rsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ncsi/ncsi-rsp.c +1 -1
@@ -1114,7 +1114,7 @@ int ncsi_rcv_rsp(struct sk_buff *skb, stint payload, i, ret;/* Find the NCSI device */ - nd =ncsi_find_dev (dev); + nd =ncsi_find_dev (orig_dev); ndp = nd ?TO_NCSI_DEV_PRIV (nd) :NULL ;if (!ndp)return -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 21/92 qede: fix offload for IPIP tunnel packets
In reply to Greg Kroah-HartmanFrom: Manish Chopra <[email protected]>
[ Upstream commit 5d5647dad259bb416fd5d3d87012760386d97530 ]
IPIP tunnels packets are unknown to device, hence these packets are incorrectly parsed and caused the packet corruption, so disable offlods for such packets at run time.
--- drivers/net/ethernet/qlogic/qede/qede_fp.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/qlogic/qede/qede_fp.c +5 -0
@@ -1737,6 +1737,11 @@ netdev_features_t qede_features_check(st ntohs(udp_hdr(skb)->dest) != gnv_port))return features & ~(NETIF_F_CSUM_MASK |NETIF_F_GSO_MASK ); + }else if (l4_proto ==IPPROTO_IPIP ) { +/* IPIP tunnels are unknown to the device or at least unsupported natively, +* offloads for them can't be done trivially, so disable them for such skb. +*/ +return features & ~(NETIF_F_CSUM_MASK |NETIF_F_GSO_MASK ); } }
Greg Kroah-Hartman
maintainerPATCH 41/92 CDC-NCM: remove "connected" log message
In reply to Greg Kroah-HartmanFrom: Roland Dreier <[email protected]>
[ Upstream commit 59b4a8fa27f5a895582ada1ae5034af7c94a57b5 ]
The cdc_ncm driver passes network connection notifications up to usbnet_link_change(), which is the right place for any logging. Remove the netdev_info() duplicating this from the driver itself.
This stops devices such as my "TRENDnet USB 10/100/1G/2.5G LAN" (ID 20f4:e02b) adapter from spamming the kernel log with
cdc_ncm 2-2:2.0 enp0s2u2c2: network connection: connected
messages every 60 msec or so.
--- drivers/net/usb/cdc_ncm.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/usb/cdc_ncm.c +0 -3
@@ -1625,9 +1625,6 @@ static void cdc_ncm_status(struct usbnet* USB_CDC_NOTIFY_NETWORK_CONNECTION notification shall be * sent by device after USB_CDC_NOTIFY_SPEED_CHANGE. */ -netif_info (dev, link, dev->net, -"network connection: %sconnected\n" , - !!event->wValue ?"" :"dis" );usbnet_link_change (dev, !!event->wValue,0 );break ;
Greg Kroah-Hartman
maintainerPATCH 8/92 proc: change ->nlink under proc_subdir_lock
In reply to Greg Kroah-HartmanFrom: Alexey Dobriyan <[email protected]>
[ Upstream commit e06689bf57017ac022ccf0f2a5071f760821ce0f ]
Currently gluing PDE into global /proc tree is done under lock, but changing ->nlink is not. Additionally struct proc_dir_entry::nlink is not atomic so updates can be lost.
--- fs/proc/generic.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
fs/proc/generic.c +15 -16
@@ -138,8 +138,12 @@ static int proc_getattr(const struct path *path, struct kstat *stat, {struct inode *inode =d_inode (path->dentry);struct proc_dir_entry *de =PDE (inode); -if (de && de->nlink) -set_nlink (inode, de->nlink); +if (de) { +nlink_t nlink =READ_ONCE (de->nlink); +if (nlink >0 ) { +set_nlink (inode, nlink); + } + }generic_fillattr (inode, stat);return 0 ;
@@ -362,6 +366,7 @@ struct proc_dir_entry *proc_register(struct proc_dir_entry *dir,write_unlock (&proc_subdir_lock); goto out_free_inum; } + dir->nlink++;write_unlock (&proc_subdir_lock);return dp;
@@ -472,10 +477,7 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode, ent->data = data; ent->proc_fops = &proc_dir_operations; ent->proc_iops = &proc_dir_inode_operations; - parent->nlink++; ent =proc_register (parent, ent); -if (!ent) - parent->nlink--; }return ent; }
@@ -505,10 +507,7 @@ struct proc_dir_entry *proc_create_mount_point(const char *name) ent->data =NULL ; ent->proc_fops =NULL ; ent->proc_iops =NULL ; - parent->nlink++; ent =proc_register (parent, ent); -if (!ent) - parent->nlink--; }return ent; }
@@ -666,8 +665,12 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent) len =strlen (fn); de =pde_subdir_find (parent, fn, len); -if (de) +if (de) {rb_erase (&de->subdir_node, &parent->subdir); +if (S_ISDIR (de->mode)) { + parent->nlink--; + } + }write_unlock (&proc_subdir_lock);if (!de) {WARN (1 ,"name '%s'\n" , name);
@@ -676,9 +679,6 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)proc_entry_rundown (de); -if (S_ISDIR (de->mode)) - parent->nlink--; - de->nlink =0 ;WARN (pde_subdir_first (de),"%s: removing non-empty directory '%s/%s', leaking at least '%s'\n" , __func__, de->parent->name, de->name,pde_subdir_first (de)->name);
@@ -714,13 +714,12 @@ int remove_proc_subtree(const char *name, struct proc_dir_entry *parent) de = next;continue ; } -write_unlock (&proc_subdir_lock); - -proc_entry_rundown (de); next = de->parent;if (S_ISDIR (de->mode)) next->nlink--; - de->nlink =0 ; +write_unlock (&proc_subdir_lock); + +proc_entry_rundown (de);if (de == root)break ;pde_put (de);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainercover 5.4.89-rc1 review
This is the start of the stable review cycle for the 5.4.89 release. There are 92 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 Wed, 13 Jan 2021 13:00:19 +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/v5.x/stable-review/patch-5.4.89-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-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.89-rc1
Paolo Bonzini <[email protected]>
KVM: x86: fix shift out of bounds reported by UBSAN
Ying-Tsun Huang <[email protected]>
x86/mtrr: Correct the range check before performing MTRR type lookups
Pablo Neira Ayuso <[email protected]>
netfilter: nft_dynset: report EOPNOTSUPP on missing set feature
Florian Westphal <[email protected]>
netfilter: xt_RATEEST: reject non-null terminated string from userspace
Vasily Averin <[email protected]>
netfilter: ipset: fix shift-out-of-bounds in htable_bits()
Subash Abhinov Kasiviswanathan <[email protected]>
netfilter: x_tables: Update remaining dereference to RCU
Matthew Auld <[email protected]>
drm/i915: clear the gpu reloc batch
Charan Teja Reddy <[email protected]>
dmabuf: fix use-after-free of dmabuf's file->f_inode
Bard Liao <[email protected]>
Revert "device property: Keep secondary firmware node secondary by type"
Filipe Manana <[email protected]>
btrfs: send: fix wrong file path when there is an inode with a pending rmdir
PeiSen Hou <[email protected]>
ALSA: hda/realtek: Add two "Intel Reference board" SSID in the ALC256.
Kai-Heng Feng <[email protected]>
ALSA: hda/realtek: Enable mute and micmute LED on HP EliteBook 850 G7
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fix speaker volume control on Lenovo C940
bo liu <[email protected]>
ALSA: hda/conexant: add a new hda codec CX11970
Takashi Iwai <[email protected]>
ALSA: hda/via: Fix runtime PM for Clevo W35xSS
Lai Jiangshan <[email protected]>
kvm: check tlbs_dirty directly
Dan Williams <[email protected]>
x86/mm: Fix leak of pmd ptlock
Johan Hovold <[email protected]>
USB: serial: keyspan_pda: remove unused variable
Eddie Hung <[email protected]>
usb: gadget: configfs: Fix use-after-free issue with udc_name
Chandana Kishori Chiluveru <[email protected]>
usb: gadget: configfs: Preserve function ordering after bind failure
Sriharsha Allenki <[email protected]>
usb: gadget: Fix spinlock lockup on usb_function_deactivate
Yang Yingliang <[email protected]>
USB: gadget: legacy: fix return error code in acm_ms_bind()
Manish Narani <[email protected]>
usb: gadget: u_ether: Fix MTU size mismatch with RX packet size
Zqiang <[email protected]>
usb: gadget: function: printer: Fix a memory leak for interface descriptor
Jerome Brunet <[email protected]>
usb: gadget: f_uac2: reset wMaxPacketSize
Arnd Bergmann <[email protected]>
usb: gadget: select CONFIG_CRC32
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix UBSAN warnings for MIDI jacks
Johan Hovold <[email protected]>
USB: usblp: fix DMA to stack
Johan Hovold <[email protected]>
USB: yurex: fix control-URB timeout handling
Bjørn Mork <[email protected]>
USB: serial: option: add Quectel EM160R-GL
Daniel Palmer <[email protected]>
USB: serial: option: add LongSung M5710 module support
Johan Hovold <[email protected]>
USB: serial: iuu_phoenix: fix DMA from stack
Thinh Nguyen <[email protected]>
usb: uas: Add PNY USB Portable SSD to unusual_uas
Randy Dunlap <[email protected]>
usb: usbip: vhci_hcd: protect shift size
Michael Grzeschik <[email protected]>
USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set
Yu Kuai <[email protected]>
usb: chipidea: ci_hdrc_imx: add missing put_device() call in usbmisc_get_init_data()
Serge Semin <[email protected]>
usb: dwc3: ulpi: Use VStsDone to detect PHY regs access completion
Tetsuo Handa <[email protected]>
USB: cdc-wdm: Fix use after free in service_outstanding_interrupt().
Sean Young <[email protected]>
USB: cdc-acm: blacklist another IR Droid device
taehyun.cho <[email protected]>
usb: gadget: enable super speed plus
Christophe JAILLET <[email protected]>
staging: mt7621-dma: Fix a resource leak in an error handling path
Nathan Chancellor <[email protected]>
powerpc: Handle .text.{hot,unlikely}.* in linker script
Greg Kroah-Hartman <[email protected]>
crypto: asym_tpm: correct zero out potential secrets
Ard Biesheuvel <[email protected]>
crypto: ecdh - avoid buffer overflow in ecdh_set_secret()
Dexuan Cui <[email protected]>
video: hyperv_fb: Fix the mmap() regression for v5.4.y and older
Hans de Goede <[email protected]>
Bluetooth: revert: hci_h5: close serdev device and free hu in h5_close
Dominique Martinet <[email protected]>
kbuild: don't hardcode depmod path
Davide Caratti <[email protected]>
net/sched: sch_taprio: ensure to reset/destroy all child qdiscs
Shannon Nelson <[email protected]>
ionic: account for vlan tag len in rx buffer len
Yunjian Wang <[email protected]>
vhost_net: fix ubuf refcount incorrectly when sendmsg fails
Bjørn Mork <[email protected]>
net: usb: qmi_wwan: add Quectel EM160R-GL
Roland Dreier <[email protected]>
CDC-NCM: remove "connected" log message
Martin Blumenstingl <[email protected]>
net: dsa: lantiq_gswip: Fix GSWIP_MII_CFG(p) register access
Martin Blumenstingl <[email protected]>
net: dsa: lantiq_gswip: Enable GSWIP_MII_CFG_EN also for internal PHYs
Heiner Kallweit <[email protected]>
r8169: work around power-saving bug on some chip versions
Xie He <[email protected]>
net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
Cong Wang <[email protected]>
erspan: fix version 1 check in gre_parse_header()
Yunjian Wang <[email protected]>
net: hns: fix return value check in __lb_other_process()
Randy Dunlap <[email protected]>
net: sched: prevent invalid Scell_log shift count
Guillaume Nault <[email protected]>
ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst()
Stefan Chulski <[email protected]>
net: mvpp2: fix pkt coalescing int-threshold configuration
Yunjian Wang <[email protected]>
tun: fix return value when the number of iovs exceeds MAX_SKB_FRAGS
Grygorii Strashko <[email protected]>
net: ethernet: ti: cpts: fix ethtool output when no ptp_clock registered
Antoine Tenart <[email protected]>
net-sysfs: take the rtnl lock when accessing xps_rxqs_map and num_tc
Antoine Tenart <[email protected]>
net-sysfs: take the rtnl lock when storing xps_rxqs
Antoine Tenart <[email protected]>
net-sysfs: take the rtnl lock when accessing xps_cpus_map and num_tc
Antoine Tenart <[email protected]>
net-sysfs: take the rtnl lock when storing xps_cpus
Dinghao Liu <[email protected]>
net: ethernet: Fix memleak in ethoc_probe
John Wang <[email protected]>
net/ncsi: Use real net-device for response handler
Petr Machata <[email protected]>
net: dcb: Validate netlink message in DCB handler
Jeff Dike <[email protected]>
virtio_net: Fix recursive call to cpus_read_lock()
Manish Chopra <[email protected]>
qede: fix offload for IPIP tunnel packets
Dinghao Liu <[email protected]>
net: ethernet: mvneta: Fix error handling in mvneta_probe
Lijun Pan <[email protected]>
ibmvnic: continue fatal error reset after passive init
Stefan Chulski <[email protected]>
net: mvpp2: Fix GoP port 3 Networking Complex Control configurations
Dan Carpenter <[email protected]>
atm: idt77252: call pci_disable_device() on error path
Rasmus Villemoes <[email protected]>
ethernet: ucc_geth: set dev->max_mtu to 1518
Rasmus Villemoes <[email protected]>
ethernet: ucc_geth: fix use-after-free in ucc_geth_remove()
Florian Fainelli <[email protected]>
net: systemport: set dev->max_mtu to UMAC_MAX_MTU_SIZE
Stefan Chulski <[email protected]>
net: mvpp2: prs: fix PPPoE with ipv6 packet parse
Stefan Chulski <[email protected]>
net: mvpp2: Add TCAM entry to drop flow control pause frames
Jakub Kicinski <[email protected]>
iavf: fix double-release of rtnl_lock
Sylwester Dziedziuch <[email protected]>
i40e: Fix Error I40E_AQ_RC_EINVAL when removing VFs
Alexey Dobriyan <[email protected]>
proc: fix lookup in /proc/net subdirectories after setns(2)
Alexey Dobriyan <[email protected]>
proc: change ->nlink under proc_subdir_lock
Linus Torvalds <[email protected]>
depmod: handle the case of /sbin/depmod without /sbin in PATH
Huang Shijie <[email protected]>
lib/genalloc: fix the overflow when size is too big
Bart Van Assche <[email protected]>
scsi: scsi_transport_spi: Set RQF_PM for domain validation commands
Bart Van Assche <[email protected]>
scsi: ide: Do not set the RQF_PREEMPT flag for sense requests
Adrian Hunter <[email protected]>
scsi: ufs-pci: Ensure UFS device is in PowerDown mode for suspend-to-disk ->poweroff()
Bean Huo <[email protected]>
scsi: ufs: Fix wrong print message in dev_err()
Yunfeng Ye <[email protected]>
workqueue: Kick a worker based on the actual activation of delayed works
-------------
Diffstat:
Makefile | 6 +- arch/powerpc/kernel/vmlinux.lds.S | 2 +- arch/x86/kernel/cpu/mtrr/generic.c | 6 +- arch/x86/kvm/mmu.h | 2 +- arch/x86/mm/pgtable.c | 2 + crypto/asymmetric_keys/asym_tpm.c | 2 +- crypto/ecdh.c | 3 +- drivers/atm/idt77252.c | 2 +- drivers/base/core.c | 2 +- drivers/bluetooth/hci_h5.c | 8 +-- drivers/dma-buf/dma-buf.c | 21 +++++-- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +- drivers/ide/ide-atapi.c | 1 - drivers/ide/ide-io.c | 5 -- drivers/net/dsa/lantiq_gswip.c | 27 +++------ drivers/net/ethernet/broadcom/bcmsysport.c | 1 + drivers/net/ethernet/ethoc.c | 3 +- drivers/net/ethernet/freescale/ucc_geth.c | 3 +- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++ drivers/net/ethernet/ibm/ibmvnic.c | 3 +- drivers/net/ethernet/intel/i40e/i40e.h | 3 + drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++++ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 ++-- drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 38 +++++++++++- drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h | 2 +- drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 2 +- drivers/net/ethernet/qlogic/qede/qede_fp.c | 5 ++ drivers/net/ethernet/realtek/r8169_main.c | 6 +- drivers/net/ethernet/ti/cpts.c | 2 + drivers/net/tun.c | 2 +- drivers/net/usb/cdc_ncm.c | 3 - drivers/net/usb/qmi_wwan.c | 1 + drivers/net/virtio_net.c | 12 ++-- drivers/net/wan/hdlc_ppp.c | 7 +++ drivers/scsi/scsi_transport_spi.c | 27 ++++++--- drivers/scsi/ufs/ufshcd-pci.c | 34 ++++++++++- drivers/scsi/ufs/ufshcd.c | 2 +- drivers/staging/mt7621-dma/mtk-hsdma.c | 4 +- drivers/usb/chipidea/ci_hdrc_imx.c | 6 +- drivers/usb/class/cdc-acm.c | 4 ++ drivers/usb/class/cdc-wdm.c | 16 ++++- drivers/usb/class/usblp.c | 21 ++++++- drivers/usb/dwc3/core.h | 1 + drivers/usb/dwc3/ulpi.c | 2 +- drivers/usb/gadget/Kconfig | 2 + drivers/usb/gadget/composite.c | 10 +++- drivers/usb/gadget/configfs.c | 19 ++++-- drivers/usb/gadget/function/f_printer.c | 1 + drivers/usb/gadget/function/f_uac2.c | 69 +++++++++++++++++----- drivers/usb/gadget/function/u_ether.c | 9 +-- drivers/usb/gadget/legacy/acm_ms.c | 4 +- drivers/usb/host/xhci.c | 24 ++++---- drivers/usb/misc/yurex.c | 3 + drivers/usb/serial/iuu_phoenix.c | 20 +++++-- drivers/usb/serial/keyspan_pda.c | 2 - drivers/usb/serial/option.c | 3 + drivers/usb/storage/unusual_uas.h | 7 +++ drivers/usb/usbip/vhci_hcd.c | 2 + drivers/vhost/net.c | 6 +- drivers/video/fbdev/hyperv_fb.c | 6 +- fs/btrfs/send.c | 49 +++++++++------ fs/proc/generic.c | 55 +++++++++++------ fs/proc/internal.h | 7 +++ fs/proc/proc_net.c | 16 ----- include/linux/proc_fs.h | 8 ++- include/net/red.h | 4 +- kernel/workqueue.c | 13 +++- lib/genalloc.c | 25 ++++---- net/core/net-sysfs.c | 65 ++++++++++++++++---- net/dcb/dcbnl.c | 2 + net/ipv4/fib_frontend.c | 2 +- net/ipv4/gre_demux.c | 2 +- net/ipv4/netfilter/arp_tables.c | 2 +- net/ipv4/netfilter/ip_tables.c | 2 +- net/ipv6/netfilter/ip6_tables.c | 2 +- net/ncsi/ncsi-rsp.c | 2 +- net/netfilter/ipset/ip_set_hash_gen.h | 20 ++----- net/netfilter/nft_dynset.c | 6 +- net/netfilter/xt_RATEEST.c | 3 + net/sched/sch_choke.c | 2 +- net/sched/sch_gred.c | 2 +- net/sched/sch_red.c | 2 +- net/sched/sch_sfq.c | 2 +- net/sched/sch_taprio.c | 2 +- scripts/depmod.sh | 2 + sound/pci/hda/hda_intel.c | 2 - sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 9 +++ sound/pci/hda/patch_via.c | 13 ++++ sound/usb/midi.c | 4 ++ virt/kvm/kvm_main.c | 3 +- 94 files changed, 590 insertions(+), 266 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 36/92 erspan: fix version 1 check in gre_parse_header()
From: Cong Wang <[email protected]>
[ Upstream commit 085c7c4e1c0e50d90b7d90f61a12e12b317a91e2 ]
Both version 0 and version 1 use ETH_P_ERSPAN, but version 0 does not have an erspan header. So the check in gre_parse_header() is wrong, we have to distinguish version 1 from version 0.
We can just check the gre header length like is_erspan_type1().
--- net/ipv4/gre_demux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/gre_demux.c +1 -1
@@ -128,7 +128,7 @@ int gre_parse_header(struct sk_buff *skb* to 0 and sets the configured key in the * inner erspan header field */ -if (greh->protocol ==htons (ETH_P_ERSPAN ) || +if ((greh->protocol ==htons (ETH_P_ERSPAN ) && hdr_len !=4 ) || greh->protocol ==htons (ETH_P_ERSPAN2 )) {struct erspan_base_hdr *ershdr;
Greg Kroah-Hartman
maintainerPATCH 44/92 ionic: account for vlan tag len in rx buffer len
In reply to Greg Kroah-HartmanFrom: Shannon Nelson <[email protected]>
[ Upstream commit 83469893204281ecf65d572bddf02de29a19787c ]
Let the FW know we have enough receive buffer space for the vlan tag if it isn't stripped.
--- drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/pensando/ionic/ionic_txrx.c +1 -1
@@ -257,7 +257,7 @@ void ionic_rx_fill(struct ionic_queue *qunsigned int len;unsigned int i; - len = netdev->mtu +ETH_HLEN ; + len = netdev->mtu +ETH_HLEN +VLAN_HLEN ;for (i =ionic_q_space_avail (q); i; i--) { skb =ionic_rx_skb_alloc (q, len, &dma_addr);
Greg Kroah-Hartman
maintainerPATCH 7/92 depmod: handle the case of /sbin/depmod without /sbin in PATH
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
[ Upstream commit cedd1862be7e666be87ec824dabc6a2b05618f36 ]
Commit 436e980e2ed5 ("kbuild: don't hardcode depmod path") stopped hard-coding the path of depmod, but in the process caused trouble for distributions that had that /sbin location, but didn't have it in the PATH (generally because /sbin is limited to the super-user path).
Work around it for now by just adding /sbin to the end of PATH in the depmod.sh script.
--- scripts/depmod.sh | 2 ++ 1 file changed, 2 insertions(+)
scripts/depmod.sh +2 -0
@@ -15,6 +15,8 @@ if ! test -r System.map ; then exit 0 fi +# legacy behavior: "depmod" in /sbin, no /sbin in PATH +PATH="$PATH:/sbin" if [ -z $(command -v $DEPMOD) ]; then echo "Warning: 'make modules_install' requires $DEPMOD. Please install it." >&2 echo "This is probably in the kmod package." >&2
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 42/92 net: usb: qmi_wwan: add Quectel EM160R-GL
In reply to Greg Kroah-HartmanFrom: "Bj�rn Mork" <[email protected]>
[ Upstream commit cfd82dfc9799c53ef109343a23af006a0f6860a9 ]
New modem using ff/ff/30 for QCDM, ff/00/00 for AT and NMEA, and ff/ff/ff for RMNET/QMI.
T: Bus=02 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=5000 MxCh= 0
D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1
P: Vendor=2c7c ProdID=0620 Rev= 4.09
S: Manufacturer=Quectel
S: Product=EM160R-GL
S: SerialNumber=e31cedc1
C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=896mA
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=(none)
E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
E: Ad=84(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
E: Ad=86(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=04(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=32ms
E: Ad=8e(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=0f(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
--- drivers/net/usb/qmi_wwan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1058,6 +1058,7 @@ static const struct usb_device_id produc {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0125)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0306)}, /* Quectel EP06/EG06/EM06 */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)}, /* Quectel EG12/EM12 */ + {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL *//* 3. Combined interface devices matching on interface number */
Greg Kroah-Hartman
maintainerPATCH 70/92 usb: gadget: u_ether: Fix MTU size mismatch with RX packet size
In reply to Greg Kroah-HartmanFrom: Manish Narani <[email protected]>
commit 0a88fa221ce911c331bf700d2214c5b2f77414d3 upstream.
Fix the MTU size issue with RX packet size as the host sends the packet with extra bytes containing ethernet header. This causes failure when user sets the MTU size to the maximum i.e. 15412. In this case the ethernet packet received will be of length 15412 plus the ethernet header length. This patch fixes the issue where there is a check that RX packet length must not be more than max packet length.
--- drivers/usb/gadget/function/u_ether.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/usb/gadget/function/u_ether.c +5 -4
@@ -45,9 +45,10 @@#define UETH__VERSION "29-May-2008"/* Experiments show that both Linux and Windows hosts allow up to 16k -* frame sizes. Set the max size to 15k+52 to prevent allocating 32k +* frame sizes. Set the max MTU size to 15k+52 to prevent allocating 32k * blocks and still have efficient handling. */ -#define GETHER_MAX_ETH_FRAME_LEN 15412 +#define GETHER_MAX_MTU_SIZE 15412 +#define GETHER_MAX_ETH_FRAME_LEN (GETHER_MAX_MTU_SIZE + ETH_HLEN)struct eth_dev {/* lock is held while accessing port_usb
@@ -786,7 +787,7 @@ struct eth_dev *gether_setup_name(struct/* MTU range: 14 - 15412 */ net->min_mtu =ETH_HLEN ; - net->max_mtu =GETHER_MAX_ETH_FRAME_LEN ; + net->max_mtu =GETHER_MAX_MTU_SIZE ; dev->gadget = g;SET_NETDEV_DEV (net, &g->dev);
@@ -848,7 +849,7 @@ struct net_device *gether_setup_name_def/* MTU range: 14 - 15412 */ net->min_mtu =ETH_HLEN ; - net->max_mtu =GETHER_MAX_ETH_FRAME_LEN ; + net->max_mtu =GETHER_MAX_MTU_SIZE ;return net; }
Greg Kroah-Hartman
maintainerPATCH 71/92 USB: gadget: legacy: fix return error code in acm_ms_bind()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
commit c91d3a6bcaa031f551ba29a496a8027b31289464 upstream.
If usb_otg_descriptor_alloc() failed, it need return ENOMEM.
--- drivers/usb/gadget/legacy/acm_ms.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/gadget/legacy/acm_ms.c +3 -1
@@ -203,8 +203,10 @@ static int acm_ms_bind(struct usb_composstruct usb_descriptor_header *usb_desc; usb_desc =usb_otg_descriptor_alloc (gadget); -if (!usb_desc) +if (!usb_desc) { + status = -ENOMEM ; goto fail_string_ids; + }usb_otg_descriptor_init (gadget, usb_desc); otg_desc[0 ] = usb_desc; otg_desc[1 ] =NULL ;
Greg Kroah-Hartman
maintainerPATCH 72/92 usb: gadget: Fix spinlock lockup on usb_function_deactivate
In reply to Greg Kroah-HartmanFrom: Sriharsha Allenki <[email protected]>
commit 5cc35c224a80aa5a5a539510ef049faf0d6ed181 upstream.
There is a spinlock lockup as part of composite_disconnect when it tries to acquire cdev->lock as part of usb_gadget_deactivate. This is because the usb_gadget_deactivate is called from usb_function_deactivate with the same spinlock held.
This would result in the below call stack and leads to stall.
rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
rcu: 3-...0: (1 GPs behind) idle=162/1/0x4000000000000000
softirq=10819/10819 fqs=2356
(detected by 2, t=5252 jiffies, g=20129, q=3770)
Task dump for CPU 3:
task:uvc-gadget_wlhe state:R running task stack: 0 pid: 674 ppid:
636 flags:0x00000202
Call trace: __switch_to+0xc0/0x170 _raw_spin_lock_irqsave+0x84/0xb0 composite_disconnect+0x28/0x78 configfs_composite_disconnect+0x68/0x70 usb_gadget_disconnect+0x10c/0x128 usb_gadget_deactivate+0xd4/0x108 usb_function_deactivate+0x6c/0x80 uvc_function_disconnect+0x20/0x58 uvc_v4l2_release+0x30/0x88 v4l2_release+0xbc/0xf0 __fput+0x7c/0x230 ____fput+0x14/0x20 task_work_run+0x88/0x140 do_notify_resume+0x240/0x6f0 work_pending+0x8/0x200
Fix this by doing an unlock on cdev->lock before the usb_gadget_deactivate call from usb_function_deactivate.
The same lockup can happen in the usb_gadget_activate path. Fix that path as well.
--- drivers/usb/gadget/composite.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/usb/gadget/composite.c +8 -2
@@ -392,8 +392,11 @@ int usb_function_deactivate(struct usb_fspin_lock_irqsave (&cdev->lock, flags); -if (cdev->deactivations ==0 ) +if (cdev->deactivations ==0 ) { +spin_unlock_irqrestore (&cdev->lock, flags); status =usb_gadget_deactivate (cdev->gadget); +spin_lock_irqsave (&cdev->lock, flags); + }if (status ==0 ) cdev->deactivations++;
@@ -424,8 +427,11 @@ int usb_function_activate(struct usb_fun status = -EINVAL ; else { cdev->deactivations--; -if (cdev->deactivations ==0 ) +if (cdev->deactivations ==0 ) { +spin_unlock_irqrestore (&cdev->lock, flags); status =usb_gadget_activate (cdev->gadget); +spin_lock_irqsave (&cdev->lock, flags); + } }spin_unlock_irqrestore (&cdev->lock, flags);
Greg Kroah-Hartman
maintainerPATCH 74/92 usb: gadget: configfs: Fix use-after-free issue with udc_name
In reply to Greg Kroah-HartmanFrom: Eddie Hung <[email protected]>
commit 64e6bbfff52db4bf6785fab9cffab850b2de6870 upstream.
There is a use-after-free issue, if access udc_name in function gadget_dev_desc_UDC_store after another context free udc_name in function unregister_gadget.
Context 1:
gadget_dev_desc_UDC_store()->unregister_gadget()-> free udc_name->set udc_name to NULL
Context 2:
gadget_dev_desc_UDC_show()-> access udc_name
Call trace: dump_backtrace+0x0/0x340 show_stack+0x14/0x1c dump_stack+0xe4/0x134 print_address_description+0x78/0x478 __kasan_report+0x270/0x2ec kasan_report+0x10/0x18 __asan_report_load1_noabort+0x18/0x20 string+0xf4/0x138 vsnprintf+0x428/0x14d0 sprintf+0xe4/0x12c gadget_dev_desc_UDC_show+0x54/0x64 configfs_read_file+0x210/0x3a0 __vfs_read+0xf0/0x49c vfs_read+0x130/0x2b4 SyS_read+0x114/0x208 el0_svc_naked+0x34/0x38
Add mutex_lock to protect this kind of scenario.
--- drivers/usb/gadget/configfs.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/usb/gadget/configfs.c +9 -2
@@ -233,9 +233,16 @@ static ssize_t gadget_dev_desc_bcdUSB_ststatic ssize_t gadget_dev_desc_UDC_show (struct config_item *item,char *page) { -char *udc_name =to_gadget_info (item)->composite.gadget_driver.udc_name; +struct gadget_info *gi =to_gadget_info (item); +char *udc_name; +int ret; -return sprintf (page,"%s\n" , udc_name ?:"" ); +mutex_lock (&gi->lock); + udc_name = gi->composite.gadget_driver.udc_name; + ret =sprintf (page,"%s\n" , udc_name ?:"" ); +mutex_unlock (&gi->lock); + +return ret; }static int unregister_gadget (struct gadget_info *gi)
Greg Kroah-Hartman
maintainerPATCH 45/92 net/sched: sch_taprio: ensure to reset/destroy all child qdiscs
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit 698285da79f5b0b099db15a37ac661ac408c80eb ]
taprio_graft() can insert a NULL element in the array of child qdiscs. As a consquence, taprio_reset() might not reset child qdiscs completely, and taprio_destroy() might leak resources. Fix it by ensuring that loops that iterate over q->qdiscs[] don't end when they find the first NULL item.
--- net/sched/sch_taprio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_taprio.c +1 -1
@@ -1626,7 +1626,7 @@ static void taprio_destroy(struct Qdisctaprio_disable_offload (dev, q,NULL );if (q->qdiscs) { -for (i =0 ; i < dev->num_tx_queues && q->qdiscs[i]; i++) +for (i =0 ; i < dev->num_tx_queues; i++)qdisc_put (q->qdiscs[i]);kfree (q->qdiscs);
Greg Kroah-Hartman
maintainerPATCH 26/92 net-sysfs: take the rtnl lock when storing xps_cpus
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 1ad58225dba3f2f598d2c6daed4323f24547168f ]
Two race conditions can be triggered when storing xps cpus, resulting in various oops and invalid memory accesses:
1. Calling netdev_set_num_tc while netif_set_xps_queue:
- netif_set_xps_queue uses dev->tc_num as one of the parameters to compute the size of new_dev_maps when allocating it. dev->tc_num is also used to access the map, and the compiler may generate code to retrieve this field multiple times in the function.
- netdev_set_num_tc sets dev->tc_num.
If new_dev_maps is allocated using dev->tc_num and then dev->tc_num is set to a higher value through netdev_set_num_tc, later accesses to new_dev_maps in netif_set_xps_queue could lead to accessing memory outside of new_dev_maps; triggering an oops.
2. Calling netif_set_xps_queue while netdev_set_num_tc is running:
2.1. netdev_set_num_tc starts by resetting the xps queues,
dev->tc_num isn't updated yet.
2.2. netif_set_xps_queue is called, setting up the map with the
*old* dev->num_tc.
2.3. netdev_set_num_tc updates dev->tc_num.
2.4. Later accesses to the map lead to out of bound accesses and
oops.
A similar issue can be found with netdev_reset_tc.
One way of triggering this is to set an iface up (for which the driver uses netdev_set_num_tc in the open path, such as bnx2x) and writing to xps_cpus in a concurrent thread. With the right timing an oops is triggered.
Both issues have the same fix: netif_set_xps_queue, netdev_set_num_tc and netdev_reset_tc should be mutually exclusive. We do that by taking the rtnl lock in xps_cpus_store.
--- net/core/net-sysfs.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/core/net-sysfs.c +6 -0
@@ -1314,7 +1314,13 @@ static ssize_t xps_cpus_store(struct netreturn err; } +if (!rtnl_trylock ()) { +free_cpumask_var (mask); +return restart_syscall (); + } + err =netif_set_xps_queue (dev, mask, index); +rtnl_unlock ();free_cpumask_var (mask);
Greg Kroah-Hartman
maintainerPATCH 52/92 staging: mt7621-dma: Fix a resource leak in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit d887d6104adeb94d1b926936ea21f07367f0ff9f upstream.
If an error occurs after calling 'mtk_hsdma_init()', it must be undone by a corresponding call to 'mtk_hsdma_uninit()' as already done in the remove function.
--- drivers/staging/mt7621-dma/mtk-hsdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/mt7621-dma/mtk-hsdma.c +3 -1
@@ -714,7 +714,7 @@ static int mtk_hsdma_probe(struct platfo ret =dma_async_device_register (dd);if (ret) {dev_err (&pdev->dev,"failed to register dma device\n" ); -return ret; + goto err_uninit_hsdma; } ret = of_dma_controller_register(pdev->dev.of_node,
@@ -730,6 +730,8 @@ static int mtk_hsdma_probe(struct platfo err_unregister:dma_async_device_unregister (dd); +err_uninit_hsdma: +mtk_hsdma_uninit (hsdma);return ret; }
Greg Kroah-Hartman
maintainerPATCH 55/92 USB: cdc-wdm: Fix use after free in service_outstanding_interrupt().
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit 5e5ff0b4b6bcb4d17b7a26ec8bcfc7dd4651684f upstream.
syzbot is reporting UAF at usb_submit_urb() [1], for service_outstanding_interrupt() is not checking WDM_DISCONNECTING before calling usb_submit_urb(). Close the race by doing same checks wdm_read() does upon retry.
Also, while wdm_read() checks WDM_DISCONNECTING with desc->rlock held, service_interrupt_work() does not hold desc->rlock. Thus, it is possible that usb_submit_urb() is called from service_outstanding_interrupt() from service_interrupt_work() after WDM_DISCONNECTING was set and kill_urbs()
from wdm_disconnect() completed. Thus, move kill_urbs() inwdm_disconnect() to after cancel_work_sync() (which makes sure that service_interrupt_work() is no longer running) completed.
Although it seems to be safe to dereference desc->intf->dev in service_outstanding_interrupt() even if WDM_DISCONNECTING was already set because desc->rlock or cancel_work_sync() prevents wdm_disconnect() from reaching list_del() before service_outstanding_interrupt() completes, let's not emit error message if WDM_DISCONNECTING is set by wdm_disconnect() while usb_submit_urb() is in progress.
[1] https://syzkaller.appspot.com/bug?extid=9e04e2df4a32fb661daf
--- drivers/usb/class/cdc-wdm.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/usb/class/cdc-wdm.c +13 -3
@@ -465,13 +465,23 @@ static int service_outstanding_interruptif (!desc->resp_count || !--desc->resp_count) goto out; +if (test_bit (WDM_DISCONNECTING , &desc->flags)) { + rv = -ENODEV ; + goto out; + } +if (test_bit (WDM_RESETTING , &desc->flags)) { + rv = -EIO ; + goto out; + } +set_bit (WDM_RESPONDING , &desc->flags);spin_unlock_irq (&desc->iuspin); rv =usb_submit_urb (desc->response,GFP_KERNEL );spin_lock_irq (&desc->iuspin);if (rv) { -dev_err (&desc->intf->dev, -"usb_submit_urb failed with result %d\n" , rv); +if (!test_bit (WDM_DISCONNECTING , &desc->flags)) +dev_err (&desc->intf->dev, +"usb_submit_urb failed with result %d\n" , rv);/* make sure the next notification trigger a submit */ clear_bit (WDM_RESPONDING , &desc->flags);
@@ -1026,9 +1036,9 @@ static void wdm_disconnect(struct usb_inwake_up_all (&desc->wait);mutex_lock (&desc->rlock);mutex_lock (&desc->wlock); -kill_urbs (desc);cancel_work_sync (&desc->rxwork);cancel_work_sync (&desc->service_outs_intr); +kill_urbs (desc);mutex_unlock (&desc->wlock);mutex_unlock (&desc->rlock);
Greg Kroah-Hartman
maintainerPATCH 61/92 USB: serial: iuu_phoenix: fix DMA from stack
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 54d0a3ab80f49f19ee916def62fe067596833403 upstream.
Stack-allocated buffers cannot be used for DMA (on all architectures) so allocate the flush command buffer using kmalloc().
--- drivers/usb/serial/iuu_phoenix.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/usb/serial/iuu_phoenix.c +15 -5
@@ -536,23 +536,29 @@ static int iuu_uart_flush(struct usb_serstruct device *dev = &port->dev;int i;int status; -u8 rxcmd =IUU_UART_RX ; +u8 *rxcmd;struct iuu_private *priv =usb_get_serial_port_data (port);if (iuu_led (port,0xF000 ,0 ,0 ,0xFF ) <0 )return -EIO ; + rxcmd =kmalloc (1 ,GFP_KERNEL ); +if (!rxcmd) +return -ENOMEM ; + + rxcmd[0 ] =IUU_UART_RX ; +for (i =0 ; i <2 ; i++) { - status =bulk_immediate (port, &rxcmd,1 ); + status =bulk_immediate (port, rxcmd,1 );if (status !=IUU_OPERATION_OK ) {dev_dbg (dev,"%s - uart_flush_write error\n" , __func__); -return status; + goto out_free; } status =read_immediate (port, &priv->len,1 );if (status !=IUU_OPERATION_OK ) {dev_dbg (dev,"%s - uart_flush_read error\n" , __func__); -return status; + goto out_free; }if (priv->len >0 ) {
@@ -560,12 +566,16 @@ static int iuu_uart_flush(struct usb_ser status =read_immediate (port, priv->buf, priv->len);if (status !=IUU_OPERATION_OK ) {dev_dbg (dev,"%s - uart_flush_read error\n" , __func__); -return status; + goto out_free; } } }dev_dbg (dev,"%s - uart_flush_read OK!\n" , __func__);iuu_led (port,0 ,0xF000 ,0 ,0xFF ); + +out_free: +kfree (rxcmd); +return status; }
Greg Kroah-Hartman
maintainerPATCH 79/92 ALSA: hda/conexant: add a new hda codec CX11970
In reply to Greg Kroah-HartmanFrom: bo liu <[email protected]>
commit 744a11abc56405c5a106e63da30a941b6d27f737 upstream.
The current kernel does not support the cx11970 codec chip. Add a codec configuration item to kernel.
[ Minor coding style fix by tiwai ]
--- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_conexant.c +1 -0
@@ -1075,6 +1075,7 @@ static int patch_conexant_auto(struct hdstatic const struct hda_device_id snd_hda_id_conexant[] = {HDA_CODEC_ENTRY (0x14f11f86 ,"CX8070" , patch_conexant_auto),HDA_CODEC_ENTRY (0x14f12008 ,"CX8200" , patch_conexant_auto), +HDA_CODEC_ENTRY (0x14f120d0 ,"CX11970" , patch_conexant_auto),HDA_CODEC_ENTRY (0x14f15045 ,"CX20549 (Venice)" , patch_conexant_auto),HDA_CODEC_ENTRY (0x14f15047 ,"CX20551 (Waikiki)" , patch_conexant_auto),HDA_CODEC_ENTRY (0x14f15051 ,"CX20561 (Hermosa)" , patch_conexant_auto),
Greg Kroah-Hartman
maintainerPATCH 84/92 Revert "device property: Keep secondary firmware node secondary by type"
In reply to Greg Kroah-HartmanFrom: Bard Liao <[email protected]>
commit 47f4469970d8861bc06d2d4d45ac8200ff07c693 upstream.
While commit d5dcce0c414f ("device property: Keep secondary firmware node secondary by type") describes everything correct in its commit message, the change it made does the opposite and original commit c15e1bdda436 ("device property: Fix the secondary firmware node handling in set_primary_fwnode()") was fully correct.
Revert the former one here and improve documentation in the next patch.
--- drivers/base/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/core.c +1 -1
@@ -3414,7 +3414,7 @@ void set_primary_fwnode(struct device *dif (fwnode_is_primary (fn)) { dev->fwnode = fn->secondary;if (!(parent && fn == parent->fwnode)) - fn->secondary =ERR_PTR (-ENODEV ); + fn->secondary =NULL ; }else { dev->fwnode =NULL ; }
Greg Kroah-Hartman
maintainerPATCH 91/92 x86/mtrr: Correct the range check before performing MTRR type lookups
In reply to Greg Kroah-HartmanFrom: Ying-Tsun Huang <[email protected]>
commit cb7f4a8b1fb426a175d1708f05581939c61329d4 upstream.
In mtrr_type_lookup(), if the input memory address region is not in the MTRR, over 4GB, and not over the top of memory, a write-back attribute is returned. These condition checks are for ensuring the input memory address region is actually mapped to the physical memory.
However, if the end address is just aligned with the top of memory, the condition check treats the address is over the top of memory, and write-back attribute is not returned.
And this hits in a real use case with NVDIMM: the nd_pmem module tries to map NVDIMMs as cacheable memories when NVDIMMs are connected. If a NVDIMM is the last of the DIMMs, the performance of this NVDIMM becomes very low since it is aligned with the top of memory and its memory type is uncached-minus.
Move the input end address change to inclusive up into mtrr_type_lookup(), before checking for the top of memory in either mtrr_type_lookup_{variable,fixed}() helpers.
[ bp: Massage commit message. ]
--- arch/x86/kernel/cpu/mtrr/generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/mtrr/generic.c +3 -3
@@ -167,9 +167,6 @@ static u8 mtrr_type_lookup_variable(u64 *repeat =0 ; *uniform =1 ; -/* Make end inclusive instead of exclusive */ - end--; - prev_match =MTRR_TYPE_INVALID ;for (i =0 ; i < num_var_ranges; ++i) {unsigned short start_state, end_state, inclusive;
@@ -261,6 +258,9 @@ u8 mtrr_type_lookup(u64 start, u64 end,int repeat;u64 partial_end; +/* Make end inclusive instead of exclusive */ + end--; +if (!mtrr_state_set)return MTRR_TYPE_INVALID ;
Greg Kroah-Hartman
maintainerPATCH 68/92 usb: gadget: f_uac2: reset wMaxPacketSize
In reply to Greg Kroah-HartmanFrom: Jerome Brunet <[email protected]>
commit 9389044f27081d6ec77730c36d5bf9a1288bcda2 upstream.
With commit 913e4a90b6f9 ("usb: gadget: f_uac2: finalize wMaxPacketSize according to bandwidth") wMaxPacketSize is computed dynamically but the value is never reset.
Because of this, the actual maximum packet size can only decrease each time the audio gadget is instantiated.
Reset the endpoint maximum packet size and mark wMaxPacketSize as dynamic to solve the problem.
--- drivers/usb/gadget/function/f_uac2.c | 69 +++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 14 deletions(-)
drivers/usb/gadget/function/f_uac2.c +55 -14
@@ -271,7 +271,7 @@ static struct usb_endpoint_descriptor fs .bEndpointAddress = USB_DIR_OUT, .bmAttributes = USB_ENDPOINT_XFER_ISOC | USB_ENDPOINT_SYNC_ASYNC, - .wMaxPacketSize = cpu_to_le16(1023), + /* .wMaxPacketSize = DYNAMIC */ .bInterval = 1, };
@@ -280,7 +280,7 @@ static struct usb_endpoint_descriptor hs .bDescriptorType = USB_DT_ENDPOINT, .bmAttributes = USB_ENDPOINT_XFER_ISOC | USB_ENDPOINT_SYNC_ASYNC, - .wMaxPacketSize = cpu_to_le16(1024), +/* .wMaxPacketSize = DYNAMIC */ .bInterval = 4, };
@@ -348,7 +348,7 @@ static struct usb_endpoint_descriptor fs .bEndpointAddress = USB_DIR_IN, .bmAttributes = USB_ENDPOINT_XFER_ISOC | USB_ENDPOINT_SYNC_ASYNC, - .wMaxPacketSize = cpu_to_le16(1023), + /* .wMaxPacketSize = DYNAMIC */ .bInterval = 1, };
@@ -357,7 +357,7 @@ static struct usb_endpoint_descriptor hs .bDescriptorType = USB_DT_ENDPOINT, .bmAttributes = USB_ENDPOINT_XFER_ISOC | USB_ENDPOINT_SYNC_ASYNC, - .wMaxPacketSize = cpu_to_le16(1024), +/* .wMaxPacketSize = DYNAMIC */ .bInterval = 4, };
@@ -444,12 +444,28 @@ struct cntrl_range_lay3 {__le32 dRES; } __packed; -static void set_ep_max_packet_size (const struct f_uac2_opts *uac2_opts, +static int set_ep_max_packet_size (const struct f_uac2_opts *uac2_opts,struct usb_endpoint_descriptor *ep_desc, -unsigned int factor,bool is_playback) +enum usb_device_speed speed,bool is_playback) {int chmask, srate, ssize; -u16 max_packet_size; +u16 max_size_bw, max_size_ep; +unsigned int factor; + +switch (speed) { +case USB_SPEED_FULL : + max_size_ep =1023 ; + factor =1000 ; +break ; + +case USB_SPEED_HIGH : + max_size_ep =1024 ; + factor =8000 ; +break ; + +default : +return -EINVAL ; + }if (is_playback) { chmask = uac2_opts->p_chmask;
@@ -461,10 +477,12 @@ static void set_ep_max_packet_size(const ssize = uac2_opts->c_ssize; } - max_packet_size =num_channels (chmask) * ssize * + max_size_bw =num_channels (chmask) * ssize *DIV_ROUND_UP (srate, factor / (1 << (ep_desc->bInterval -1 ))); - ep_desc->wMaxPacketSize =cpu_to_le16 (min_t (u16, max_packet_size, -le16_to_cpu (ep_desc->wMaxPacketSize))); + ep_desc->wMaxPacketSize =cpu_to_le16 (min_t (u16, max_size_bw, + max_size_ep)); + +return 0 ; }/* Use macro to overcome line length limitation */
@@ -670,10 +688,33 @@ afunc_bind(struct usb_configuration *cfg }/* Calculate wMaxPacketSize according to audio bandwidth */ -set_ep_max_packet_size (uac2_opts, &fs_epin_desc,1000 , true); -set_ep_max_packet_size (uac2_opts, &fs_epout_desc,1000 , false); -set_ep_max_packet_size (uac2_opts, &hs_epin_desc,8000 , true); -set_ep_max_packet_size (uac2_opts, &hs_epout_desc,8000 , false); + ret =set_ep_max_packet_size (uac2_opts, &fs_epin_desc,USB_SPEED_FULL , + true); +if (ret <0 ) { +dev_err (dev,"%s:%d Error!\n" , __func__, __LINE__); +return ret; + } + + ret =set_ep_max_packet_size (uac2_opts, &fs_epout_desc,USB_SPEED_FULL , + false); +if (ret <0 ) { +dev_err (dev,"%s:%d Error!\n" , __func__, __LINE__); +return ret; + } + + ret =set_ep_max_packet_size (uac2_opts, &hs_epin_desc,USB_SPEED_HIGH , + true); +if (ret <0 ) { +dev_err (dev,"%s:%d Error!\n" , __func__, __LINE__); +return ret; + } + + ret =set_ep_max_packet_size (uac2_opts, &hs_epout_desc,USB_SPEED_HIGH , + false); +if (ret <0 ) { +dev_err (dev,"%s:%d Error!\n" , __func__, __LINE__); +return ret; + }if (EPOUT_EN (uac2_opts)) { agdev->out_ep =usb_ep_autoconfig (gadget, &fs_epout_desc);
Greg Kroah-Hartman
maintainerPATCH 65/92 USB: usblp: fix DMA to stack
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 020a1f453449294926ca548d8d5ca970926e8dfd upstream.
Stack-allocated buffers cannot be used for DMA (on all architectures).
Replace the HP-channel macro with a helper function that allocates a dedicated transfer buffer so that it can continue to be used with arguments from the stack.
Note that the buffer is cleared on allocation as usblp_ctrl_msg() returns success also on short transfers (the buffer is only used for debugging).
--- drivers/usb/class/usblp.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/usb/class/usblp.c +19 -2
@@ -274,8 +274,25 @@ static int usblp_ctrl_msg(struct usblp *#define usblp_reset (usblp)\ usblp_ctrl_msg(usblp, USBLP_REQ_RESET, USB_TYPE_CLASS, USB_DIR_OUT, USB_RECIP_OTHER, 0, NULL, 0) -#define usblp_hp_channel_change_request (usblp, channel, buffer) \ - usblp_ctrl_msg(usblp, USBLP_REQ_HP_CHANNEL_CHANGE_REQUEST, USB_TYPE_VENDOR, USB_DIR_IN, USB_RECIP_INTERFACE, channel, buffer, 1) +static int usblp_hp_channel_change_request (struct usblp *usblp,int channel,u8 *new_channel) +{ +u8 *buf; +int ret; + + buf =kzalloc (1 ,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + ret =usblp_ctrl_msg (usblp,USBLP_REQ_HP_CHANNEL_CHANGE_REQUEST , +USB_TYPE_VENDOR ,USB_DIR_IN ,USB_RECIP_INTERFACE , + channel, buf,1 ); +if (ret ==0 ) + *new_channel = buf[0 ]; + +kfree (buf); + +return ret; +}/* * See the description for usblp_select_alts() below for the usage
Greg Kroah-Hartman
maintainerPATCH 67/92 usb: gadget: select CONFIG_CRC32
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit d7889c2020e08caab0d7e36e947f642d91015bd0 upstream.
Without crc32 support, this driver fails to link:
arm-linux-gnueabi-ld: drivers/usb/gadget/function/f_eem.o: in function `eem_unwrap':
f_eem.c:(.text+0x11cc): undefined reference to `crc32_le'
arm-linux-gnueabi-ld: drivers/usb/gadget/function/f_ncm.o:f_ncm.c:(.text+0x1e40):
more undefined references to `crc32_le' follow
--- drivers/usb/gadget/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/gadget/Kconfig +2 -0
@@ -265,6 +265,7 @@ config USB_CONFIGFS_NCM depends on NET select USB_U_ETHER select USB_F_NCM + select CRC32 help NCM is an advanced protocol for Ethernet encapsulation, allows grouping of several ethernet frames into one USB transfer and
@@ -314,6 +315,7 @@ config USB_CONFIGFS_EEM depends on NET select USB_U_ETHER select USB_F_EEM + select CRC32 help CDC EEM is a newer USB standard that is somewhat simpler than CDC ECM and therefore can be supported by more hardware. Technically ECM and
Greg Kroah-Hartman
maintainerPATCH 59/92 usb: usbip: vhci_hcd: protect shift size
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 718bf42b119de652ebcc93655a1f33a9c0d04b3c upstream.
Fix shift out-of-bounds in vhci_hcd.c:
UBSAN: shift-out-of-bounds in ../drivers/usb/usbip/vhci_hcd.c:399:41 shift exponent 768 is too large for 32-bit type 'int'
--- drivers/usb/usbip/vhci_hcd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/usbip/vhci_hcd.c +2 -0
@@ -396,6 +396,8 @@ static int vhci_hub_control(struct usb_hdefault :usbip_dbg_vhci_rh (" ClearPortFeature: default %x\n" , wValue); +if (wValue >=32 ) + goto error; vhci_hcd->port_status[rhport] &= ~(1 << wValue);break ; }
Greg Kroah-Hartman
maintainerPATCH 86/92 drm/i915: clear the gpu reloc batch
In reply to Greg Kroah-HartmanFrom: Matthew Auld <[email protected]>
commit 641382e9b44fba81a0778e1914ee35b8471121f9 upstream.
The reloc batch is short lived but can exist in the user visible ppGTT, and since it's backed by an internal object, which lacks page clearing, we should take care to clear it upfront.
--- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +3 -1
@@ -936,7 +936,7 @@ static void reloc_gpu_flush(struct relocGEM_BUG_ON (cache->rq_size >= obj->base.size /sizeof (u32)); cache->rq_cmd[cache->rq_size] =MI_BATCH_BUFFER_END ; -__i915_gem_object_flush_map (obj,0 ,sizeof (u32) * (cache->rq_size +1 )); +i915_gem_object_flush_map (obj);i915_gem_object_unpin_map (obj);intel_gt_chipset_flush (cache->rq->engine->gt);
@@ -1163,6 +1163,8 @@ static int __reloc_gpu_alloc(struct i915 goto out_pool; } +memset32 (cmd,0 , pool->obj->base.size /sizeof (u32)); + batch =i915_vma_instance (pool->obj, vma->vm,NULL );if (IS_ERR (batch)) { err =PTR_ERR (batch);
Greg Kroah-Hartman
maintainerPATCH 90/92 netfilter: nft_dynset: report EOPNOTSUPP on missing set feature
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit 95cd4bca7b1f4a25810f3ddfc5e767fb46931789 upstream.
If userspace requests a feature which is not available the original set definition, then bail out with EOPNOTSUPP. If userspace sends unsupported dynset flags (new feature not supported by this kernel), then report EOPNOTSUPP to userspace. EINVAL should be only used to report malformed netlink messages from userspace.
--- net/netfilter/nft_dynset.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nft_dynset.c +3 -3
@@ -146,7 +146,7 @@ static int nft_dynset_init(const structu32 flags =ntohl (nla_get_be32 (tb[NFTA_DYNSET_FLAGS ]));if (flags & ~NFT_DYNSET_F_INV ) -return -EINVAL ; +return -EOPNOTSUPP ;if (flags &NFT_DYNSET_F_INV ) priv->invert = true; }
@@ -179,7 +179,7 @@ static int nft_dynset_init(const struct timeout =0 ;if (tb[NFTA_DYNSET_TIMEOUT ] !=NULL ) {if (!(set->flags &NFT_SET_TIMEOUT )) -return -EINVAL ; +return -EOPNOTSUPP ; err =nf_msecs_to_jiffies64 (tb[NFTA_DYNSET_TIMEOUT ], &timeout);if (err)
@@ -193,7 +193,7 @@ static int nft_dynset_init(const structif (tb[NFTA_DYNSET_SREG_DATA ] !=NULL ) {if (!(set->flags &NFT_SET_MAP )) -return -EINVAL ; +return -EOPNOTSUPP ;if (set->dtype ==NFT_DATA_VERDICT )return -EOPNOTSUPP ;
Greg Kroah-Hartman
maintainerPATCH 89/92 netfilter: xt_RATEEST: reject non-null terminated string from userspace
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit 6cb56218ad9e580e519dcd23bfb3db08d8692e5a upstream.
syzbot reports:
detected buffer overflow in strlen
[..]
Call Trace: strlen include/linux/string.h:325 [inline] strlcpy include/linux/string.h:348 [inline] xt_rateest_tg_checkentry+0x2a5/0x6b0 net/netfilter/xt_RATEEST.c:143
strlcpy assumes src is a c-string. Check info->name before its used.
--- net/netfilter/xt_RATEEST.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/xt_RATEEST.c +3 -0
@@ -115,6 +115,9 @@ static int xt_rateest_tg_checkentry(cons } cfg;int ret; +if (strnlen (info->name,sizeof (est->name)) >=sizeof (est->name)) +return -ENAMETOOLONG ; +net_get_random_once (&jhash_rnd,sizeof (jhash_rnd));mutex_lock (&xn->hash_lock);
Greg Kroah-Hartman
maintainerPATCH 64/92 USB: yurex: fix control-URB timeout handling
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 372c93131998c0622304bed118322d2a04489e63 upstream.
Make sure to always cancel the control URB in write() so that it can be reused after a timeout or spurious CMD_ACK.
Currently any further write requests after a timeout would fail after triggering a WARN() in usb_submit_urb() when attempting to submit the already active URB.
--- drivers/usb/misc/yurex.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/misc/yurex.c +3 -0
@@ -497,6 +497,9 @@ static ssize_t yurex_write(struct file * timeout =schedule_timeout (YUREX_WRITE_TIMEOUT );finish_wait (&dev->waitq, &wait); +/* make sure URB is idle after timeout or (spurious) CMD_ACK */ +usb_kill_urb (dev->cntl_urb); +mutex_unlock (&dev->io_mutex);if (retval <0 ) {
Greg Kroah-Hartman
maintainerPATCH 92/92 KVM: x86: fix shift out of bounds reported by UBSAN
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 2f80d502d627f30257ba7e3655e71c373b7d1a5a upstream.
Since we know that e >= s, we can reassociate the left shift, changing the shifted number from 1 to 2 in exchange for decreasing the right hand side by 1.
--- arch/x86/kvm/mmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/mmu.h +1 -1
@@ -48,7 +48,7 @@ static inline u64 rsvd_bits(int s, int eif (e < s)return 0 ; -return ((1ULL << (e - s +1 )) -1 ) << s; +return ((2ULL << (e - s)) -1 ) << s; }void kvm_mmu_set_mmio_spte_mask (u64 mmio_mask,u64 mmio_value,u64 access_mask);
Greg Kroah-Hartman
maintainerPATCH 77/92 kvm: check tlbs_dirty directly
In reply to Greg Kroah-HartmanFrom: Lai Jiangshan <[email protected]>
commit 88bf56d04bc3564542049ec4ec168a8b60d0b48c upstream.
In kvm_mmu_notifier_invalidate_range_start(), tlbs_dirty is used as:
need_tlb_flush |= kvm->tlbs_dirty;
with need_tlb_flush's type being int and tlbs_dirty's type being long.
It means that tlbs_dirty is always used as int and the higher 32 bits is useless. We need to check tlbs_dirty in a correct way and this change checks it directly without propagating it to need_tlb_flush.
Note: it's _extremely_ unlikely this neglecting of higher 32 bits can cause problems in practice. It would require encountering tlbs_dirty on a 4 billion count boundary, and KVM would need to be using shadow paging or be running a nested guest.
Message-Id: <[email protected]>
--- virt/kvm/kvm_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
virt/kvm/kvm_main.c +1 -2
@@ -428,9 +428,8 @@ static int kvm_mmu_notifier_invalidate_r kvm->mmu_notifier_count++; need_tlb_flush =kvm_unmap_hva_range (kvm, range->start, range->end, range->flags); - need_tlb_flush |= kvm->tlbs_dirty;/* we've to flush the tlb before the pages can be freed */ -if (need_tlb_flush) +if (need_tlb_flush || kvm->tlbs_dirty)kvm_flush_remote_tlbs (kvm);spin_unlock (&kvm->mmu_lock);
Greg Kroah-Hartman
maintainerPATCH 81/92 ALSA: hda/realtek: Enable mute and micmute LED on HP EliteBook 850 G7
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit a598098cc9737f612dbab52294433fc26c51cc9b upstream.
HP EliteBook 850 G7 uses the same GPIO pins as ALC285_FIXUP_HP_GPIO_LED to enable mute and micmute LED. So apply the quirk to enable the LEDs.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -7880,6 +7880,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8497 ,"HP Envy x360" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x84e7 ,"HP Pavilion 15" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x869d ,"HP" ,ALC236_FIXUP_HP_MUTE_LED ), +SND_PCI_QUIRK (0x103c ,0x8724 ,"HP EliteBook 850 G7" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8729 ,"HP" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8736 ,"HP" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ), SND_PCI_QUIRK(0x103c, 0x8760, "HP", ALC285_FIXUP_HP_MUTE_LED),
Greg Kroah-Hartman
maintainerPATCH 88/92 netfilter: ipset: fix shift-out-of-bounds in htable_bits()
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
commit 5c8193f568ae16f3242abad6518dc2ca6c8eef86 upstream.
htable_bits() can call jhash_size(32) and trigger shift-out-of-bounds
UBSAN: shift-out-of-bounds in net/netfilter/ipset/ip_set_hash_gen.h:151:6 shift exponent 32 is too large for 32-bit type 'unsigned int' CPU: 0 PID: 8498 Comm: syz-executor519 Not tainted 5.10.0-rc7-next-20201208-syzkaller #0 Call Trace: __dump_stack lib/dump_stack.c:79 [inline] dump_stack+0x107/0x163 lib/dump_stack.c:120 ubsan_epilogue+0xb/0x5a lib/ubsan.c:148 __ubsan_handle_shift_out_of_bounds.cold+0xb1/0x181 lib/ubsan.c:395 htable_bits net/netfilter/ipset/ip_set_hash_gen.h:151 [inline] hash_mac_create.cold+0x58/0x9b net/netfilter/ipset/ip_set_hash_gen.h:1524 ip_set_create+0x610/0x1380 net/netfilter/ipset/ip_set_core.c:1115 nfnetlink_rcv_msg+0xecc/0x1180 net/netfilter/nfnetlink.c:252 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2494 nfnetlink_rcv+0x1ac/0x420 net/netfilter/nfnetlink.c:600 netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline] netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1330 netlink_sendmsg+0x907/0xe40 net/netlink/af_netlink.c:1919 sock_sendmsg_nosec net/socket.c:652 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:672 ____sys_sendmsg+0x6e8/0x810 net/socket.c:2345 ___sys_sendmsg+0xf3/0x170 net/socket.c:2399 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2432 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9
This patch replaces htable_bits() by simple fls(hashsize - 1) call:
it alone returns valid nbits both for round and non-round hashsizes. It is normal to set any nbits here because it is validated inside following htable_size() call which returns 0 for nbits>31.
--- net/netfilter/ipset/ip_set_hash_gen.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
net/netfilter/ipset/ip_set_hash_gen.h +5 -15
@@ -143,20 +143,6 @@ htable_size(u8 hbits)return hsize *sizeof (struct hbucket *) +sizeof (struct htable ); } -/* Compute htable_bits from the user input parameter hashsize */ -static u8 -htable_bits (u32 hashsize) -{ -/* Assume that hashsize == 2^htable_bits */ -u8 bits =fls (hashsize -1 ); - -if (jhash_size (bits) != hashsize) -/* Round up to the first 2^n value */ - bits =fls (hashsize); - -return bits; -} -#ifdef IP_SET_HASH_WITH_NETS #if IPSET_NET_COUNT >1 #define __CIDR (cidr, i) (cidr[i])
@@ -1520,7 +1506,11 @@ IPSET_TOKEN(HTYPE, _create)(struct net *if (!h)return -ENOMEM ; - hbits =htable_bits (hashsize); +/* Compute htable_bits from the user input parameter hashsize. +* Assume that hashsize == 2^htable_bits, +* otherwise round up to the first 2^n value. +*/ + hbits =fls (hashsize -1 ); hsize =htable_size (hbits);if (hsize ==0 ) {kfree (h);
Greg Kroah-Hartman
maintainerPATCH 66/92 ALSA: usb-audio: Fix UBSAN warnings for MIDI jacks
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit c06ccf3ebb7503706ea49fd248e709287ef385a3 upstream.
The calculation of in_cables and out_cables bitmaps are done with the bit shift by the value from the descriptor, which is an arbitrary value, and can lead to UBSAN shift-out-of-bounds warnings.
Fix it by filtering the bad descriptor values with the check of the upper bound 0x10 (the cable bitmaps are 16 bits).
--- sound/usb/midi.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/usb/midi.c +4 -0
@@ -1889,6 +1889,8 @@ static int snd_usbmidi_get_ms_info(struc ms_ep =find_usb_ms_endpoint_descriptor (hostep);if (!ms_ep)continue ; +if (ms_ep->bNumEmbMIDIJack >0x10 ) +continue ;if (usb_endpoint_dir_out (ep)) {if (endpoints[epidx].out_ep) {if (++epidx >=MIDI_MAX_ENDPOINTS ) {
@@ -2141,6 +2143,8 @@ static int snd_usbmidi_detect_roland(str cs_desc[1] == USB_DT_CS_INTERFACE && cs_desc[2] == 0xf1 && cs_desc[3] == 0x02) { +if (cs_desc[4 ] >0x10 || cs_desc[5 ] >0x10 ) +continue ; endpoint->in_cables = (1 << cs_desc[4 ]) -1 ; endpoint->out_cables = (1 << cs_desc[5 ]) -1 ;return snd_usbmidi_detect_endpoints (umidi, endpoint,1 );
Greg Kroah-Hartman
maintainerPATCH 87/92 netfilter: x_tables: Update remaining dereference to RCU
In reply to Greg Kroah-HartmanFrom: Subash Abhinov Kasiviswanathan <[email protected]>
commit 443d6e86f821a165fae3fc3fc13086d27ac140b1 upstream.
This fixes the dereference to fetch the RCU pointer when holding the appropriate xtables lock.
--- net/ipv4/netfilter/arp_tables.c | 2 +- net/ipv4/netfilter/ip_tables.c | 2 +- net/ipv6/netfilter/ip6_tables.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
net/ipv4/netfilter/arp_tables.c +1 -1
@@ -1406,7 +1406,7 @@ static int compat_get_entries(struct netxt_compat_lock (NFPROTO_ARP ); t =xt_find_table_lock (net,NFPROTO_ARP , get.name);if (!IS_ERR (t)) { -const struct xt_table_info *private = t->private; +const struct xt_table_info *private =xt_table_get_private_protected (t);struct xt_table_info info; ret =compat_table_info (private, &info);
net/ipv4/netfilter/ip_tables.c +1 -1
@@ -1616,7 +1616,7 @@ compat_get_entries(struct net *net, struxt_compat_lock (AF_INET ); t =xt_find_table_lock (net,AF_INET , get.name);if (!IS_ERR (t)) { -const struct xt_table_info *private = t->private; +const struct xt_table_info *private =xt_table_get_private_protected (t);struct xt_table_info info; ret =compat_table_info (private, &info);if (!ret && get.size == info.size)
net/ipv6/netfilter/ip6_tables.c +1 -1
@@ -1625,7 +1625,7 @@ compat_get_entries(struct net *net, struxt_compat_lock (AF_INET6 ); t =xt_find_table_lock (net,AF_INET6 , get.name);if (!IS_ERR (t)) { -const struct xt_table_info *private = t->private; +const struct xt_table_info *private =xt_table_get_private_protected (t);struct xt_table_info info; ret =compat_table_info (private, &info);if (!ret && get.size == info.size)
Greg Kroah-Hartman
maintainerPATCH 75/92 USB: serial: keyspan_pda: remove unused variable
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
Remove an unused variable which was mistakingly left by commit 37faf5061541 ("USB: serial: keyspan_pda: fix write-wakeup use-after-free") and only removed by a later change.
This is needed to suppress a W=1 warning about the unused variable in the stable trees that the build bots triggers.
--- drivers/usb/serial/keyspan_pda.c | 2 -- 1 file changed, 2 deletions(-)
drivers/usb/serial/keyspan_pda.c +0 -2
@@ -555,10 +555,8 @@ exit:static void keyspan_pda_write_bulk_callback (struct urb *urb) {struct usb_serial_port *port = urb->context; -struct keyspan_pda_private *priv;set_bit (0 , &port->write_urbs_free); - priv =usb_get_serial_port_data (port);/* queue up a wakeup at scheduler time */ usb_serial_port_softint (port);
Greg Kroah-Hartman
maintainerPATCH 63/92 USB: serial: option: add Quectel EM160R-GL
In reply to Greg Kroah-HartmanFrom: Bjørn Mork <[email protected]>
commit d6c1ddd938d84a1adef7e19e8efc10e1b4df5034 upstream.
New modem using ff/ff/30 for QCDM, ff/00/00 for AT and NMEA, and ff/ff/ff for RMNET/QMI.
T: Bus=02 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=5000 MxCh= 0
D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1
P: Vendor=2c7c ProdID=0620 Rev= 4.09
S: Manufacturer=Quectel
S: Product=EM160R-GL
S: SerialNumber=e31cedc1
C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=896mA
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=(none)
E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
E: Ad=84(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
E: Ad=86(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=04(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=32ms
E: Ad=8e(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
E: Ad=0f(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -1117,6 +1117,8 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0xff, 0xff), .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0620, 0xff, 0xff, 0x30) }, /* EM160R-GL */ + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0620, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x30) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10),
Greg Kroah-Hartman
maintainerPATCH 83/92 btrfs: send: fix wrong file path when there is an inode with a pending rmdir
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 0b3f407e6728d990ae1630a02c7b952c21c288d3 upstream.
When doing an incremental send, if we have a new inode that happens to have the same number that an old directory inode had in the base snapshot and that old directory has a pending rmdir operation, we end up computing a wrong path for the new inode, causing the receiver to fail.
Example reproducer:
$ cat test-send-rmdir.sh #!/bin/bash
DEV=/dev/sdi
MNT=/mnt/sdi
mkfs.btrfs -f $DEV >/dev/null
mount $DEV $MNT
mkdir $MNT/dir
touch $MNT/dir/file1
touch $MNT/dir/file2
touch $MNT/dir/file3
# Filesystem looks like:
#
# . (ino 256) # |----- dir/ (ino 257) # |----- file1 (ino 258) # |----- file2 (ino 259) # |----- file3 (ino 260) #
btrfs subvolume snapshot -r $MNT $MNT/snap1
btrfs send -f /tmp/snap1.send $MNT/snap1
# Now remove our directory and all its files.
rm -fr $MNT/dir
# Unmount the filesystem and mount it again. This is to ensure that
# the next inode that is created ends up with the same inode number # that our directory "dir" had, 257, which is the first free "objectid" # available after mounting again the filesystem. umount $MNT mount $DEV $MNT
# Now create a new file (it could be a directory as well). touch $MNT/newfile
# Filesystem now looks like:
#
# . (ino 256) # |----- newfile (ino 257) #
btrfs subvolume snapshot -r $MNT $MNT/snap2 btrfs send -f /tmp/snap2.send -p $MNT/snap1 $MNT/snap2
# Now unmount the filesystem, create a new one, mount it and try to apply
# both send streams to recreate both snapshots. umount $DEV
mkfs.btrfs -f $DEV >/dev/null
mount $DEV $MNT
btrfs receive -f /tmp/snap1.send $MNT
btrfs receive -f /tmp/snap2.send $MNT
umount $MNT
When running the test, the receive operation for the incremental stream fails:
$ ./test-send-rmdir.sh Create a readonly snapshot of '/mnt/sdi' in '/mnt/sdi/snap1' At subvol /mnt/sdi/snap1 Create a readonly snapshot of '/mnt/sdi' in '/mnt/sdi/snap2' At subvol /mnt/sdi/snap2 At subvol snap1 At snapshot snap2 ERROR: chown o257-9-0 failed: No such file or directory
So fix this by tracking directories that have a pending rmdir by inode number and generation number, instead of only inode number.
A test case for fstests follows soon.
--- fs/btrfs/send.c | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-)
fs/btrfs/send.c +31 -18
@@ -238,6 +238,7 @@ struct waiting_dir_move {* after this directory is moved, we can try to rmdir the ino rmdir_ino. */ u64 rmdir_ino; +u64 rmdir_gen;bool orphanized; };
@@ -323,7 +324,7 @@ static int is_waiting_for_move(struct sestatic struct waiting_dir_move *get_waiting_dir_move (struct send_ctx *sctx,u64 ino); -static int is_waiting_for_rm (struct send_ctx *sctx,u64 dir_ino); +static int is_waiting_for_rm (struct send_ctx *sctx,u64 dir_ino,u64 gen);static int need_send_hole (struct send_ctx *sctx) {
@@ -2306,7 +2307,7 @@ static int get_cur_path(struct send_ctxfs_path_reset (name); -if (is_waiting_for_rm (sctx, ino)) { +if (is_waiting_for_rm (sctx, ino, gen)) { ret =gen_unique_name (sctx, ino, gen, name);if (ret <0 ) goto out;
@@ -2865,8 +2866,8 @@ out:return ret; } -static struct orphan_dir_info * -add_orphan_dir_info (struct send_ctx *sctx,u64 dir_ino) +static struct orphan_dir_info *add_orphan_dir_info (struct send_ctx *sctx, +u64 dir_ino,u64 dir_gen) {struct rb_node **p = &sctx->orphan_dirs.rb_node;struct rb_node *parent =NULL ;
@@ -2875,20 +2876,23 @@ add_orphan_dir_info(struct send_ctx *sctwhile (*p) { parent = *p; entry = rb_entry(parent, struct orphan_dir_info, node); -if (dir_ino < entry->ino) { +if (dir_ino < entry->ino) p = &(*p)->rb_left; - }else if (dir_ino > entry->ino) { +else if (dir_ino > entry->ino) p = &(*p)->rb_right; - }else { +else if (dir_gen < entry->gen) + p = &(*p)->rb_left; +else if (dir_gen > entry->gen) + p = &(*p)->rb_right; +else return entry; - } } odi =kmalloc (sizeof (*odi),GFP_KERNEL );if (!odi)return ERR_PTR (-ENOMEM ); odi->ino = dir_ino; - odi->gen =0 ; + odi->gen = dir_gen; odi->last_dir_index_offset =0 ;rb_link_node (&odi->node, parent, p);
@@ -2896,8 +2900,8 @@ add_orphan_dir_info(struct send_ctx *sctreturn odi; } -static struct orphan_dir_info * -get_orphan_dir_info (struct send_ctx *sctx,u64 dir_ino) +static struct orphan_dir_info *get_orphan_dir_info (struct send_ctx *sctx, +u64 dir_ino,u64 gen) {struct rb_node *n = sctx->orphan_dirs.rb_node;struct orphan_dir_info *entry;
@@ -2908,15 +2912,19 @@ get_orphan_dir_info(struct send_ctx *sct n = n->rb_left; else if (dir_ino > entry->ino) n = n->rb_right; + else if (gen < entry->gen) + n = n->rb_left; + else if (gen > entry->gen) + n = n->rb_right; else return entry; }return NULL ; } -static int is_waiting_for_rm (struct send_ctx *sctx,u64 dir_ino) +static int is_waiting_for_rm (struct send_ctx *sctx,u64 dir_ino,u64 gen) { -struct orphan_dir_info *odi =get_orphan_dir_info (sctx, dir_ino); +struct orphan_dir_info *odi =get_orphan_dir_info (sctx, dir_ino, gen);return odi !=NULL ; }
@@ -2961,7 +2969,7 @@ static int can_rmdir(struct send_ctx *sc key.type =BTRFS_DIR_INDEX_KEY ; key.offset =0 ; - odi =get_orphan_dir_info (sctx, dir); + odi =get_orphan_dir_info (sctx, dir, dir_gen);if (odi) key.offset = odi->last_dir_index_offset;
@@ -2992,7 +3000,7 @@ static int can_rmdir(struct send_ctx *sc dm =get_waiting_dir_move (sctx, loc.objectid);if (dm) { - odi =add_orphan_dir_info (sctx, dir); + odi =add_orphan_dir_info (sctx, dir, dir_gen);if (IS_ERR (odi)) { ret =PTR_ERR (odi); goto out;
@@ -3000,12 +3008,13 @@ static int can_rmdir(struct send_ctx *sc odi->gen = dir_gen; odi->last_dir_index_offset = found_key.offset; dm->rmdir_ino = dir; + dm->rmdir_gen = dir_gen; ret =0 ; goto out; }if (loc.objectid > send_progress) { - odi =add_orphan_dir_info (sctx, dir); + odi =add_orphan_dir_info (sctx, dir, dir_gen);if (IS_ERR (odi)) { ret =PTR_ERR (odi); goto out;
@@ -3045,6 +3054,7 @@ static int add_waiting_dir_move(struct sreturn -ENOMEM ; dm->ino = ino; dm->rmdir_ino =0 ; + dm->rmdir_gen =0 ; dm->orphanized = orphanized;while (*p) {
@@ -3190,7 +3200,7 @@ static int path_loop(struct send_ctx *scwhile (ino !=BTRFS_FIRST_FREE_OBJECTID ) {fs_path_reset (name); -if (is_waiting_for_rm (sctx, ino)) +if (is_waiting_for_rm (sctx, ino, gen))break ;if (is_waiting_for_move (sctx, ino)) {if (*ancestor_ino ==0 )
@@ -3230,6 +3240,7 @@ static int apply_dir_move(struct send_ctu64 parent_ino, parent_gen;struct waiting_dir_move *dm =NULL ;u64 rmdir_ino =0 ; +u64 rmdir_gen;u64 ancestor;bool is_orphan;int ret;
@@ -3244,6 +3255,7 @@ static int apply_dir_move(struct send_ct dm =get_waiting_dir_move (sctx, pm->ino);ASSERT (dm); rmdir_ino = dm->rmdir_ino; + rmdir_gen = dm->rmdir_gen; is_orphan = dm->orphanized;free_waiting_dir_move (sctx, dm);
@@ -3280,6 +3292,7 @@ static int apply_dir_move(struct send_ct dm =get_waiting_dir_move (sctx, pm->ino);ASSERT (dm); dm->rmdir_ino = rmdir_ino; + dm->rmdir_gen = rmdir_gen; } goto out; }
@@ -3298,7 +3311,7 @@ static int apply_dir_move(struct send_ctstruct orphan_dir_info *odi;u64 gen; - odi =get_orphan_dir_info (sctx, rmdir_ino); + odi =get_orphan_dir_info (sctx, rmdir_ino, rmdir_gen);if (!odi) {/* already deleted */ goto finish;
Greg Kroah-Hartman
maintainerPATCH 58/92 USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set
In reply to Greg Kroah-HartmanFrom: Michael Grzeschik <[email protected]>
commit 5d5323a6f3625f101dbfa94ba3ef7706cce38760 upstream.
The commit 0472bf06c6fd ("xhci: Prevent U1/U2 link pm states if exit latency is too long") was constraining the xhci code not to allow U1/U2 sleep states if the latency to wake up from the U-states reached the service interval of an periodic endpoint. This fix was not taking into account that in case the quirk XHCI_INTEL_HOST is set, the wakeup time will be calculated and configured differently.
It checks for u1_params.mel/u2_params.mel as a limit. But the code could decide to write another MEL into the hardware. This leads to broken cases where not enough bandwidth is available for other devices:
usb 1-2: can't set config #1, error -28
This patch is fixing that case by checking for timeout_ns after the wakeup time was calculated depending on the quirks.
--- drivers/usb/host/xhci.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/usb/host/xhci.c +12 -12
@@ -4642,19 +4642,19 @@ static u16 xhci_calculate_u1_timeout(str {unsigned long long timeout_ns; +if (xhci->quirks &XHCI_INTEL_HOST ) + timeout_ns =xhci_calculate_intel_u1_timeout (udev, desc); +else + timeout_ns = udev->u1_params.sel; +/* Prevent U1 if service interval is shorter than U1 exit latency */ if (usb_endpoint_xfer_int (desc) ||usb_endpoint_xfer_isoc (desc)) { -if (xhci_service_interval_to_ns (desc) <= udev->u1_params.mel) { +if (xhci_service_interval_to_ns (desc) <= timeout_ns) {dev_dbg (&udev->dev,"Disable U1, ESIT shorter than exit latency\n" );return USB3_LPM_DISABLED ; } } -if (xhci->quirks &XHCI_INTEL_HOST ) - timeout_ns =xhci_calculate_intel_u1_timeout (udev, desc); -else - timeout_ns = udev->u1_params.sel; -/* The U1 timeout is encoded in 1us intervals. * Don't return a timeout of zero, because that's USB3_LPM_DISABLED. */
@@ -4706,19 +4706,19 @@ static u16 xhci_calculate_u2_timeout(str {unsigned long long timeout_ns; +if (xhci->quirks &XHCI_INTEL_HOST ) + timeout_ns =xhci_calculate_intel_u2_timeout (udev, desc); +else + timeout_ns = udev->u2_params.sel; +/* Prevent U2 if service interval is shorter than U2 exit latency */ if (usb_endpoint_xfer_int (desc) ||usb_endpoint_xfer_isoc (desc)) { -if (xhci_service_interval_to_ns (desc) <= udev->u2_params.mel) { +if (xhci_service_interval_to_ns (desc) <= timeout_ns) {dev_dbg (&udev->dev,"Disable U2, ESIT shorter than exit latency\n" );return USB3_LPM_DISABLED ; } } -if (xhci->quirks &XHCI_INTEL_HOST ) - timeout_ns =xhci_calculate_intel_u2_timeout (udev, desc); -else - timeout_ns = udev->u2_params.sel; -/* The U2 timeout is encoded in 256us intervals */ timeout_ns =DIV_ROUND_UP_ULL (timeout_ns,256 *1000 );/* If the necessary timeout value is bigger than what we can set in the
Greg Kroah-Hartman
maintainerPATCH 69/92 usb: gadget: function: printer: Fix a memory leak for interface descriptor
In reply to Greg Kroah-HartmanFrom: Zqiang <[email protected]>
commit 2cc332e4ee4febcbb685e2962ad323fe4b3b750a upstream.
When printer driver is loaded, the printer_func_bind function is called, in this function, the interface descriptor be allocated memory, if after that, the error occurred, the interface descriptor memory need to be free.
--- drivers/usb/gadget/function/f_printer.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/function/f_printer.c +1 -0
@@ -1126,6 +1126,7 @@ fail_tx_reqs:printer_req_free (dev->in_ep, req); } +usb_free_all_descriptors (f);return ret; }
Greg Kroah-Hartman
maintainerPATCH 62/92 USB: serial: option: add LongSung M5710 module support
In reply to Greg Kroah-HartmanFrom: Daniel Palmer <[email protected]>
commit 0e2d6795e8dbe91c2f5473564c6b25d11df3778b upstream.
Add a device-id entry for the LongSung M5710 module.
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=2df3 ProdID=9d03 Rev= 1.00 S: Manufacturer=Marvell S: Product=Mobile Composite Device Bus S: SerialNumber=<snip>
C:* #Ifs= 5 Cfg#= 1 Atr=c0 MxPwr=500mA
A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=03
I:* If#= 0 Alt= 0 #EPs= 1 Cls=e0(wlcon) Sub=01 Prot=03 Driver=rndis_host
E: Ad=87(I) Atr=03(Int.) MxPS= 64 Ivl=4096ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=rndis_host
E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0c(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0b(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=89(I) Atr=03(Int.) MxPS= 64 Ivl=4096ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=88(I) Atr=03(Int.) MxPS= 64 Ivl=4096ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0a(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
https://lore.kernel.org/r/[email protected]
--- drivers/usb/serial/option.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/option.c +1 -0
@@ -2057,6 +2057,7 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff), /* Fibocom NL678 series */ .driver_info = RSVD(6) }, { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */ + { USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) }, /* LongSung M5710 */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) }, /* GosunCn GM500 RNDIS */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) }, /* GosunCn GM500 MBIM */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) }, /* GosunCn GM500 ECM/NCM */
Greg Kroah-Hartman
maintainerPATCH 34/92 net: sched: prevent invalid Scell_log shift count
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit bd1248f1ddbc48b0c30565fce897a3b6423313b8 ]
Check Scell_log shift size in red_check_params() and modify all callers of red_check_params() to pass Scell_log.
This prevents a shift out-of-bounds as detected by UBSAN:
UBSAN: shift-out-of-bounds in ./include/net/red.h:252:22 shift exponent 72 is too large for 32-bit type 'int'
--- include/net/red.h | 4 +++- net/sched/sch_choke.c | 2 +- net/sched/sch_gred.c | 2 +- net/sched/sch_red.c | 2 +- net/sched/sch_sfq.c | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-)
include/net/red.h +3 -1
@@ -168,12 +168,14 @@ static inline void red_set_vars(struct r v->qcount =-1 ; } -static inline bool red_check_params (u32 qth_min,u32 qth_max,u8 Wlog) +static inline bool red_check_params (u32 qth_min,u32 qth_max,u8 Wlog,u8 Scell_log) {if (fls (qth_min) + Wlog >32 )return false;if (fls (qth_max) + Wlog >32 )return false; +if (Scell_log >=32 ) +return false;if (qth_max < qth_min)return false;return true;
net/sched/sch_choke.c +1 -1
@@ -368,7 +368,7 @@ static int choke_change(struct Qdisc *sc ctl =nla_data (tb[TCA_CHOKE_PARMS ]); -if (!red_check_params (ctl->qth_min, ctl->qth_max, ctl->Wlog)) +if (!red_check_params (ctl->qth_min, ctl->qth_max, ctl->Wlog, ctl->Scell_log))return -EINVAL ;if (ctl->limit >CHOKE_MAX_QUEUE )
net/sched/sch_gred.c +1 -1
@@ -480,7 +480,7 @@ static inline int gred_change_vq(structstruct gred_sched *table =qdisc_priv (sch);struct gred_sched_data *q = table->tab[dp]; -if (!red_check_params (ctl->qth_min, ctl->qth_max, ctl->Wlog)) { +if (!red_check_params (ctl->qth_min, ctl->qth_max, ctl->Wlog, ctl->Scell_log)) {NL_SET_ERR_MSG_MOD (extack,"invalid RED parameters" );return -EINVAL ; }
net/sched/sch_red.c +1 -1
@@ -213,7 +213,7 @@ static int red_change(struct Qdisc *sch, max_P = tb[TCA_RED_MAX_P ] ?nla_get_u32 (tb[TCA_RED_MAX_P ]) :0 ; ctl =nla_data (tb[TCA_RED_PARMS ]); -if (!red_check_params (ctl->qth_min, ctl->qth_max, ctl->Wlog)) +if (!red_check_params (ctl->qth_min, ctl->qth_max, ctl->Wlog, ctl->Scell_log))return -EINVAL ;if (ctl->limit >0 ) {
net/sched/sch_sfq.c +1 -1
@@ -647,7 +647,7 @@ static int sfq_change(struct Qdisc *sch, }if (ctl_v1 && !red_check_params (ctl_v1->qth_min, ctl_v1->qth_max, - ctl_v1->Wlog)) + ctl_v1->Wlog, ctl_v1->Scell_log))return -EINVAL ;if (ctl_v1 && ctl_v1->qth_min) { p =kmalloc (sizeof (*p),GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 53/92 usb: gadget: enable super speed plus
In reply to Greg Kroah-HartmanFrom: taehyun.cho <[email protected]>
commit e2459108b5a0604c4b472cae2b3cb8d3444c77fb upstream.
Enable Super speed plus in configfs to support USB3.1 Gen2. This ensures that when a USB gadget is plugged in, it is enumerated as Gen 2 and connected at 10 Gbps if the host and cable are capable of it.
Many in-tree gadget functions (fs, midi, acm, ncm, mass_storage, etc.) already have SuperSpeed Plus support.
Tested: plugged gadget into Linux host and saw:
[284907.385986] usb 8-2: new SuperSpeedPlus Gen 2 USB device number 3 using xhci_hcd
--- drivers/usb/gadget/configfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/configfs.c +2 -2
@@ -1505,7 +1505,7 @@ static const struct usb_gadget_driver co .suspend = configfs_composite_suspend, .resume = configfs_composite_resume, - .max_speed = USB_SPEED_SUPER, + .max_speed = USB_SPEED_SUPER_PLUS, .driver = { .owner = THIS_MODULE, .name = "configfs-gadget",
@@ -1545,7 +1545,7 @@ static struct config_group *gadgets_make gi->composite.unbind = configfs_do_nothing; gi->composite.suspend =NULL ; gi->composite.resume =NULL ; - gi->composite.max_speed =USB_SPEED_SUPER ; + gi->composite.max_speed =USB_SPEED_SUPER_PLUS ;spin_lock_init (&gi->spinlock);mutex_init (&gi->lock);
Greg Kroah-Hartman
maintainerPATCH 85/92 dmabuf: fix use-after-free of dmabufs file->f_inode
In reply to Greg Kroah-HartmanFrom: Charan Teja Reddy <[email protected]>
commit 05cd84691eafcd7959a1e120d5e72c0dd98c5d91 upstream.
It is observed 'use-after-free' on the dmabuf's file->f_inode with the race between closing the dmabuf file and reading the dmabuf's debug info.
Consider the below scenario where P1 is closing the dma_buf file and P2 is reading the dma_buf's debug info in the system:
P1 P2
dma_buf_debug_show()dma_buf_put()
__fput()
file->f_op->release()
dput()
....
dentry_unlink_inode()
iput(dentry->d_inode)
(where the inode is freed)
mutex_lock(&db_list.lock)
read 'dma_buf->file->f_inode'
(the same inode is freed by P1)
mutex_unlock(&db_list.lock)
dentry->d_op->d_release()-->
dma_buf_release()
.....
mutex_lock(&db_list.lock)
removes the dmabuf from the list
mutex_unlock(&db_list.lock)In the above scenario, when dma_buf_put() is called on a dma_buf, it first frees the dma_buf's file->f_inode(=dentry->d_inode) and then removes this dma_buf from the system db_list. In between P2 traversing the db_list tries to access this dma_buf's file->f_inode that was freed by P1 which is a use-after-free case.
Since, __fput() calls f_op->release first and then later calls the d_op->d_release, move the dma_buf's db_list removal from d_release() to f_op->release(). This ensures that dma_buf's file->f_inode is not accessed after it is released.
--- drivers/dma-buf/dma-buf.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/dma-buf/dma-buf.c +17 -4
@@ -76,10 +76,6 @@ static void dma_buf_release(struct dentr dmabuf->ops->release (dmabuf); -mutex_lock (&db_list.lock); -list_del (&dmabuf->list_node); -mutex_unlock (&db_list.lock); -if (dmabuf->resv == (struct dma_resv *)&dmabuf[1 ])dma_resv_fini (dmabuf->resv);
@@ -88,6 +84,22 @@ static void dma_buf_release(struct dentrkfree (dmabuf); } +static int dma_buf_file_release (struct inode *inode,struct file *file) +{ +struct dma_buf *dmabuf; + +if (!is_dma_buf_file (file)) +return -EINVAL ; + + dmabuf = file->private_data; + +mutex_lock (&db_list.lock); +list_del (&dmabuf->list_node); +mutex_unlock (&db_list.lock); + +return 0 ; +} +static const struct dentry_operations dma_buf_dentry_ops = { .d_dname = dmabuffs_dname, .d_release = dma_buf_release,
@@ -413,6 +425,7 @@ static void dma_buf_show_fdinfo(struct s }static const struct file_operations dma_buf_fops = { + .release = dma_buf_file_release, .mmap = dma_buf_mmap_internal, .llseek = dma_buf_llseek, .poll = dma_buf_poll,
Greg Kroah-Hartman
maintainerPATCH 82/92 ALSA: hda/realtek: Add two "Intel Reference board" SSID in the ALC256.
In reply to Greg Kroah-HartmanFrom: PeiSen Hou <[email protected]>
commit ce2e79b223867b9e586021b55dee7035517a236b upstream.
Add two "Intel Reference boad" SSID in the alc256. Enable "power saving mode" and Enable "headset jack mode".
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -7941,6 +7941,8 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x10cf ,0x1845 ,"Lifebook U904" ,ALC269_FIXUP_LIFEBOOK_EXTMIC ),SND_PCI_QUIRK (0x10ec ,0x10f2 ,"Intel Reference board" ,ALC700_FIXUP_INTEL_REFERENCE ),SND_PCI_QUIRK (0x10ec ,0x1230 ,"Intel Reference board" ,ALC295_FIXUP_CHROME_BOOK ), +SND_PCI_QUIRK (0x10ec ,0x1252 ,"Intel Reference board" ,ALC295_FIXUP_CHROME_BOOK ), +SND_PCI_QUIRK (0x10ec ,0x1254 ,"Intel Reference board" ,ALC295_FIXUP_CHROME_BOOK ),SND_PCI_QUIRK (0x10f7 ,0x8338 ,"Panasonic CF-SZ6" ,ALC269_FIXUP_HEADSET_MODE ),SND_PCI_QUIRK (0x144d ,0xc109 ,"Samsung Ativ book 9 (NP900X3G)" ,ALC269_FIXUP_INV_DMIC ), SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
Greg Kroah-Hartman
maintainerPATCH 80/92 ALSA: hda/realtek - Fix speaker volume control on Lenovo C940
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
commit f86de9b1c0663b0a3ca2dcddec9aa910ff0fbf2c upstream.
Cannot adjust speaker's volume on Lenovo C940.
Applying the alc298_fixup_speaker_volume function can fix the issue.
[ Additional note: C940 has I2S amp for the speaker and this needs the
same initialization as Dell machines.
The patch was slightly modified so that the quirk entry is moved next to the corresponding Dell quirk entry. -- tiwai ]
--- sound/pci/hda/patch_realtek.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/pci/hda/patch_realtek.c +6 -0
@@ -6236,6 +6236,7 @@ enum {ALC221_FIXUP_HP_FRONT_MIC ,ALC292_FIXUP_TPT460 ,ALC298_FIXUP_SPK_VOLUME , +ALC298_FIXUP_LENOVO_SPK_VOLUME ,ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER ,ALC269_FIXUP_ATIV_BOOK_8 , ALC221_FIXUP_HP_MIC_NO_PRESENCE,
@@ -7062,6 +7063,10 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id = ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE, }, + [ALC298_FIXUP_LENOVO_SPK_VOLUME] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc298_fixup_speaker_volume, + }, [ALC295_FIXUP_DISABLE_DAC3] = { .type = HDA_FIXUP_FUNC, .v.func = alc295_fixup_disable_dac3,
@@ -8040,6 +8045,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x3151 ,"ThinkCentre Station" ,ALC283_FIXUP_HEADSET_MIC ),SND_PCI_QUIRK (0x17aa ,0x3176 ,"ThinkCentre Station" ,ALC283_FIXUP_HEADSET_MIC ),SND_PCI_QUIRK (0x17aa ,0x3178 ,"ThinkCentre Station" ,ALC283_FIXUP_HEADSET_MIC ), +SND_PCI_QUIRK (0x17aa ,0x3818 ,"Lenovo C940" ,ALC298_FIXUP_LENOVO_SPK_VOLUME ),SND_PCI_QUIRK (0x17aa ,0x3902 ,"Lenovo E50-80" ,ALC269_FIXUP_DMIC_THINKPAD_ACPI ),SND_PCI_QUIRK (0x17aa ,0x3977 ,"IdeaPad S210" ,ALC283_FIXUP_INT_MIC ), SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
Greg Kroah-Hartman
maintainerPATCH 60/92 usb: uas: Add PNY USB Portable SSD to unusual_uas
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 96ebc9c871d8a28fb22aa758dd9188a4732df482 upstream.
Here's another variant PNY Pro Elite USB 3.1 Gen 2 portable SSD that hangs and doesn't respond to ATA_1x pass-through commands. If it doesn't support these commands, it should respond properly to the host. Add it to the unusual uas list to be able to move forward with other operations.
--- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_uas.h +7 -0
@@ -91,6 +91,13 @@ UNUSUAL_DEV(0x152d, 0x0578, 0x0000, 0x99 US_FL_BROKEN_FUA),/* Reported-by: Thinh Nguyen <[email protected]> */ +UNUSUAL_DEV (0x154b ,0xf00b ,0x0000 ,0x9999 , +"PNY" , +"Pro Elite SSD" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_NO_ATA_1X ), + +/* Reported-by: Thinh Nguyen <[email protected]> */ UNUSUAL_DEV(0x154b, 0xf00d, 0x0000, 0x9999, "PNY", "Pro Elite SSD",
Greg Kroah-Hartman
maintainerPATCH 73/92 usb: gadget: configfs: Preserve function ordering after bind failure
In reply to Greg Kroah-HartmanFrom: Chandana Kishori Chiluveru <[email protected]>
commit 6cd0fe91387917be48e91385a572a69dfac2f3f7 upstream.
When binding the ConfigFS gadget to a UDC, the functions in each configuration are added in list order. However, if usb_add_function() fails, the failed function is put back on its configuration's func_list and purge_configs_funcs() is called to further clean up.
purge_configs_funcs() iterates over the configurations and functions in forward order, calling unbind() on each of the previously added functions. But after doing so, each function gets moved to the tail of the configuration's func_list. This results in reshuffling the original order of the functions within a configuration such that the failed function now appears first even though it may have originally appeared in the middle or even end of the list. At this point if the ConfigFS gadget is attempted to re-bind to the UDC, the functions will be added in a different order than intended, with the only recourse being to remove and relink the functions all over again.
An example of this as follows:
ln -s functions/mass_storage.0 configs/c.1
ln -s functions/ncm.0 configs/c.1
ln -s functions/ffs.adb configs/c.1 # oops, forgot to start adbd
echo "<udc device>" > UDC # fails
start adbd
echo "<udc device>" > UDC # now succeeds, but...
# bind order is # "ADB", mass_storage, ncm
[30133.118289] configfs-gadget gadget: adding 'Mass Storage Function'/ffffff810af87200 to config 'c'/ffffff817d6a2520 [30133.119875] configfs-gadget gadget: adding 'cdc_network'/ffffff80f48d1a00 to config 'c'/ffffff817d6a2520 [30133.119974] using random self ethernet address [30133.120002] using random host ethernet address [30133.139604] usb0: HOST MAC 3e:27:46:ba:3e:26 [30133.140015] usb0: MAC 6e:28:7e:42:66:6a [30133.140062] configfs-gadget gadget: adding 'Function FS Gadget'/ffffff80f3868438 to config 'c'/ffffff817d6a2520 [30133.140081] configfs-gadget gadget: adding 'Function FS Gadget'/ffffff80f3868438 --> -19 [30133.140098] configfs-gadget gadget: unbind function 'Mass Storage Function'/ffffff810af87200 [30133.140119] configfs-gadget gadget: unbind function 'cdc_network'/ffffff80f48d1a00 [30133.173201] configfs-gadget a600000.dwc3: failed to start g1: -19 [30136.661933] init: starting service 'adbd'... [30136.700126] read descriptors [30136.700413] read strings [30138.574484] configfs-gadget gadget: adding 'Function FS Gadget'/ffffff80f3868438 to config 'c'/ffffff817d6a2520 [30138.575497] configfs-gadget gadget: adding 'Mass Storage Function'/ffffff810af87200 to config 'c'/ffffff817d6a2520 [30138.575554] configfs-gadget gadget: adding 'cdc_network'/ffffff80f48d1a00 to config 'c'/ffffff817d6a2520 [30138.575631] using random self ethernet address [30138.575660] using random host ethernet address [30138.595338] usb0: HOST MAC 2e:cf:43:cd:ca:c8 [30138.597160] usb0: MAC 6a:f0:9f:ee:82:a0 [30138.791490] configfs-gadget gadget: super-speed config #1: c
Fix this by reversing the iteration order of the functions in purge_config_funcs() when unbinding them, and adding them back to the config's func_list at the head instead of the tail. This ensures that we unbind and unwind back to the original list order.
--- drivers/usb/gadget/configfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/configfs.c +2 -2
@@ -1217,9 +1217,9 @@ static void purge_configs_funcs(struct g cfg = container_of(c, struct config_usb_cfg, c); -list_for_each_entry_safe (f, tmp, &c->functions, list) { +list_for_each_entry_safe_reverse (f, tmp, &c->functions, list) { -list_move_tail (&f->list, &cfg->func_list); +list_move (&f->list, &cfg->func_list);if (f->unbind) { dev_dbg(&gi->cdev.gadget->dev, "unbind function '%s'/%p\n",
Greg Kroah-Hartman
maintainerPATCH 76/92 x86/mm: Fix leak of pmd ptlock
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
commit d1c5246e08eb64991001d97a3bd119c93edbc79a upstream.
Commit
28ee90fe6048 ("x86/mm: implement free pmd/pte page interfaces")
introduced a new location where a pmd was released, but neglected to run the pmd page destructor. In fact, this happened previously for a different pmd release path and was fixed by commit:
c283610e44ec ("x86, mm: do not leak page->ptl for pmd page tables").
This issue was hidden until recently because the failure mode is silent, but commit:
b2b29d6d0119 ("mm: account PMD tables like PTE tables")
turns the failure mode into this signature:
BUG: Bad page state in process lt-pmem-ns pfn:15943d page:000000007262ed7b refcount:0 mapcount:-1024 mapping:0000000000000000 index:0x0 pfn:0x15943d flags: 0xaffff800000000() raw: 00affff800000000 dead000000000100 0000000000000000 0000000000000000 raw: 0000000000000000 ffff913a029bcc08 00000000fffffbff 0000000000000000 page dumped because: nonzero mapcount [..] dump_stack+0x8b/0xb0 bad_page.cold+0x63/0x94 free_pcp_prepare+0x224/0x270 free_unref_page+0x18/0xd0 pud_free_pmd_page+0x146/0x160 ioremap_pud_range+0xe3/0x350 ioremap_page_range+0x108/0x160 __ioremap_caller.constprop.0+0x174/0x2b0 ? memremap+0x7a/0x110 memremap+0x7a/0x110 devm_memremap+0x53/0xa0 pmem_attach_disk+0x4ed/0x530 [nd_pmem] ? __devm_release_region+0x52/0x80 nvdimm_bus_probe+0x85/0x210 [libnvdimm]
Given this is a repeat occurrence it seemed prudent to look for other places where this destructor might be missing and whether a better helper is needed. try_to_free_pmd_page() looks like a candidate, but testing with setting up and tearing down pmd mappings via the dax unit tests is thus far not triggering the failure.
As for a better helper pmd_free() is close, but it is a messy fit due to requiring an @mm arg. Also, ___pmd_free_tlb() wants to call paravirt_tlb_remove_table() instead of free_page(), so open-coded pgtable_pmd_page_dtor() seems the best way forward for now.
Debugged together with Matthew Wilcox <[email protected]>.
--- arch/x86/mm/pgtable.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/mm/pgtable.c +2 -0
@@ -826,6 +826,8 @@ int pud_free_pmd_page(pud_t *pud, unsign }free_page ((unsigned long )pmd_sv); + +pgtable_pmd_page_dtor (virt_to_page (pmd));free_page ((unsigned long )pmd);return 1 ;
Greg Kroah-Hartman
maintainerPATCH 78/92 ALSA: hda/via: Fix runtime PM for Clevo W35xSS
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 4bfd6247fa9164c8e193a55ef9c0ea3ee22f82d8 upstream.
Clevo W35xSS_370SS with VIA codec has had the runtime PM problem that looses the power state of some nodes after the runtime resume. This was worked around by disabling the default runtime PM via a denylist entry. Since 5.10.x made the runtime PM applied (casually) even though it's disabled in the denylist, this problem was revisited. The result was that disabling power_save_node feature suffices for the runtime PM problem.
This patch implements the disablement of power_save_node feature in VIA codec for the device. It also drops the former denylist entry, too, as the runtime PM should work in the codec side properly now.
--- sound/pci/hda/hda_intel.c | 2 -- sound/pci/hda/patch_via.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-)
sound/pci/hda/hda_intel.c +0 -2
@@ -2186,8 +2186,6 @@ static struct snd_pci_quirk power_save_bSND_PCI_QUIRK (0x1849 ,0x7662 ,"Asrock H81M-HDS" ,0 ),/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ SND_PCI_QUIRK (0x1043 ,0x8733 ,"Asus Prime X370-Pro" ,0 ), -/* https://bugzilla.redhat.com/show_bug.cgi?id=1581607 */ -SND_PCI_QUIRK (0x1558 ,0x3501 ,"Clevo W35xSS_370SS" ,0 ),/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ SND_PCI_QUIRK(0x1558, 0x6504, "Clevo W65_67SB", 0),/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
sound/pci/hda/patch_via.c +13 -0
@@ -1002,6 +1002,7 @@ static const struct hda_verb vt1802_initenum {VIA_FIXUP_INTMIC_BOOST ,VIA_FIXUP_ASUS_G75 , +VIA_FIXUP_POWER_SAVE , }; static void via_fixup_intmic_boost(struct hda_codec *codec,
@@ -1011,6 +1012,13 @@ static void via_fixup_intmic_boost(strucoverride_mic_boost (codec,0x30 ,0 ,2 ,40 ); } +static void via_fixup_power_save (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) + codec->power_save_node =0 ; +} +static const struct hda_fixup via_fixups[] = { [VIA_FIXUP_INTMIC_BOOST ] = { .type =HDA_FIXUP_FUNC ,
@@ -1025,11 +1033,16 @@ static const struct hda_fixup via_fixups { } } }, + [VIA_FIXUP_POWER_SAVE] = { + .type = HDA_FIXUP_FUNC, + .v.func = via_fixup_power_save, + }, };static const struct snd_pci_quirk vt2002p_fixups[] = {SND_PCI_QUIRK (0x1043 ,0x1487 ,"Asus G75" ,VIA_FIXUP_ASUS_G75 ),SND_PCI_QUIRK (0x1043 ,0x8532 ,"Asus X202E" ,VIA_FIXUP_INTMIC_BOOST ), +SND_PCI_QUIRK (0x1558 ,0x3501 ,"Clevo W35xSS_370SS" ,VIA_FIXUP_POWER_SAVE ), {} };
Greg Kroah-Hartman
maintainerPATCH 30/92 net: ethernet: ti: cpts: fix ethtool output when no ptp_clock registered
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 4614792eebcbf81c60ad3604c1aeeb2b0899cea4 ]
The CPTS driver registers PTP PHC clock when first netif is going up and unregister it when all netif are down. Now ethtool will show:
- PTP PHC clock index 0 after boot until first netif is up;
- the last assigned PTP PHC clock index even if PTP PHC clock is not
registered any more after all netifs are down.
This patch ensures that -1 is returned by ethtool when PTP PHC clock is not registered any more.
--- drivers/net/ethernet/ti/cpts.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/ti/cpts.c +2 -0
@@ -485,6 +485,7 @@ void cpts_unregister(struct cpts *cpts)ptp_clock_unregister (cpts->clock); cpts->clock =NULL ; + cpts->phc_index =-1 ;cpts_write32 (cpts,0 , int_enable);cpts_write32 (cpts,0 , control);
@@ -667,6 +668,7 @@ struct cpts *cpts_create(struct device * cpts->cc.read = cpts_systim_read; cpts->cc.mask =CLOCKSOURCE_MASK (32 ); cpts->info = cpts_info; + cpts->phc_index =-1 ;cpts_calc_mult_shift (cpts);/* save cc.mult original value as it can be modified
Greg Kroah-Hartman
maintainerPATCH 48/92 video: hyperv_fb: Fix the mmap() regression for v5.4.y and older
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
db49200b1dad is backported from the mainline commit5f1251a48c17 ("video: hyperv_fb: Fix the cache type when mapping the VRAM"), to v5.4.y and older stable branches, but unluckily db49200b1dad causes mmap() to fail for /dev/fb0 due to EINVAL:
[ 5797.049560] x86/PAT: a.out:1910 map pfn expected mapping type uncached-minus for [mem 0xf8200000-0xf85cbfff], got write-back
This means the v5.4.y kernel detects an incompatibility issue about the mapping type of the VRAM: db49200b1dad changes to use Write-Back when mapping the VRAM, while the mmap() syscall tries to use Uncached-minus. That’s to say, the kernel thinks Uncached-minus is incompatible with
Write-Back: see drivers/video/fbdev/core/fbmem.c: fb_mmap() -> vm_iomap_memory() -> io_remap_pfn_range() -> ... -> track_pfn_remap() -> reserve_pfn_range().
Note: any v5.5 and newer kernel doesn't have the issue, because they
have commitd21987d709e8 ("video: hyperv: hyperv_fb: Support deferred IO for Hyper-V frame buffer driver") , and when the hyperv_fb driver has the deferred_io support, fb_deferred_io_init() overrides info->fbops->fb_mmap with fb_deferred_io_mmap(), which doesn’t check the mapping type
incompatibility. Note: since it's VRAM here, the checking is not really necessary.
Fix the regression by ioremap_wc(), which uses Write-combining. The kernel thinks it's compatible with Uncached-minus. The VRAM mappped by ioremap_wc() is slightly slower than mapped by ioremap_cache(), but is still significantly faster than by ioremap().
Change the comment accordingly. Linux VM on ARM64 Hyper-V is still not working in the latest mainline yet, and when it works in future, the ARM64 support is unlikely to be backported to v5.4 and older, so using ioremap_wc() in v5.4 and older should be ok.
Note: this fix is only targeted at the stable branches:
v5.4.y, v4.19.y, v4.14.y, v4.9.y and v4.4.y.
--- drivers/video/fbdev/hyperv_fb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/video/fbdev/hyperv_fb.c +2 -4
@@ -704,11 +704,9 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) }/* -* Map the VRAM cacheable for performance. This is also required for -* VM Connect to display properly for ARM64 Linux VM, as the host also -* maps the VRAM cacheable. +* Map the VRAM cacheable for performance. */ - fb_virt =ioremap_cache (par->mem->start, screen_fb_size); + fb_virt =ioremap_wc (par->mem->start, screen_fb_size);if (!fb_virt) goto err2;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 51/92 powerpc: Handle .text.{hot,unlikely}.* in linker script
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit 3ce47d95b7346dcafd9bed3556a8d072cb2b8571 upstream.
Commit eff8728fe698 ("vmlinux.lds.h: Add PGO and AutoFDO input sections") added ".text.unlikely.*" and ".text.hot.*" due to an LLVM change [1].
After another LLVM change [2], these sections are seen in some PowerPC builds, where there is a orphan section warning then build failure:
$ make -skj"$(nproc)" \
ARCH=powerpc CROSS_COMPILE=powerpc64le-linux-gnu- LLVM=1 O=out \
distclean powernv_defconfig zImage.epapr
ld.lld: warning: kernel/built-in.a(panic.o):(.text.unlikely.) is being placed in '.text.unlikely.'
...
ld.lld: warning: address (0xc000000000009314) of section .text is not a multiple of alignment (256)
...
ERROR: start_text address is c000000000009400, should be c000000000008000
ERROR: try to enable LD_HEAD_STUB_CATCH config option
ERROR: see comments in arch/powerpc/tools/head_check.sh
...Explicitly handle these sections like in the main linker script so there is no more build failure.
[1]: https://reviews.llvm.org/D79600
[2]: https://reviews.llvm.org/D92493
--- arch/powerpc/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/vmlinux.lds.S +1 -1
@@ -98,7 +98,7 @@ SECTIONS ALIGN_FUNCTION(); #endif /* careful! __ftr_alt_* sections need to be close to .text */ - *(.text.hot TEXT_MAIN .text.fixup .text.unlikely .fixup __ftr_alt_* .ref.text); + *(.text.hot .text.hot.* TEXT_MAIN .text.fixup .text.unlikely .text.unlikely.* .fixup __ftr_alt_* .ref.text); #ifdef CONFIG_PPC64 *(.tramp.ftrace.text); #endif
Greg Kroah-Hartman
maintainerPATCH 27/92 net-sysfs: take the rtnl lock when accessing xps_cpus_map and num_tc
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit fb25038586d0064123e393cadf1fadd70a9df97a ]
Accesses to dev->xps_cpus_map (when using dev->num_tc) should be protected by the rtnl lock, like we do for netif_set_xps_queue. I didn't see an actual bug being triggered, but let's be safe here and take the rtnl lock while accessing the map in sysfs.
--- net/core/net-sysfs.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)
net/core/net-sysfs.c +22 -7
@@ -1235,8 +1235,8 @@ static const struct attribute_group dql_static ssize_t xps_cpus_show (struct netdev_queue *queue,char *buf) { +int cpu, len, ret, num_tc =1 , tc =0 ;struct net_device *dev = queue->dev; -int cpu, len, num_tc =1 , tc =0 ;struct xps_dev_maps *dev_maps;cpumask_var_t mask;unsigned long index;
@@ -1246,22 +1246,31 @@ static ssize_t xps_cpus_show(struct netd index =get_netdev_queue_index (queue); +if (!rtnl_trylock ()) +return restart_syscall (); +if (dev->num_tc) {/* Do not allow XPS on subordinate device directly */ num_tc = dev->num_tc; -if (num_tc <0 ) -return -EINVAL ; +if (num_tc <0 ) { + ret = -EINVAL ; + goto err_rtnl_unlock; + }/* If queue belongs to subordinate dev use its map */ dev =netdev_get_tx_queue (dev, index)->sb_dev ? : dev; tc =netdev_txq_to_tc (dev, index); -if (tc <0 ) -return -EINVAL ; +if (tc <0 ) { + ret = -EINVAL ; + goto err_rtnl_unlock; + } } -if (!zalloc_cpumask_var (&mask,GFP_KERNEL )) -return -ENOMEM ; +if (!zalloc_cpumask_var (&mask,GFP_KERNEL )) { + ret = -ENOMEM ; + goto err_rtnl_unlock; + }rcu_read_lock (); dev_maps =rcu_dereference (dev->xps_cpus_map);
@@ -1284,9 +1293,15 @@ static ssize_t xps_cpus_show(struct netd }rcu_read_unlock (); +rtnl_unlock (); + len =snprintf (buf,PAGE_SIZE ,"%*pb\n" ,cpumask_pr_args (mask));free_cpumask_var (mask);return len <PAGE_SIZE ? len : -EINVAL ; + +err_rtnl_unlock: +rtnl_unlock (); +return ret; } static ssize_t xps_cpus_store(struct netdev_queue *queue,
Greg Kroah-Hartman
maintainerPATCH 56/92 usb: dwc3: ulpi: Use VStsDone to detect PHY regs access completion
In reply to Greg Kroah-HartmanFrom: Serge Semin <[email protected]>
commit ce722da66d3e9384aa2de9d33d584ee154e5e157 upstream.
In accordance with [1] the DWC_usb3 core sets the GUSB2PHYACCn.VStsDone bit when the PHY vendor control access is done and clears it when the application initiates a new transaction. The doc doesn't say anything about the GUSB2PHYACCn.VStsBsy flag serving for the same purpose. Moreover we've discovered that the VStsBsy flag can be cleared before the VStsDone bit. So using the former as a signal of the PHY control registers completion might be dangerous. Let's have the VStsDone flag utilized instead then.
[1] Synopsys DesignWare Cores SuperSpeed USB 3.0 xHCI Host Controller
Databook, 2.70a, December 2013, p.388
--- drivers/usb/dwc3/core.h | 1 + drivers/usb/dwc3/ulpi.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/usb/dwc3/core.h +1 -0
@@ -283,6 +283,7 @@/* Global USB2 PHY Vendor Control Register */ #define DWC3_GUSB2PHYACC_NEWREGREQ BIT(25) +#define DWC3_GUSB2PHYACC_DONE BIT(24)#define DWC3_GUSB2PHYACC_BUSY BIT(23)#define DWC3_GUSB2PHYACC_WRITE BIT(22)#define DWC3_GUSB2PHYACC_ADDR (n) (n << 16)
drivers/usb/dwc3/ulpi.c +1 -1
@@ -24,7 +24,7 @@ static int dwc3_ulpi_busyloop(struct dwcwhile (count--) { reg =dwc3_readl (dwc->regs,DWC3_GUSB2PHYACC (0 )); -if (!(reg &DWC3_GUSB2PHYACC_BUSY )) +if (reg &DWC3_GUSB2PHYACC_DONE )return 0 ;cpu_relax (); }
Greg Kroah-Hartman
maintainerPATCH 35/92 net: hns: fix return value check in __lb_other_process()
In reply to Greg Kroah-HartmanFrom: Yunjian Wang <[email protected]>
[ Upstream commit 5ede3ada3da7f050519112b81badc058190b9f9f ]
The function skb_copy() could return NULL, the return value need to be checked.
--- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +4 -0
@@ -415,6 +415,10 @@ static void __lb_other_process(struct hn/* for mutl buffer*/ new_skb =skb_copy (skb,GFP_ATOMIC );dev_kfree_skb_any (skb); +if (!new_skb) { +netdev_err (ndev,"skb alloc failed\n" ); +return ; + } skb = new_skb; check_ok =0 ;
Greg Kroah-Hartman
maintainerPATCH 54/92 USB: cdc-acm: blacklist another IR Droid device
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit 0ffc76539e6e8d28114f95ac25c167c37b5191b3 upstream.
This device is supported by the IR Toy driver.
--- drivers/usb/class/cdc-acm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/class/cdc-acm.c +4 -0
@@ -1907,6 +1907,10 @@ static const struct usb_device_id acm_id { USB_DEVICE(0x04d8, 0x0083), /* Bootloader mode */ .driver_info = IGNORE_DEVICE, }, + + { USB_DEVICE(0x04d8, 0xf58b), + .driver_info = IGNORE_DEVICE, + }, #endif /*Samsung phone in firmware update mode */
Greg Kroah-Hartman
maintainerPATCH 32/92 net: mvpp2: fix pkt coalescing int-threshold configuration
In reply to Greg Kroah-HartmanFrom: Stefan Chulski <[email protected]>
[ Upstream commit 4f374d2c43a9e5e773f1dee56db63bd6b8a36276 ]
The packet coalescing interrupt threshold has separated registers for different aggregated/cpu (sw-thread). The required value should be loaded for every thread but not only for 1 current cpu.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +6 -5
@@ -2161,17 +2161,18 @@ static void mvpp2_rx_pkts_coal_set(strucstatic void mvpp2_tx_pkts_coal_set (struct mvpp2_port *port,struct mvpp2_tx_queue *txq) { -unsigned int thread =mvpp2_cpu_to_thread (port->priv,get_cpu ()); +unsigned int thread;u32 val;if (txq->done_pkts_coal >MVPP2_TXQ_THRESH_MASK ) txq->done_pkts_coal =MVPP2_TXQ_THRESH_MASK ; val = (txq->done_pkts_coal <<MVPP2_TXQ_THRESH_OFFSET ); -mvpp2_thread_write (port->priv, thread,MVPP2_TXQ_NUM_REG , txq->id); -mvpp2_thread_write (port->priv, thread,MVPP2_TXQ_THRESH_REG , val); - -put_cpu (); +/* PKT-coalescing registers are per-queue + per-thread */ +for (thread =0 ; thread <MVPP2_MAX_THREADS ; thread++) { +mvpp2_thread_write (port->priv, thread,MVPP2_TXQ_NUM_REG , txq->id); +mvpp2_thread_write (port->priv, thread,MVPP2_TXQ_THRESH_REG , val); + } }static u32 mvpp2_usec_to_cycles (u32 usec,unsigned long clk_hz)
Greg Kroah-Hartman
maintainerPATCH 33/92 ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst()
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit 21fdca22eb7df2a1e194b8adb812ce370748b733 ]
RT_TOS() only clears one of the ECN bits. Therefore, when fib_compute_spec_dst() resorts to a fib lookup, it can return different results depending on the value of the second ECN bit.
For example, ECT(0) and ECT(1) packets could be treated differently.
$ ip netns add ns0 $ ip netns add ns1 $ ip link add name veth01 netns ns0 type veth peer name veth10 netns ns1 $ ip -netns ns0 link set dev lo up $ ip -netns ns1 link set dev lo up $ ip -netns ns0 link set dev veth01 up $ ip -netns ns1 link set dev veth10 up
$ ip -netns ns0 address add 192.0.2.10/24 dev veth01 $ ip -netns ns1 address add 192.0.2.11/24 dev veth10
$ ip -netns ns1 address add 192.0.2.21/32 dev lo $ ip -netns ns1 route add 192.0.2.10/32 tos 4 dev veth10 src 192.0.2.21 $ ip netns exec ns1 sysctl -wq net.ipv4.icmp_echo_ignore_broadcasts=0
With TOS 4 and ECT(1), ns1 replies using source address 192.0.2.21 (ping uses -Q to set all TOS and ECN bits):
$ ip netns exec ns0 ping -c 1 -b -Q 5 192.0.2.255 [...] 64 bytes from 192.0.2.21: icmp_seq=1 ttl=64 time=0.544 ms
But with TOS 4 and ECT(0), ns1 replies using source address 192.0.2.11 because the "tos 4" route isn't matched:
$ ip netns exec ns0 ping -c 1 -b -Q 6 192.0.2.255 [...] 64 bytes from 192.0.2.11: icmp_seq=1 ttl=64 time=0.597 ms
After this patch the ECN bits don't affect the result anymore:
$ ip netns exec ns0 ping -c 1 -b -Q 6 192.0.2.255 [...] 64 bytes from 192.0.2.21: icmp_seq=1 ttl=64 time=0.591 ms
--- net/ipv4/fib_frontend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/fib_frontend.c +1 -1
@@ -302,7 +302,7 @@ __be32 fib_compute_spec_dst(struct sk_bu .flowi4_iif = LOOPBACK_IFINDEX, .flowi4_oif = l3mdev_master_ifindex_rcu(dev), .daddr = ip_hdr(skb)->saddr, - .flowi4_tos = RT_TOS(ip_hdr(skb)->tos), + .flowi4_tos = ip_hdr(skb)->tos & IPTOS_RT_MASK, .flowi4_scope = scope, .flowi4_mark = vmark ? skb->mark : 0, };
Greg Kroah-Hartman
maintainerPATCH 31/92 tun: fix return value when the number of iovs exceeds MAX_SKB_FRAGS
In reply to Greg Kroah-HartmanFrom: Yunjian Wang <[email protected]>
[ Upstream commit 950271d7cc0b4546af3549d8143c4132d6e1f138 ]
Currently the tun_napi_alloc_frags() function returns -ENOMEM when the number of iovs exceeds MAX_SKB_FRAGS + 1. However this is inappropriate, we should use -EMSGSIZE instead of -ENOMEM.
The following distinctions are matters:
1. the caller need to drop the bad packet when -EMSGSIZE is returned, which means meeting a persistent failure.
2. the caller can try again when -ENOMEM is returned, which means meeting a transient failure.
--- drivers/net/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/tun.c +1 -1
@@ -1469,7 +1469,7 @@ static struct sk_buff *tun_napi_alloc_frint i;if (it->nr_segs >MAX_SKB_FRAGS +1 ) -return ERR_PTR (-ENOMEM ); +return ERR_PTR (-EMSGSIZE );local_bh_disable (); skb =napi_get_frags (&tfile->napi);
Greg Kroah-Hartman
maintainerPATCH 50/92 crypto: asym_tpm: correct zero out potential secrets
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit f93274ef0fe972c120c96b3207f8fce376231a60 upstream.
The function derive_pub_key() should be calling memzero_explicit() instead of memset() in case the complier decides to optimize away the call to memset() because it "knows" no one is going to touch the memory anymore.
--- crypto/asymmetric_keys/asym_tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/asymmetric_keys/asym_tpm.c +1 -1
@@ -370,7 +370,7 @@ static uint32_t derive_pub_key(const voimemcpy (cur, e,sizeof (e)); cur +=sizeof (e);/* Zero parameters to satisfy set_pub_key ABI. */ -memset (cur,0 ,SETKEY_PARAMS_SIZE ); +memzero_explicit (cur,SETKEY_PARAMS_SIZE );return cur - buf; }
Greg Kroah-Hartman
maintainerPATCH 47/92 Bluetooth: revert: hci_h5: close serdev device and free hu in h5_close
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 5c3b5796866f85354a5ce76a28f8ffba0dcefc7e upstream.
There have been multiple revisions of the patch fix the h5->rx_skb leak. Accidentally the first revision (which is buggy) and v5 have both been merged:
v1 commit 70f259a3f427 ("Bluetooth: hci_h5: close serdev device and free hu in h5_close");
v5 commit 855af2d74c87 ("Bluetooth: hci_h5: fix memory leak in h5_close")
The correct v5 makes changes slightly higher up in the h5_close() function, which allowed both versions to get merged without conflict.
The changes from v1 unconditionally frees the h5 data struct, this is wrong because in the serdev enumeration case the memory is allocated in h5_serdev_probe() like this:
h5 = devm_kzalloc(dev, sizeof(*h5), GFP_KERNEL);
So its lifetime is tied to the lifetime of the driver being bound to the serdev and it is automatically freed when the driver gets unbound. In the serdev case the same h5 struct is re-used over h5_close() and h5_open() calls and thus MUST not be free-ed in h5_close().
The serdev_device_close() added to h5_close() is incorrect in the same way, serdev_device_close() is called on driver unbound too and also MUST no be called from h5_close().
This reverts the changes made by merging v1 of the patch, so that just the changes of the correct v5 remain.
--- drivers/bluetooth/hci_h5.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/bluetooth/hci_h5.c +2 -6
@@ -250,12 +250,8 @@ static int h5_close(struct hci_uart *hu)if (h5->vnd && h5->vnd->close) h5->vnd->close (h5); -if (hu->serdev) -serdev_device_close (hu->serdev); - -kfree_skb (h5->rx_skb); -kfree (h5); - h5 =NULL ; +if (!hu->serdev) +kfree (h5);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 49/92 crypto: ecdh - avoid buffer overflow in ecdh_set_secret()
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit 0aa171e9b267ce7c52d3a3df7bc9c1fc0203dec5 upstream.
Pavel reports that commit 17858b140bf4 ("crypto: ecdh - avoid unaligned accesses in ecdh_set_secret()") fixes one problem but introduces another:
the unconditional memcpy() introduced by that commit may overflow the target buffer if the source data is invalid, which could be the result of intentional tampering.
So check params.key_size explicitly against the size of the target buffer before validating the key further.
--- crypto/ecdh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
crypto/ecdh.c +2 -1
@@ -39,7 +39,8 @@ static int ecdh_set_secret(struct cryptostruct ecdh params;unsigned int ndigits; -if (crypto_ecdh_decode_key (buf, len, ¶ms) <0 ) +if (crypto_ecdh_decode_key (buf, len, ¶ms) <0 || + params.key_size >sizeof (ctx->private_key))return -EINVAL ; ndigits =ecdh_supported_curve (params.curve_id);
Greg Kroah-Hartman
maintainerPATCH 25/92 net: ethernet: Fix memleak in ethoc_probe
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 5d41f9b7ee7a5a5138894f58846a4ffed601498a ]
When mdiobus_register() fails, priv->mdio allocated by mdiobus_alloc() has not been freed, which leads to memleak.
--- drivers/net/ethernet/ethoc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/ethoc.c +2 -1
@@ -1207,7 +1207,7 @@ static int ethoc_probe(struct platform_d ret =mdiobus_register (priv->mdio);if (ret) {dev_err (&netdev->dev,"failed to register MDIO bus\n" ); - goto free2; + goto free3; } ret =ethoc_mdio_probe (netdev);
@@ -1239,6 +1239,7 @@ error2:netif_napi_del (&priv->napi); error:mdiobus_unregister (priv->mdio); +free3:mdiobus_free (priv->mdio); free2:clk_disable_unprepare (priv->clk);
Greg Kroah-Hartman
maintainerPATCH 57/92 usb: chipidea: ci_hdrc_imx: add missing put_device() call in usbmisc_get_init_data()
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
commit 83a43ff80a566de8718dfc6565545a0080ec1fb5 upstream.
if of_find_device_by_node() succeed, usbmisc_get_init_data() doesn't have a corresponding put_device(). Thus add put_device() to fix the exception handling for this function implementation.
--- drivers/usb/chipidea/ci_hdrc_imx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/usb/chipidea/ci_hdrc_imx.c +5 -1
@@ -139,9 +139,13 @@ static struct imx_usbmisc_data *usbmisc_ misc_pdev =of_find_device_by_node (args.np);of_node_put (args.np); -if (!misc_pdev || !platform_get_drvdata (misc_pdev)) +if (!misc_pdev)return ERR_PTR (-EPROBE_DEFER ); +if (!platform_get_drvdata (misc_pdev)) { +put_device (&misc_pdev->dev); +return ERR_PTR (-EPROBE_DEFER ); + } data->dev = &misc_pdev->dev;/*
Greg Kroah-Hartman
maintainerPATCH 23/92 net: dcb: Validate netlink message in DCB handler
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit 826f328e2b7e8854dd42ea44e6519cd75018e7b1 ]
DCB uses the same handler function for both RTM_GETDCB and RTM_SETDCB messages. dcb_doit() bounces RTM_SETDCB mesasges if the user does not have the CAP_NET_ADMIN capability.
However, the operation to be performed is not decided from the DCB message type, but from the DCB command. Thus DCB_CMD_*_GET commands are used for reading DCB objects, the corresponding SET and DEL commands are used for manipulation.
The assumption is that set-like commands will be sent via an RTM_SETDCB message, and get-like ones via RTM_GETDCB. However, this assumption is not enforced.
It is therefore possible to manipulate DCB objects without CAP_NET_ADMIN capability by sending the corresponding command in an RTM_GETDCB message. That is a bug. Fix it by validating the type of the request message against the type used for the response.
--- net/dcb/dcbnl.c | 2 ++ 1 file changed, 2 insertions(+)
net/dcb/dcbnl.c +2 -0
@@ -1765,6 +1765,8 @@ static int dcb_doit(struct sk_buff *skb, fn = &reply_funcs[dcb->cmd];if (!fn->cb)return -EOPNOTSUPP ; +if (fn->type != nlh->nlmsg_type) +return -EPERM ;if (!tb[DCB_ATTR_IFNAME ])return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 46/92 kbuild: dont hardcode depmod path
In reply to Greg Kroah-HartmanFrom: Dominique Martinet <[email protected]>
commit 436e980e2ed526832de822cbf13c317a458b78e1 upstream.
depmod is not guaranteed to be in /sbin, just let make look for it in the path like all the other invoked programs
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -436,7 +436,7 @@ LEX = flex YACC = bison AWK = awk INSTALLKERNEL := installkernel -DEPMOD = /sbin/depmod +DEPMOD = depmod PERL = perl PYTHON = python PYTHON3 = python3
Greg Kroah-Hartman
maintainerPATCH 29/92 net-sysfs: take the rtnl lock when accessing xps_rxqs_map and num_tc
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 4ae2bb81649dc03dfc95875f02126b14b773f7ab ]
Accesses to dev->xps_rxqs_map (when using dev->num_tc) should be protected by the rtnl lock, like we do for netif_set_xps_queue. I didn't see an actual bug being triggered, but let's be safe here and take the rtnl lock while accessing the map in sysfs.
--- net/core/net-sysfs.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
net/core/net-sysfs.c +18 -5
@@ -1347,22 +1347,29 @@ static struct netdev_queue_attribute xpsstatic ssize_t xps_rxqs_show (struct netdev_queue *queue,char *buf) { +int j, len, ret, num_tc =1 , tc =0 ;struct net_device *dev = queue->dev;struct xps_dev_maps *dev_maps;unsigned long *mask, index; -int j, len, num_tc =1 , tc =0 ; index =get_netdev_queue_index (queue); +if (!rtnl_trylock ()) +return restart_syscall (); +if (dev->num_tc) { num_tc = dev->num_tc; tc =netdev_txq_to_tc (dev, index); -if (tc <0 ) -return -EINVAL ; +if (tc <0 ) { + ret = -EINVAL ; + goto err_rtnl_unlock; + } } mask =bitmap_zalloc (dev->num_rx_queues,GFP_KERNEL ); -if (!mask) -return -ENOMEM ; +if (!mask) { + ret = -ENOMEM ; + goto err_rtnl_unlock; + }rcu_read_lock (); dev_maps =rcu_dereference (dev->xps_rxqs_map);
@@ -1388,10 +1395,16 @@ static ssize_t xps_rxqs_show(struct netd out_no_maps:rcu_read_unlock (); +rtnl_unlock (); + len =bitmap_print_to_pagebuf (false, buf, mask, dev->num_rx_queues);bitmap_free (mask);return len <PAGE_SIZE ? len : -EINVAL ; + +err_rtnl_unlock: +rtnl_unlock (); +return ret; } static ssize_t xps_rxqs_store(struct netdev_queue *queue, const char *buf,
Greg Kroah-Hartman
maintainerPATCH 28/92 net-sysfs: take the rtnl lock when storing xps_rxqs
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 2d57b4f142e0b03e854612b8e28978935414bced ]
Two race conditions can be triggered when storing xps rxqs, resulting in various oops and invalid memory accesses:
1. Calling netdev_set_num_tc while netif_set_xps_queue:
- netif_set_xps_queue uses dev->tc_num as one of the parameters to compute the size of new_dev_maps when allocating it. dev->tc_num is also used to access the map, and the compiler may generate code to retrieve this field multiple times in the function.
- netdev_set_num_tc sets dev->tc_num.
If new_dev_maps is allocated using dev->tc_num and then dev->tc_num is set to a higher value through netdev_set_num_tc, later accesses to new_dev_maps in netif_set_xps_queue could lead to accessing memory outside of new_dev_maps; triggering an oops.
2. Calling netif_set_xps_queue while netdev_set_num_tc is running:
2.1. netdev_set_num_tc starts by resetting the xps queues,
dev->tc_num isn't updated yet.
2.2. netif_set_xps_queue is called, setting up the map with the
*old* dev->num_tc.
2.3. netdev_set_num_tc updates dev->tc_num.
2.4. Later accesses to the map lead to out of bound accesses and
oops.
A similar issue can be found with netdev_reset_tc.
One way of triggering this is to set an iface up (for which the driver uses netdev_set_num_tc in the open path, such as bnx2x) and writing to xps_rxqs in a concurrent thread. With the right timing an oops is triggered.
Both issues have the same fix: netif_set_xps_queue, netdev_set_num_tc and netdev_reset_tc should be mutually exclusive. We do that by taking the rtnl lock in xps_rxqs_store.
--- net/core/net-sysfs.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/core/net-sysfs.c +7 -0
@@ -1417,10 +1417,17 @@ static ssize_t xps_rxqs_store(struct netreturn err; } +if (!rtnl_trylock ()) { +bitmap_free (mask); +return restart_syscall (); + } +cpus_read_lock (); err =__netif_set_xps_queue (dev, mask, index, true);cpus_read_unlock (); +rtnl_unlock (); +bitmap_free (mask);return err ? : len; }
Greg Kroah-Hartman
maintainerPATCH 43/92 vhost_net: fix ubuf refcount incorrectly when sendmsg fails
In reply to Greg Kroah-HartmanFrom: Yunjian Wang <[email protected]>
[ Upstream commit 01e31bea7e622f1890c274f4aaaaf8bccd296aa5 ]
Currently the vhost_zerocopy_callback() maybe be called to decrease the refcount when sendmsg fails in tun. The error handling in vhost handle_tx_zerocopy() will try to decrease the same refcount again. This is wrong. To fix this issue, we only call vhost_net_ubuf_put() when vq->heads[nvq->desc].len == VHOST_DMA_IN_PROGRESS.
--- drivers/vhost/net.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/vhost/net.c +3 -3
@@ -860,6 +860,7 @@ static void handle_tx_zerocopy(struct vhsize_t len, total_len =0 ;int err;struct vhost_net_ubuf_ref *uninitialized_var (ubufs ); +struct ubuf_info *ubuf;bool zcopy_used;int sent_pkts =0 ;
@@ -892,9 +893,7 @@ static void handle_tx_zerocopy(struct vh/* use msg_control to pass vhost zerocopy ubuf info to skb */ if (zcopy_used) { -struct ubuf_info *ubuf; ubuf = nvq->ubuf_info + nvq->upend_idx; - vq->heads[nvq->upend_idx].id =cpu_to_vhost32 (vq, head); vq->heads[nvq->upend_idx].len =VHOST_DMA_IN_PROGRESS ; ubuf->callback = vhost_zerocopy_callback;
@@ -924,7 +923,8 @@ static void handle_tx_zerocopy(struct vh err = sock->ops->sendmsg (sock, &msg, len);if (unlikely (err <0 )) {if (zcopy_used) { -vhost_net_ubuf_put (ubufs); +if (vq->heads[ubuf->desc].len ==VHOST_DMA_IN_PROGRESS ) +vhost_net_ubuf_put (ubufs); nvq->upend_idx = ((unsigned )nvq->upend_idx -1 ) %UIO_MAXIOV ; }
Greg Kroah-Hartman
maintainerPATCH 18/92 net: mvpp2: Fix GoP port 3 Networking Complex Control configurations
In reply to Greg Kroah-HartmanFrom: Stefan Chulski <[email protected]>
[ Upstream commit 2575bc1aa9d52a62342b57a0b7d0a12146cf6aed ]
During GoP port 2 Networking Complex Control mode of operation configurations, also GoP port 3 mode of operation was wrongly set.
Patch removes these configurations.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
@@ -1129,7 +1129,7 @@ static void mvpp22_gop_init_rgmii(structregmap_read (priv->sysctrl_base,GENCONF_CTRL0 , &val);if (port->gop_id ==2 ) - val |=GENCONF_CTRL0_PORT0_RGMII |GENCONF_CTRL0_PORT1_RGMII ; + val |=GENCONF_CTRL0_PORT0_RGMII ;else if (port->gop_id ==3 ) val |=GENCONF_CTRL0_PORT1_RGMII_MII ;regmap_write (priv->sysctrl_base,GENCONF_CTRL0 , val);
Greg Kroah-Hartman
maintainerPATCH 39/92 net: dsa: lantiq_gswip: Enable GSWIP_MII_CFG_EN also for internal PHYs
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit c1a9ec7e5d577a9391660800c806c53287fca991 ]
Enable GSWIP_MII_CFG_EN also for internal PHYs to make traffic flow. Without this the PHY link is detected properly and ethtool statistics for TX are increasing but there's no RX traffic coming in.
--- drivers/net/dsa/lantiq_gswip.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/dsa/lantiq_gswip.c +1 -3
@@ -1522,9 +1522,7 @@ static void gswip_phylink_mac_link_up(st {struct gswip_priv *priv = ds->priv; -/* Enable the xMII interface only for the external PHY */ -if (interface !=PHY_INTERFACE_MODE_INTERNAL ) -gswip_mii_mask_cfg (priv,0 ,GSWIP_MII_CFG_EN , port); +gswip_mii_mask_cfg (priv,0 ,GSWIP_MII_CFG_EN , port); } static void gswip_get_strings(struct dsa_switch *ds, int port, u32 stringset,
Greg Kroah-Hartman
maintainerPATCH 40/92 net: dsa: lantiq_gswip: Fix GSWIP_MII_CFG(p) register access
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 709a3c9dff2a639966ae7d8ba6239d2b8aba036d ]
There is one GSWIP_MII_CFG register for each switch-port except the CPU port. The register offset for the first port is 0x0, 0x02 for the second, 0x04 for the third and so on.
Update the driver to not only restrict the GSWIP_MII_CFG registers to ports 0, 1 and 5. Handle ports 0..5 instead but skip the CPU port. This means we are not overwriting the configuration for the third port (port two since we start counting from zero) with the settings for the sixth port (with number five) anymore.
The GSWIP_MII_PCDU(p) registers are not updated because there's really only three (one for each of the following ports: 0, 1, 5).
--- drivers/net/dsa/lantiq_gswip.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)
drivers/net/dsa/lantiq_gswip.c +6 -17
@@ -92,9 +92,7 @@ GSWIP_MDIO_PHY_FDUP_MASK)/* GSWIP MII Registers */ -#define GSWIP_MII_CFG0 0x00 -#define GSWIP_MII_CFG1 0x02 -#define GSWIP_MII_CFG5 0x04 +#define GSWIP_MII_CFGp (p) (0x2 * (p))#define GSWIP_MII_CFG_EN BIT(14)#define GSWIP_MII_CFG_LDCLKDIS BIT(12)#define GSWIP_MII_CFG_MODE_MIIP 0x0
@@ -392,17 +390,9 @@ static void gswip_mii_mask(struct gswip_static void gswip_mii_mask_cfg (struct gswip_priv *priv,u32 clear,u32 set,int port) { -switch (port) { -case 0 : -gswip_mii_mask (priv, clear, set,GSWIP_MII_CFG0 ); -break ; -case 1 : -gswip_mii_mask (priv, clear, set,GSWIP_MII_CFG1 ); -break ; -case 5 : -gswip_mii_mask (priv, clear, set,GSWIP_MII_CFG5 ); -break ; - } +/* There's no MII_CFG register for the CPU port */ +if (!dsa_is_cpu_port (priv->ds, port)) +gswip_mii_mask (priv, clear, set,GSWIP_MII_CFGp (port)); } static void gswip_mii_mask_pcdu(struct gswip_priv *priv, u32 clear, u32 set,
@@ -806,9 +796,8 @@ static int gswip_setup(struct dsa_switchgswip_mdio_mask (priv,0xff ,0x09 ,GSWIP_MDIO_MDC_CFG1 );/* Disable the xMII link */ -gswip_mii_mask_cfg (priv,GSWIP_MII_CFG_EN ,0 ,0 ); -gswip_mii_mask_cfg (priv,GSWIP_MII_CFG_EN ,0 ,1 ); -gswip_mii_mask_cfg (priv,GSWIP_MII_CFG_EN ,0 ,5 ); +for (i =0 ; i < priv->hw_info->max_ports; i++) +gswip_mii_mask_cfg (priv,GSWIP_MII_CFG_EN ,0 , i);/* enable special tag insertion on cpu port */ gswip_switch_mask(priv, 0, GSWIP_FDMA_PCTRL_STEN,
Greg Kroah-Hartman
maintainerPATCH 37/92 net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
In reply to Greg Kroah-HartmanFrom: Xie He <[email protected]>
[ Upstream commit 1fef73597fa545c35fddc953979013882fbd4e55 ]
ppp_cp_event is called directly or indirectly by ppp_rx with "ppp->lock" held. It may call mod_timer to add a new timer. However, at the same time ppp_timer may be already running and waiting for "ppp->lock". In this case, there's no need for ppp_timer to continue running and it can just exit.
If we let ppp_timer continue running, it may call add_timer. This causes kernel panic because add_timer can't be called with a timer pending. This patch fixes this problem.
--- drivers/net/wan/hdlc_ppp.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wan/hdlc_ppp.c +7 -0
@@ -569,6 +569,13 @@ static void ppp_timer(struct timer_listunsigned long flags;spin_lock_irqsave (&ppp->lock, flags); +/* mod_timer could be called after we entered this function but +* before we got the lock. +*/ +if (timer_pending (&proto->timer)) { +spin_unlock_irqrestore (&ppp->lock, flags); +return ; + }switch (proto->state) {case STOPPING :case REQ_SENT :
Greg Kroah-Hartman
maintainerPATCH 38/92 r8169: work around power-saving bug on some chip versions
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit e80bd76fbf563cc7ed8c9e9f3bbcdf59b0897f69 ]
A user reported failing network with RTL8168dp (a quite rare chip version). Realtek confirmed that few chip versions suffer from a PLL power-down hw bug.
--- drivers/net/ethernet/realtek/r8169_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +4 -2
@@ -3958,7 +3958,8 @@ static void rtl_pll_power_down(struct rt }switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_33: + case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_26: + case RTL_GIGA_MAC_VER_32 ... RTL_GIGA_MAC_VER_33:case RTL_GIGA_MAC_VER_37 :case RTL_GIGA_MAC_VER_39 :case RTL_GIGA_MAC_VER_43 :
@@ -3987,7 +3988,8 @@ static void rtl_pll_power_down(struct rtstatic void rtl_pll_power_up (struct rtl8169_private *tp) {switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_33: + case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_26: + case RTL_GIGA_MAC_VER_32 ... RTL_GIGA_MAC_VER_33:case RTL_GIGA_MAC_VER_37 :case RTL_GIGA_MAC_VER_39 :case RTL_GIGA_MAC_VER_43 :
Greg Kroah-Hartman
maintainerPATCH 9/92 proc: fix lookup in /proc/net subdirectories after setns(2)
In reply to Greg Kroah-HartmanFrom: Alexey Dobriyan <[email protected]>
[ Upstream commit c6c75deda81344c3a95d1d1f606d5cee109e5d54 ]
Commit 1fde6f21d90f ("proc: fix /proc/net/* after setns(2)") only forced revalidation of regular files under /proc/net/
However, /proc/net/ is unusual in the sense of /proc/net/foo handlers take netns pointer from parent directory which is old netns.
Steps to reproduce:
(void)open("/proc/net/sctp/snmp", O_RDONLY);
unshare(CLONE_NEWNET);
int fd = open("/proc/net/sctp/snmp", O_RDONLY);
read(fd, &c, 1);Read will read wrong data from original netns.
Patch forces lookup on every directory under /proc/net .
--- fs/proc/generic.c | 24 ++++++++++++++++++++++-- fs/proc/internal.h | 7 +++++++ fs/proc/proc_net.c | 16 ---------------- include/linux/proc_fs.h | 8 +++++++- 4 files changed, 36 insertions(+), 19 deletions(-)
fs/proc/generic.c +22 -2
@@ -342,6 +342,16 @@ static const struct file_operations proc_dir_operations = { .iterate_shared = proc_readdir, }; +static int proc_net_d_revalidate (struct dentry *dentry,unsigned int flags) +{ +return 0 ; +} + +const struct dentry_operations proc_net_dentry_ops = { + .d_revalidate = proc_net_d_revalidate, + .d_delete = always_delete_dentry, +}; +/* * proc directories can do almost nothing.. */
@@ -464,8 +474,8 @@ struct proc_dir_entry *proc_symlink(const char *name, }EXPORT_SYMBOL (proc_symlink); -struct proc_dir_entry *proc_mkdir_data (const char *name,umode_t mode, -struct proc_dir_entry *parent,void *data) +struct proc_dir_entry *_proc_mkdir (const char *name,umode_t mode, +struct proc_dir_entry *parent,void *data,bool force_lookup) {struct proc_dir_entry *ent;
@@ -477,10 +487,20 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode, ent->data = data; ent->proc_fops = &proc_dir_operations; ent->proc_iops = &proc_dir_inode_operations; +if (force_lookup) { +pde_force_lookup (ent); + } ent =proc_register (parent, ent); }return ent; } +EXPORT_SYMBOL_GPL (_proc_mkdir); + +struct proc_dir_entry *proc_mkdir_data (const char *name,umode_t mode, +struct proc_dir_entry *parent,void *data) +{ +return _proc_mkdir (name, mode, parent, data, false); +}EXPORT_SYMBOL_GPL (proc_mkdir_data); struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
fs/proc/internal.h +7 -0
@@ -299,3 +299,10 @@ extern unsigned long task_statm(struct mm_struct *, unsigned long *, unsigned long *, unsigned long *, unsigned long *);extern void task_mem (struct seq_file *,struct mm_struct *); + +extern const struct dentry_operations proc_net_dentry_ops; +static inline void pde_force_lookup (struct proc_dir_entry *pde) +{ +/* /proc/net/ entries can be changed under us by setns(CLONE_NEWNET) */ + pde->proc_dops = &proc_net_dentry_ops; +}
fs/proc/proc_net.c +0 -16
@@ -39,22 +39,6 @@ static struct net *get_proc_net(const struct inode *inode)return maybe_get_net (PDE_NET (PDE (inode))); } -static int proc_net_d_revalidate (struct dentry *dentry,unsigned int flags) -{ -return 0 ; -} - -static const struct dentry_operations proc_net_dentry_ops = { - .d_revalidate = proc_net_d_revalidate, - .d_delete = always_delete_dentry, -}; - -static void pde_force_lookup (struct proc_dir_entry *pde) -{ -/* /proc/net/ entries can be changed under us by setns(CLONE_NEWNET) */ - pde->proc_dops = &proc_net_dentry_ops; -} -static int seq_open_net (struct inode *inode,struct file *file) {unsigned int state_size =PDE (inode)->state_size;
include/linux/proc_fs.h +7 -1
@@ -21,6 +21,7 @@ extern void proc_flush_task(struct task_struct *);extern struct proc_dir_entry *proc_symlink (const char *,struct proc_dir_entry *,const char *); +struct proc_dir_entry *_proc_mkdir (const char *,umode_t ,struct proc_dir_entry *,void *,bool );extern struct proc_dir_entry *proc_mkdir (const char *,struct proc_dir_entry *);extern struct proc_dir_entry *proc_mkdir_data (const char *,umode_t ,struct proc_dir_entry *,void *);
@@ -99,6 +100,11 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,static inline struct proc_dir_entry *proc_mkdir (const char *name,struct proc_dir_entry *parent) {return NULL ;}static inline struct proc_dir_entry *proc_create_mount_point (const char *name) {return NULL ; } +static inline struct proc_dir_entry *_proc_mkdir (const char *name,umode_t mode, +struct proc_dir_entry *parent,void *data,bool force_lookup) +{ +return NULL ; +}static inline struct proc_dir_entry *proc_mkdir_data (const char *name,umode_t mode,struct proc_dir_entry *parent,void *data) {return NULL ; } static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
@@ -136,7 +142,7 @@ struct net;static inline struct proc_dir_entry *proc_net_mkdir (struct net *net,const char *name,struct proc_dir_entry *parent) { -return proc_mkdir_data (name,0 , parent, net); +return _proc_mkdir (name,0 , parent, net, true); }struct ns_common ;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 20/92 net: ethernet: mvneta: Fix error handling in mvneta_probe
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 58f60329a6be35a5653edb3fd2023ccef9eb9943 ]
When mvneta_port_power_up() fails, we should execute cleanup functions after label err_netdev to avoid memleak.
--- drivers/net/ethernet/marvell/mvneta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvneta.c +1 -1
@@ -4694,7 +4694,7 @@ static int mvneta_probe(struct platform_ err =mvneta_port_power_up (pp, pp->phy_interface);if (err <0 ) {dev_err (&pdev->dev,"can't power up port\n" ); -return err; + goto err_netdev; }/* Armada3700 network controller does not support per-cpu
Greg Kroah-Hartman
maintainerPATCH 22/92 virtio_net: Fix recursive call to cpus_read_lock()
In reply to Greg Kroah-HartmanFrom: Jeff Dike <[email protected]>
[ Upstream commit de33212f768c5d9e2fe791b008cb26f92f0aa31c ]
virtnet_set_channels can recursively call cpus_read_lock if CONFIG_XPS and CONFIG_HOTPLUG are enabled.
The path is:
virtnet_set_channels - calls get_online_cpus(), which is a trivial
wrapper around cpus_read_lock()
netif_set_real_num_tx_queues
netif_reset_xps_queues_gt
netif_reset_xps_queues - calls cpus_read_lock()
This call chain and potential deadlock happens when the number of TX queues is reduced.
This commit the removes netif_set_real_num_[tr]x_queues calls from inside the get/put_online_cpus section, as they don't require that it be held.
--- drivers/net/virtio_net.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/net/virtio_net.c +7 -5
@@ -2072,14 +2072,16 @@ static int virtnet_set_channels(struct nget_online_cpus (); err =_virtnet_set_queues (vi, queue_pairs); -if (!err) { -netif_set_real_num_tx_queues (dev, queue_pairs); -netif_set_real_num_rx_queues (dev, queue_pairs); - -virtnet_set_affinity (vi); +if (err) { +put_online_cpus (); + goto err; } +virtnet_set_affinity (vi);put_online_cpus (); +netif_set_real_num_tx_queues (dev, queue_pairs); +netif_set_real_num_rx_queues (dev, queue_pairs); + err:return err; }
Greg Kroah-Hartman
maintainerPATCH 4/92 scsi: ide: Do not set the RQF_PREEMPT flag for sense requests
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 96d86e6a80a3ab9aff81d12f9f1f2a0da2917d38 ]
RQF_PREEMPT is used for two different purposes in the legacy IDE code:
1. To mark power management requests.
2. To mark requests that should preempt another request. An (old) explanation of that feature is as follows: "The IDE driver in the Linux kernel normally uses a series of busywait delays during its initialization. When the driver executes these busywaits, the kernel does nothing for the duration of the wait. The time spent in these waits could be used for other initialization activities, if they could be run concurrently with these waits.
More specifically, busywait-style delays such as udelay() in module init functions inhibit kernel preemption because the Big Kernel Lock is held, while yielding APIs such as schedule_timeout() allow preemption. This is true because the kernel handles the BKL specially and releases and reacquires it across reschedules allowed by the current thread.
This IDE-preempt specification requires that the driver eliminate these busywaits and replace them with a mechanism that allows other work to proceed while the IDE driver is initializing."
Since I haven't found an implementation of (2), do not set the PREEMPT flag for sense requests. This patch causes sense requests to be postponed while a drive is suspended instead of being submitted to ide_queue_rq().
If it would ever be necessary to restore the IDE PREEMPT functionality, that can be done by introducing a new flag in struct ide_request.
--- drivers/ide/ide-atapi.c | 1 - drivers/ide/ide-io.c | 5 ----- 2 files changed, 6 deletions(-)
drivers/ide/ide-atapi.c +0 -1
@@ -223,7 +223,6 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq) sense_rq->rq_disk = rq->rq_disk; sense_rq->cmd_flags =REQ_OP_DRV_IN ;ide_req (sense_rq)->type =ATA_PRIV_SENSE ; - sense_rq->rq_flags |=RQF_PREEMPT ; req->cmd[0 ] =GPCMD_REQUEST_SENSE ; req->cmd[4 ] = cmd_len;
drivers/ide/ide-io.c +0 -5
@@ -512,11 +512,6 @@ repeat:* above to return us whatever is in the queue. Since we call * ide_do_request() ourselves, we end up taking requests while * the queue is blocked... -* -* We let requests forced at head of queue with ide-preempt -* though. I hope that doesn't happen too much, hopefully not -* unless the subdriver triggers such a thing in its own PM -* state machine. */ if ((drive->dev_flags & IDE_DFLAG_BLOCKED) && ata_pm_request(rq) == 0 &&
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 5/92 scsi: scsi_transport_spi: Set RQF_PM for domain validation commands
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit cfefd9f8240a7b9fdd96fcd54cb029870b6d8d88 ]
Disable runtime power management during domain validation. Since a later patch removes RQF_PREEMPT, set RQF_PM for domain validation commands such that these are executed in the quiesced SCSI device state.
--- drivers/scsi/scsi_transport_spi.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
drivers/scsi/scsi_transport_spi.c +19 -8
@@ -117,12 +117,16 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd, sshdr = &sshdr_tmp;for (i =0 ; i <DV_RETRIES ; i++) { +/* +* The purpose of the RQF_PM flag below is to bypass the +* SDEV_QUIESCE state. +*/ result =scsi_execute (sdev, cmd, dir, buffer, bufflen, sense, sshdr,DV_TIMEOUT ,/* retries */ 1 ,REQ_FAILFAST_DEV |REQ_FAILFAST_TRANSPORT |REQ_FAILFAST_DRIVER , -0 ,NULL ); +RQF_PM ,NULL );if (driver_byte (result) !=DRIVER_SENSE || sshdr->sense_key !=UNIT_ATTENTION )break ;
@@ -1005,23 +1009,26 @@ spi_dv_device(struct scsi_device *sdev)*/ lock_system_sleep (); +if (scsi_autopm_get_device (sdev)) + goto unlock_system_sleep; +if (unlikely (spi_dv_in_progress (starget))) - goto unlock; + goto put_autopm;if (unlikely (scsi_device_get (sdev))) - goto unlock; + goto put_autopm;spi_dv_in_progress (starget) =1 ; buffer =kzalloc (len,GFP_KERNEL );if (unlikely (!buffer)) - goto out_put; + goto put_sdev;/* We need to verify that the actual device will quiesce; the * later target quiesce is just a nice to have */ if (unlikely (scsi_device_quiesce (sdev))) - goto out_free; + goto free_buffer;scsi_target_quiesce (starget);
@@ -1041,12 +1048,16 @@ spi_dv_device(struct scsi_device *sdev)spi_initial_dv (starget) =1 ; - out_free: +free_buffer:kfree (buffer); - out_put: + +put_sdev:spi_dv_in_progress (starget) =0 ;scsi_device_put (sdev); -unlock: +put_autopm: +scsi_autopm_put_device (sdev); + +unlock_system_sleep:unlock_system_sleep (); }EXPORT_SYMBOL (spi_dv_device);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 13/92 net: mvpp2: prs: fix PPPoE with ipv6 packet parse
In reply to Greg Kroah-HartmanFrom: Stefan Chulski <[email protected]>
[ Upstream commit fec6079b2eeab319d9e3d074f54d3b6f623e9701 ]
Current PPPoE+IPv6 entry is jumping to 'next-hdr'
field and not to 'DIP' field as done for IPv4.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c +3 -2
@@ -1680,8 +1680,9 @@ static int mvpp2_prs_pppoe_init(struct mmvpp2_prs_sram_next_lu_set (&pe,MVPP2_PRS_LU_IP6 );mvpp2_prs_sram_ri_update (&pe,MVPP2_PRS_RI_L3_IP6 ,MVPP2_PRS_RI_L3_PROTO_MASK ); -/* Skip eth_type + 4 bytes of IPv6 header */ -mvpp2_prs_sram_shift_set (&pe,MVPP2_ETH_TYPE_LEN +4 , +/* Jump to DIP of IPV6 header */ +mvpp2_prs_sram_shift_set (&pe,MVPP2_ETH_TYPE_LEN +8 + +MVPP2_MAX_L3_ADDR_SIZE ,MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD );/* Set L3 offset */ mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3,
Greg Kroah-Hartman
maintainerPATCH 16/92 ethernet: ucc_geth: set dev->max_mtu to 1518
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit 1385ae5c30f238f81bc6528d897c6d7a0816783f ]
All the buffers and registers are already set up appropriately for an MTU slightly above 1500, so we just need to expose this to the networking stack. AFAICT, there's no need to implement .ndo_change_mtu when the receive buffers are always set up to support the max_mtu.
This fixes several warnings during boot on our mpc8309-board with an embedded mv88e6250 switch:
mv88e6085 mdio@e0102120:10: nonfatal error -34 setting MTU 1500 on port 0
...
mv88e6085 mdio@e0102120:10: nonfatal error -34 setting MTU 1500 on port 4 ucc_geth e0102000.ethernet eth1: error -22 setting MTU to 1504 to include DSA overhead
The last line explains what the DSA stack tries to do: achieving an MTU of 1500 on-the-wire requires that the master netdevice connected to the CPU port supports an MTU of 1500+the tagging overhead.
--- drivers/net/ethernet/freescale/ucc_geth.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/freescale/ucc_geth.c +1 -0
@@ -3890,6 +3890,7 @@ static int ucc_geth_probe(struct platforINIT_WORK (&ugeth->timeout_work, ucc_geth_timeout_work);netif_napi_add (dev, &ugeth->napi, ucc_geth_poll,64 ); dev->mtu =1500 ; + dev->max_mtu =1518 ; ugeth->msg_enable =netif_msg_init (debug.msg_enable,UGETH_MSG_DEFAULT ); ugeth->phy_interface = phy_interface;
Greg Kroah-Hartman
maintainerPATCH 17/92 atm: idt77252: call pci_disable_device() on error path
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 8df66af5c1e5f80562fe728db5ec069b21810144 ]
This error path needs to disable the pci device before returning.
--- drivers/atm/idt77252.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/idt77252.c +1 -1
@@ -3606,7 +3606,7 @@ static int idt77252_init_one(struct pci_if ((err =dma_set_mask_and_coherent (&pcidev->dev,DMA_BIT_MASK (32 )))) {printk ("idt77252: can't enable DMA for PCI device at %s\n" ,pci_name (pcidev)); -return err; + goto err_out_disable_pdev; } card =kzalloc (sizeof (struct idt77252_dev ),GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 1/92 workqueue: Kick a worker based on the actual activation of delayed works
In reply to Greg Kroah-HartmanFrom: Yunfeng Ye <[email protected]>
[ Upstream commit 01341fbd0d8d4e717fc1231cdffe00343088ce0b ]
In realtime scenario, We do not want to have interference on the isolated cpu cores. but when invoking alloc_workqueue() for percpu wq on the housekeeping cpu, it kick a kworker on the isolated cpu.
alloc_workqueue
pwq_adjust_max_active
wake_up_worker
The comment in pwq_adjust_max_active() said:
"Need to kick a worker after thawed or an unbound wq's
max_active is bumped"
So it is unnecessary to kick a kworker for percpu's wq when invoking alloc_workqueue(). this patch only kick a worker based on the actual activation of delayed works.
--- kernel/workqueue.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
kernel/workqueue.c +10 -3
@@ -3718,17 +3718,24 @@ static void pwq_adjust_max_active(struct pool_workqueue *pwq)* is updated and visible. */ if (!freezable || !workqueue_freezing) { +bool kick = false; + pwq->max_active = wq->saved_max_active;while (!list_empty (&pwq->delayed_works) && - pwq->nr_active < pwq->max_active) + pwq->nr_active < pwq->max_active) {pwq_activate_first_delayed (pwq); + kick = true; + }/* * Need to kick a worker after thawed or an unbound wq's -* max_active is bumped. It's a slow path. Do it always. +* max_active is bumped. In realtime scenarios, always kicking a +* worker will cause interference on the isolated cpu cores, so +* let's kick iff work items were activated. */ -wake_up_worker (pwq->pool); +if (kick) +wake_up_worker (pwq->pool); }else { pwq->max_active =0 ; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 2/92 scsi: ufs: Fix wrong print message in dev_err()
In reply to Greg Kroah-HartmanFrom: Bean Huo <[email protected]>
[ Upstream commit 1fa0570002e3f66db9b58c32c60de4183b857a19 ]
Change dev_err() print message from "dme-reset" to "dme_enable" in function ufshcd_dme_enable().
--- drivers/scsi/ufs/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +1 -1
@@ -3593,7 +3593,7 @@ static int ufshcd_dme_enable(struct ufs_hba *hba) ret =ufshcd_send_uic_cmd (hba, &uic_cmd);if (ret)dev_err (hba->dev, -"dme-reset: error code %d\n" , ret); +"dme-enable: error code %d\n" , ret);return ret; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 19/92 ibmvnic: continue fatal error reset after passive init
In reply to Greg Kroah-HartmanFrom: Lijun Pan <[email protected]>
[ Upstream commit 1f45dc22066797479072978feeada0852502e180 ]
Commit f9c6cea0b385 ("ibmvnic: Skip fatal error reset after passive init") says "If the passive
CRQ initialization occurs before the FATAL reset task is processed, the FATAL error reset task would try to access a CRQ message queue that was freed, causing an oops. The problem may be most likely to occur during DLPAR add vNIC with a non-default MTU, because the DLPAR process will automatically issue a change MTU request.
Fix this by not processing fatal error reset if CRQ is passively initialized after client-driven CRQ initialization fails."
Even with this commit, we still see similar kernel crashes. In order to completely solve this problem, we'd better continue the fatal error reset, capture the kernel crash, and try to fix it from that end.
--- drivers/net/ethernet/ibm/ibmvnic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +1 -2
@@ -2152,8 +2152,7 @@ static void __ibmvnic_reset(struct work_ rc =do_hard_reset (adapter, rwi, reset_state);rtnl_unlock (); } - }else if (!(rwi->reset_reason ==VNIC_RESET_FATAL && - adapter->from_passive_init)) { + }else { rc =do_reset (adapter, rwi, reset_state); }kfree (rwi);
Greg Kroah-Hartman
maintainerPATCH 15/92 ethernet: ucc_geth: fix use-after-free in ucc_geth_remove()
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit e925e0cd2a705aaacb0b907bb3691fcac3a973a4 ]
ugeth is the netdiv_priv() part of the netdevice. Accessing the memory pointed to by ugeth (such as done by ucc_geth_memclean() and the two of_node_puts) after free_netdev() is thus use-after-free.
--- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/ucc_geth.c +1 -1
@@ -3935,12 +3935,12 @@ static int ucc_geth_remove(struct platfostruct device_node *np = ofdev->dev.of_node;unregister_netdev (dev); -free_netdev (dev);ucc_geth_memclean (ugeth);if (of_phy_is_fixed_link (np))of_phy_deregister_fixed_link (np);of_node_put (ugeth->ug_info->tbi_node);of_node_put (ugeth->ug_info->phy_node); +free_netdev (dev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 12/92 net: mvpp2: Add TCAM entry to drop flow control pause frames
In reply to Greg Kroah-HartmanFrom: Stefan Chulski <[email protected]>
[ Upstream commit 3f48fab62bb81a7f9d01e9d43c40395fad011dd5 ]
Issue:
Flow control frame used to pause GoP(MAC) was delivered to the CPU and created a load on the CPU. Since XOFF/XON frames are used only by MAC, these frames should be dropped inside MAC.
Fix:
According to 802.3-2012 - IEEE Standard for Ethernet pause frame has unique destination MAC address 01-80-C2-00-00-01.
Add TCAM parser entry to track and drop pause frames by destination MAC.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 33 +++++++++++++++++++++++++ drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h | 2 - 2 files changed, 34 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c +33 -0
@@ -405,6 +405,38 @@ static int mvpp2_prs_tcam_first_free(strreturn -EINVAL ; } +/* Drop flow control pause frames */ +static void mvpp2_prs_drop_fc (struct mvpp2 *priv) +{ +unsigned char da[ETH_ALEN ] = {0x01 ,0x80 ,0xC2 ,0x00 ,0x00 ,0x01 }; +struct mvpp2_prs_entry pe; +unsigned int len; + +memset (&pe,0 ,sizeof (pe)); + +/* For all ports - drop flow control frames */ + pe.index =MVPP2_PE_FC_DROP ; +mvpp2_prs_tcam_lu_set (&pe,MVPP2_PRS_LU_MAC ); + +/* Set match on DA */ + len =ETH_ALEN ; +while (len--) +mvpp2_prs_tcam_data_byte_set (&pe, len, da[len],0xff ); + +mvpp2_prs_sram_ri_update (&pe,MVPP2_PRS_RI_DROP_MASK , +MVPP2_PRS_RI_DROP_MASK ); + +mvpp2_prs_sram_bits_set (&pe,MVPP2_PRS_SRAM_LU_GEN_BIT ,1 ); +mvpp2_prs_sram_next_lu_set (&pe,MVPP2_PRS_LU_FLOWS ); + +/* Mask all ports */ +mvpp2_prs_tcam_port_map_set (&pe,MVPP2_PRS_PORT_MASK ); + +/* Update shadow table and hw entry */ +mvpp2_prs_shadow_set (priv, pe.index,MVPP2_PRS_LU_MAC ); +mvpp2_prs_hw_write (priv, &pe); +} +/* Enable/disable dropping all mac da's */ static void mvpp2_prs_mac_drop_all_set (struct mvpp2 *priv,int port,bool add) {
@@ -1162,6 +1194,7 @@ static void mvpp2_prs_mac_init(struct mvmvpp2_prs_hw_write (priv, &pe);/* Create dummy entries for drop all and promiscuous modes */ +mvpp2_prs_drop_fc (priv);mvpp2_prs_mac_drop_all_set (priv,0 , false);mvpp2_prs_mac_promisc_set (priv,0 ,MVPP2_PRS_L2_UNI_CAST , false);mvpp2_prs_mac_promisc_set (priv,0 ,MVPP2_PRS_L2_MULTI_CAST , false);
drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h +1 -1
@@ -129,7 +129,7 @@#define MVPP2_PE_VID_EDSA_FLTR_DEFAULT (MVPP2_PRS_TCAM_SRAM_SIZE - 7)#define MVPP2_PE_VLAN_DBL (MVPP2_PRS_TCAM_SRAM_SIZE - 6)#define MVPP2_PE_VLAN_NONE (MVPP2_PRS_TCAM_SRAM_SIZE - 5) -/* reserved */ +#define MVPP2_PE_FC_DROP (MVPP2_PRS_TCAM_SRAM_SIZE - 4)#define MVPP2_PE_MAC_MC_PROMISCUOUS (MVPP2_PRS_TCAM_SRAM_SIZE - 3)#define MVPP2_PE_MAC_UC_PROMISCUOUS (MVPP2_PRS_TCAM_SRAM_SIZE - 2)#define MVPP2_PE_MAC_NON_PROMISCUOUS (MVPP2_PRS_TCAM_SRAM_SIZE - 1)
Greg Kroah-Hartman
maintainerPATCH 10/92 i40e: Fix Error I40E_AQ_RC_EINVAL when removing VFs
In reply to Greg Kroah-HartmanFrom: Sylwester Dziedziuch <[email protected]>
[ Upstream commit 3ac874fa84d1baaf0c0175f2a1499f5d88d528b2 ]
When removing VFs for PF added to bridge there was an error I40E_AQ_RC_EINVAL. It was caused by not properly resetting and reinitializing PF when adding/removing VFs. Changed how reset is performed when adding/removing VFs to properly reinitialize PFs VSI.
--- drivers/net/ethernet/intel/i40e/i40e.h | 3 +++ drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++++++++++ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +3 -0
@@ -129,6 +129,7 @@ enum i40e_state_t { __I40E_RESET_INTR_RECEIVED, __I40E_REINIT_REQUESTED, __I40E_PF_RESET_REQUESTED, + __I40E_PF_RESET_AND_REBUILD_REQUESTED, __I40E_CORE_RESET_REQUESTED, __I40E_GLOBAL_RESET_REQUESTED, __I40E_EMP_RESET_INTR_RECEIVED,
@@ -156,6 +157,8 @@ enum i40e_state_t { };#define I40E_PF_RESET_FLAG BIT_ULL(__I40E_PF_RESET_REQUESTED) +#define I40E_PF_RESET_AND_REBUILD_FLAG \ + BIT_ULL(__I40E_PF_RESET_AND_REBUILD_REQUESTED)/* VSI state flags */ enum i40e_vsi_state_t {
drivers/net/ethernet/intel/i40e/i40e_main.c +10 -0
@@ -44,6 +44,8 @@ static int i40e_setup_misc_vector(structstatic void i40e_determine_queue_usage (struct i40e_pf *pf);static int i40e_setup_pf_filter_control (struct i40e_pf *pf);static void i40e_prep_for_reset (struct i40e_pf *pf,bool lock_acquired); +static void i40e_reset_and_rebuild (struct i40e_pf *pf,bool reinit, +bool lock_acquired);static int i40e_reset (struct i40e_pf *pf);static void i40e_rebuild (struct i40e_pf *pf,bool reinit,bool lock_acquired);static int i40e_setup_misc_vector_for_recovery_mode (struct i40e_pf *pf);
@@ -8484,6 +8486,14 @@ void i40e_do_reset(struct i40e_pf *pf, u "FW LLDP is disabled\n" : "FW LLDP is enabled\n"); + }else if (reset_flags &I40E_PF_RESET_AND_REBUILD_FLAG ) { +/* Request a PF Reset +* +* Resets PF and reinitializes PFs VSI. +*/ +i40e_prep_for_reset (pf, lock_acquired); +i40e_reset_and_rebuild (pf, true, lock_acquired); + }else if (reset_flags &BIT_ULL (__I40E_REINIT_REQUESTED)) {int v;
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +2 -2
@@ -1704,7 +1704,7 @@ int i40e_pci_sriov_configure(struct pci_if (num_vfs) {if (!(pf->flags &I40E_FLAG_VEB_MODE_ENABLED )) { pf->flags |=I40E_FLAG_VEB_MODE_ENABLED ; -i40e_do_reset_safe (pf,I40E_PF_RESET_FLAG ); +i40e_do_reset_safe (pf,I40E_PF_RESET_AND_REBUILD_FLAG ); } ret =i40e_pci_sriov_enable (pdev, num_vfs); goto sriov_configure_out;
@@ -1713,7 +1713,7 @@ int i40e_pci_sriov_configure(struct pci_if (!pci_vfs_assigned (pf->pdev)) {i40e_free_vfs (pf); pf->flags &= ~I40E_FLAG_VEB_MODE_ENABLED ; -i40e_do_reset_safe (pf,I40E_PF_RESET_FLAG ); +i40e_do_reset_safe (pf,I40E_PF_RESET_AND_REBUILD_FLAG ); }else {dev_warn (&pdev->dev,"Unable to free VFs because some are assigned to VMs.\n" ); ret = -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 11/92 iavf: fix double-release of rtnl_lock
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit f1340265726e0edf8a8cef28e665b28ad6302ce9 ]
This code does not jump to exit on an error in iavf_lan_add_device(), so the rtnl_unlock() from the normal path will follow.
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +1 -3
@@ -1844,11 +1844,9 @@ static int iavf_init_get_resources(strucnetif_tx_stop_all_queues (netdev);if (CLIENT_ALLOWED (adapter)) { err =iavf_lan_add_device (adapter); -if (err) { -rtnl_unlock (); +if (err)dev_info (&pdev->dev,"Failed to add VF to client API service list: %d\n" , err); - } }dev_info (&pdev->dev,"MAC address: %pM\n" , adapter->hw.mac.addr);if (netdev->features &NETIF_F_GRO )
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.89 release. There are 92 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 Wed, 13 Jan 2021 13:00:19 +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/v5.x/stable-review/patch-5.4.89-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.4:
12 builds: 12 pass, 0 fail
26 boots: 26 pass, 0 fail
56 tests: 56 pass, 0 failLinux version: 5.4.89-rc1-gcdbc5a73c7f4
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.89 release. There are 92 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 Wed, 13 Jan 2021 13:00:19 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 157 fail: 0 Qemu test results: total: 427 pass: 427 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.89 release. There are 92 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 Wed, 13 Jan 2021 13:00:19 +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/v5.x/stable-review/patch-5.4.89-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.89 release. There are 92 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 Wed, 13 Jan 2021 13:00:19 +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/v5.x/stable-review/patch-5.4.89-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.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: 5.4.89-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.4.y
git commit: cdbc5a73c7f4b2b8796ceea91083a4ad1ebfd113
git describe: v5.4.88-93-gcdbc5a73c7f4
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.4.y/build/v5.4.88-93-gcdbc5a73c7f4
No regressions (compared to build v5.4.88)
No fixes (compared to build v5.4.88)
Ran 49720 total tests in the following environments and test suites.
Environments
--------------
- arc
- arm
- arm64
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- mips
- nxp-ls2088
- parisc
- powerpc
- qemu-arm-clang
- qemu-arm64-clang
- qemu-arm64-kasan
- qemu-x86_64-clang
- qemu-x86_64-kasan
- qemu-x86_64-kcsan
- qemu_arm
- qemu_arm64
- qemu_arm64-compat
- qemu_i386
- qemu_x86_64
- qemu_x86_64-compat
- riscv
- s390
- sh
- sparc
- x15
- x86
- x86-kasan
Test Suites
-----------
* build
* linux-log-parser
* install-android-platform-tools-r2600
* kselftest
* kvm-unit-tests
* ltp-controllers-tests
* ltp-cve-tests
* ltp-fs-tests
* ltp-hugetlb-tests
* ltp-ipc-tests
* ltp-mm-tests
* ltp-tracing-tests
* perf
* fwts
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-io-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* network-basic-tests
* v4l2-compliance
* ltp-commands-tests
* ltp-math-tests
* ltp-open-posix-tests
* ltp-syscalls-tests
* rcutorture
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org