4.9.207-stable review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 115/199 virtio-balloon: fix managed page counts when migrating pages between zones
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
commit 63341ab03706e11a31e3dd8ccc0fbc9beaf723f0 upstream.
In case we have to migrate a ballon page to a newpage of another zone, the managed page count of both zones is wrong. Paired with memory offlining (which will adjust the managed page count), we can trigger kernel crashes and all kinds of different symptoms.
One way to reproduce:
1. Start a QEMU guest with 4GB, no NUMA
2. Hotplug a 1GB DIMM and online the memory to ZONE_NORMAL
3. Inflate the balloon to 1GB
4. Unplug the DIMM (be quick, otherwise unmovable data ends up on it)
5. Observe /proc/zoneinfo
Node 0, zone Normal
pages free 16810
min 24848885473806
low 18471592959183339
high 36918337032892872
spanned 262144
present 262144
managed 18446744073709533486
6. Do anything that requires some memory (e.g., inflate the balloon some
more). The OOM goes crazy and the system crashes
[ 238.324946] Out of memory: Killed process 537 (login) total-vm:27584kB, anon-rss:860kB, file-rss:0kB, shmem-rss:00
[ 238.338585] systemd invoked oom-killer: gfp_mask=0x100cca(GFP_HIGHUSER_MOVABLE), order=0, oom_score_adj=0
[ 238.339420] CPU: 0 PID: 1 Comm: systemd Tainted: G D W 5.4.0-next-20191204+ #75
[ 238.340139] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu4
[ 238.341121] Call Trace:
[ 238.341337] dump_stack+0x8f/0xd0
[ 238.341630] dump_header+0x61/0x5ea
[ 238.341942] oom_kill_process.cold+0xb/0x10
[ 238.342299] out_of_memory+0x24d/0x5a0
[ 238.342625] __alloc_pages_slowpath+0xd12/0x1020
[ 238.343024] __alloc_pages_nodemask+0x391/0x410
[ 238.343407] pagecache_get_page+0xc3/0x3a0
[ 238.343757] filemap_fault+0x804/0xc30
[ 238.344083] ? ext4_filemap_fault+0x28/0x42
[ 238.344444] ext4_filemap_fault+0x30/0x42
[ 238.344789] __do_fault+0x37/0x1a0
[ 238.345087] __handle_mm_fault+0x104d/0x1ab0
[ 238.345450] handle_mm_fault+0x169/0x360
[ 238.345790] do_user_addr_fault+0x20d/0x490
[ 238.346154] do_page_fault+0x31/0x210
[ 238.346468] async_page_fault+0x43/0x50
[ 238.346797] RIP: 0033:0x7f47eba4197e
[ 238.347110] Code: Bad RIP value.
[ 238.347387] RSP: 002b:00007ffd7c0c1890 EFLAGS: 00010293
[ 238.347834] RAX: 0000000000000002 RBX: 000055d196a20a20 RCX: 00007f47eba4197e
[ 238.348437] RDX: 0000000000000033 RSI: 00007ffd7c0c18c0 RDI: 0000000000000004
[ 238.349047] RBP: 00007ffd7c0c1c20 R08: 0000000000000000 R09: 0000000000000033
[ 238.349660] R10: 00000000ffffffff R11: 0000000000000293 R12: 0000000000000001
[ 238.350261] R13: ffffffffffffffff R14: 0000000000000000 R15: 00007ffd7c0c18c0
[ 238.350878] Mem-Info:
[ 238.351085] active_anon:3121 inactive_anon:51 isolated_anon:0
[ 238.351085] active_file:12 inactive_file:7 isolated_file:0
[ 238.351085] unevictable:0 dirty:0 writeback:0 unstable:0
[ 238.351085] slab_reclaimable:5565 slab_unreclaimable:10170
[ 238.351085] mapped:3 shmem:111 pagetables:155 bounce:0
[ 238.351085] free:720717 free_pcp:2 free_cma:0
[ 238.353757] Node 0 active_anon:12484kB inactive_anon:204kB active_file:48kB inactive_file:28kB unevictable:0kB iss
[ 238.355979] Node 0 DMA free:11556kB min:36kB low:48kB high:60kB reserved_highatomic:0KB active_anon:152kB inactivB
[ 238.358345] lowmem_reserve[]: 0 2955 2884 2884 2884
[ 238.358761] Node 0 DMA32 free:2677864kB min:7004kB low:10028kB high:13052kB reserved_highatomic:0KB active_anon:0B
[ 238.361202] lowmem_reserve[]: 0 0 72057594037927865 72057594037927865 72057594037927865
[ 238.361888] Node 0 Normal free:193448kB min:99395541895224kB low:73886371836733356kB high:147673348131571488kB reB
[ 238.364765] lowmem_reserve[]: 0 0 0 0 0
[ 238.365101] Node 0 DMA: 7*4kB (U) 5*8kB (UE) 6*16kB (UME) 2*32kB (UM) 1*64kB (U) 2*128kB (UE) 3*256kB (UME) 2*512B
[ 238.366379] Node 0 DMA32: 0*4kB 1*8kB (U) 2*16kB (UM) 2*32kB (UM) 2*64kB (UM) 1*128kB (U) 1*256kB (U) 1*512kB (U)B
[ 238.367654] Node 0 Normal: 1985*4kB (UME) 1321*8kB (UME) 844*16kB (UME) 524*32kB (UME) 300*64kB (UME) 138*128kB (B
[ 238.369184] Node 0 hugepages_total=0 hugepages_free=0 hugepages_surp=0 hugepages_size=2048kB
[ 238.369915] 130 total pagecache pages
[ 238.370241] 0 pages in swap cache
[ 238.370533] Swap cache stats: add 0, delete 0, find 0/0
[ 238.370981] Free swap = 0kB
[ 238.371239] Total swap = 0kB
[ 238.371488] 1048445 pages RAM
[ 238.371756] 0 pages HighMem/MovableOnly
[ 238.372090] 306992 pages reserved
[ 238.372376] 0 pages cma reserved
[ 238.372661] 0 pages hwpoisonedIn another instance (older kernel), I was able to observe this (negative page count :/):
[ 180.896971] Offlined Pages 32768 [ 182.667462] Offlined Pages 32768 [ 184.408117] Offlined Pages 32768 [ 186.026321] Offlined Pages 32768 [ 187.684861] Offlined Pages 32768 [ 189.227013] Offlined Pages 32768 [ 190.830303] Offlined Pages 32768 [ 190.833071] Built 1 zonelists, mobility grouping on. Total pages: -36920272750453009
In another instance (older kernel), I was no longer able to start any process:
[root@vm ~]# [ 214.348068] Offlined Pages 32768
[ 215.973009] Offlined Pages 32768 cat /proc/meminfo -bash: fork: Cannot allocate memory [root@vm ~]# cat /proc/meminfo -bash: fork: Cannot allocate memory
Fix it by properly adjusting the managed page count when migrating if the zone changed. The managed page count of the zones now looks after unplug of the DIMM (and after deflating the balloon) just like before inflating the balloon (and plugging+onlining the DIMM).
We'll temporarily modify the totalram page count. If this ever becomes a problem, we can fine tune by providing helpers that don't touch the totalram pages (e.g., adjust_zone_managed_page_count()).
Please note that fixing up the managed page count is only necessary when we adjusted the managed page count when inflating - only if we don't have VIRTIO_BALLOON_F_DEFLATE_ON_OOM. With that feature, the managed page count is not touched when inflating/deflating.
--- drivers/virtio/virtio_balloon.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/virtio/virtio_balloon.c +11 -0
@@ -482,6 +482,17 @@ static int virtballoon_migratepage(strucget_page (newpage);/* balloon reference */ +/* +* When we migrate a page to a different zone and adjusted the +* managed page count when inflating, we have to fixup the count of +* both involved zones. +*/ +if (!virtio_has_feature (vb->vdev,VIRTIO_BALLOON_F_DEFLATE_ON_OOM ) && +page_zone (page) !=page_zone (newpage)) { +adjust_managed_page_count (page,1 ); +adjust_managed_page_count (newpage,-1 ); + } +/* balloon's page migration 1st step -- inflate "newpage" */ spin_lock_irqsave (&vb_dev_info->pages_lock, flags);balloon_page_insert (vb_dev_info, newpage);
Greg Kroah-Hartman
maintainerPATCH 1/199 arm64: tegra: Fix active-low warning for Jetson TX1 regulator
In reply to Greg Kroah-HartmanFrom: Jon Hunter <[email protected]>
commit 1e5e929c009559bd7e898ac8e17a5d01037cb057 upstream.
Commit 34993594181d ("arm64: tegra: Enable HDMI on Jetson TX1") added a regulator for HDMI on the Jetson TX1 platform. This regulator has an active high enable, but the GPIO specifier for enabling the regulator incorrectly defines it as active-low. This causes the following warning to occur on boot ...
WARNING KERN regulator@10 GPIO handle specifies active low - ignored
The fixed-regulator binding does not use the active-low flag from the gpio specifier and purely relies of the presence of the 'enable-active-high' property to determine if it is active high or low (if this property is omitted). Fix this warning by setting the GPIO to active-high in the GPIO specifier which aligns with the presense of the 'enable-active-high' property.
--- arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +1 -1
@@ -1583,7 +1583,7 @@ regulator-name = "VDD_HDMI_5V0"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&exp1 12 GPIO_ACTIVE_LOW>; + gpio = <&exp1 12 GPIO_ACTIVE_HIGH>; enable-active-high; vin-supply = <&vdd_5v0_sys>; };
Greg Kroah-Hartman
maintainerPATCH 10/199 exportfs_decode_fh(): negative pinned may become positive without the parent locked
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
[ Upstream commit a2ece088882666e1dc7113744ac912eb161e3f87 ]
--- fs/exportfs/expfs.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
fs/exportfs/expfs.c +19 -12
@@ -506,26 +506,33 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,* inode is actually connected to the parent. */ err =exportfs_get_name (mnt, target_dir, nbuf, result); -if (!err) { -inode_lock (target_dir->d_inode); - nresult =lookup_one_len (nbuf, target_dir, -strlen (nbuf)); -inode_unlock (target_dir->d_inode); -if (!IS_ERR (nresult)) { -if (nresult->d_inode) { -dput (result); - result = nresult; - }else -dput (nresult); - } +if (err) { +dput (target_dir); + goto err_result; } +inode_lock (target_dir->d_inode); + nresult =lookup_one_len (nbuf, target_dir,strlen (nbuf)); +if (!IS_ERR (nresult)) { +if (unlikely (nresult->d_inode != result->d_inode)) { +dput (nresult); + nresult =ERR_PTR (-ESTALE ); + } + } +inode_unlock (target_dir->d_inode);/* * At this point we are done with the parent, but it's pinned * by the child dentry anyway. */ dput (target_dir); +if (IS_ERR (nresult)) { + err =PTR_ERR (nresult); + goto err_result; + } +dput (result); + result = nresult; +/* * And finally make sure the dentry is actually acceptable * to NFSD.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/199 audit_get_nd(): dont unlock parent too early
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
[ Upstream commit 69924b89687a2923e88cc42144aea27868913d0e ]
if the child has been negative and just went positive under us, we want coherent d_is_positive() and ->d_inode. Don't unlock the parent until we'd done that work...
--- kernel/audit_watch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/audit_watch.c +1 -1
@@ -365,12 +365,12 @@ static int audit_get_nd(struct audit_watch *watch, struct path *parent)struct dentry *d =kern_path_locked (watch->path, parent);if (IS_ERR (d))return PTR_ERR (d); -inode_unlock (d_backing_inode (parent->dentry));if (d_is_positive (d)) {/* update watch filter fields */ watch->dev = d->d_sb->s_dev; watch->ino =d_backing_inode (d)->i_ino; } +inode_unlock (d_backing_inode (parent->dentry));dput (d);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/199 Input: cyttsp4_core - fix use after free bug
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit 79aae6acbef16f720a7949f8fc6ac69816c79d62 ]
The device md->input is used after it is released. Setting the device data to NULL is unnecessary as the device is never used again. Instead, md->input should be assigned NULL to avoid accessing the freed memory accidently. Besides, checking md->si against NULL is superfluous as it points to a variable address, which cannot be NULL.
--- drivers/input/touchscreen/cyttsp4_core.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/input/touchscreen/cyttsp4_core.c +0 -7
@@ -1972,11 +1972,6 @@ static int cyttsp4_mt_probe(struct cyttsp4 *cd)/* get sysinfo */ md->si = &cd->sysinfo; -if (!md->si) { -dev_err (dev,"%s: Fail get sysinfo pointer from core p=%p\n" , - __func__, md->si); - goto error_get_sysinfo; - } rc =cyttsp4_setup_input_device (cd);if (rc)
@@ -1986,8 +1981,6 @@ static int cyttsp4_mt_probe(struct cyttsp4 *cd) error_init_input:input_free_device (md->input); -error_get_sysinfo: -input_set_drvdata (md->input,NULL ); error_alloc_failed:dev_err (dev,"%s failed.\n" , __func__);return rc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/199 ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed()
In reply to Greg Kroah-HartmanFrom: paulhsia <[email protected]>
[ Upstream commit f5cdc9d4003a2f66ea57b3edd3e04acc2b1a4439 ]
If the nullity check for substream->runtime is outside of the lock region, it is possible to have a null runtime in the critical section if snd_pcm_detach_substream is called right before the lock.
--- sound/core/pcm_lib.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/core/pcm_lib.c +6 -2
@@ -1877,11 +1877,14 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream)struct snd_pcm_runtime *runtime;unsigned long flags; -if (PCM_RUNTIME_CHECK (substream)) +if (snd_BUG_ON (!substream))return ; - runtime = substream->runtime;snd_pcm_stream_lock_irqsave (substream, flags); +if (PCM_RUNTIME_CHECK (substream)) + goto _unlock; + runtime = substream->runtime; +if (!snd_pcm_running (substream) ||snd_pcm_update_hw_ptr0 (substream,1 ) <0 ) goto _end;
@@ -1892,6 +1895,7 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream)#endif _end:kill_fasync (&runtime->fasync,SIGIO ,POLL_IN ); + _unlock:snd_pcm_stream_unlock_irqrestore (substream, flags); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/199 net: ep93xx_eth: fix mismatch of request_mem_region in remove
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 3df70afe8d33f4977d0e0891bdcfb639320b5257 ]
The driver calls release_resource in remove to match request_mem_region in probe, which is incorrect.
Fix it by using the right one, release_mem_region.
--- drivers/net/ethernet/cirrus/ep93xx_eth.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/cirrus/ep93xx_eth.c +3 -2
@@ -780,6 +780,7 @@ static int ep93xx_eth_remove(struct platform_device *pdev) {struct net_device *dev;struct ep93xx_priv *ep; +struct resource *mem; dev =platform_get_drvdata (pdev);if (dev ==NULL )
@@ -795,8 +796,8 @@ static int ep93xx_eth_remove(struct platform_device *pdev)iounmap (ep->base_addr);if (ep->res !=NULL ) { -release_resource (ep->res); -kfree (ep->res); + mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +release_mem_region (mem->start,resource_size (mem)); }free_netdev (dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/199 serial: core: Allow processing sysrq at port unlock time
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit d6e1935819db0c91ce4a5af82466f3ab50d17346 ]
Right now serial drivers process sysrq keys deep in their character receiving code. This means that they've already grabbed their port->lock spinlock. This can end up getting in the way if we've go to do serial stuff (especially kgdb) in response to the sysrq.
Serial drivers have various hacks in them to handle this. Looking at '8250_port.c' you can see that the console_write() skips locking if we're in the sysrq handler. Looking at 'msm_serial.c' you can see that the port lock is dropped around uart_handle_sysrq_char().
It turns out that these hacks aren't exactly perfect. If you have lockdep turned on and use something like the 8250_port hack you'll get a splat that looks like:
WARNING: possible circular locking dependency detected [...] is trying to acquire lock:
... (console_owner){-.-.}, at: console_unlock+0x2e0/0x5e4
but task is already holding lock:
... (&port_lock_key){-.-.}, at: serial8250_handle_irq+0x30/0xe4
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&port_lock_key){-.-.}:
_raw_spin_lock_irqsave+0x58/0x70
serial8250_console_write+0xa8/0x250
univ8250_console_write+0x40/0x4c
console_unlock+0x528/0x5e4
register_console+0x2c4/0x3b0
uart_add_one_port+0x350/0x478
serial8250_register_8250_port+0x350/0x3a8
dw8250_probe+0x67c/0x754
platform_drv_probe+0x58/0xa4
really_probe+0x150/0x294
driver_probe_device+0xac/0xe8
__driver_attach+0x98/0xd0
bus_for_each_dev+0x84/0xc8
driver_attach+0x2c/0x34
bus_add_driver+0xf0/0x1ec
driver_register+0xb4/0x100
__platform_driver_register+0x60/0x6c
dw8250_platform_driver_init+0x20/0x28
...-> #0 (console_owner){-.-.}:
lock_acquire+0x1e8/0x214
console_unlock+0x35c/0x5e4
vprintk_emit+0x230/0x274
vprintk_default+0x7c/0x84
vprintk_func+0x190/0x1bc
printk+0x80/0xa0
__handle_sysrq+0x104/0x21c
handle_sysrq+0x30/0x3c
serial8250_read_char+0x15c/0x18c
serial8250_rx_chars+0x34/0x74
serial8250_handle_irq+0x9c/0xe4
dw8250_handle_irq+0x98/0xcc
serial8250_interrupt+0x50/0xe8
...other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&port_lock_key);
lock(console_owner);
lock(&port_lock_key);
lock(console_owner);*** DEADLOCK ***
The hack used in 'msm_serial.c' doesn't cause the above splats but it seems a bit ugly to unlock / lock our spinlock deep in our irq handler.
It seems like we could defer processing the sysrq until the end of the interrupt handler right after we've unlocked the port. With this scheme if a whole batch of sysrq characters comes in one irq then we won't handle them all, but that seems like it should be a fine compromise.
--- include/linux/serial_core.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)
include/linux/serial_core.h +36 -1
@@ -161,6 +161,7 @@ struct uart_port {struct console *cons;/* struct console, if any */ #if defined(CONFIG_SERIAL_CORE_CONSOLE ) || defined(SUPPORT_SYSRQ )unsigned long sysrq;/* sysrq timeout */ +unsigned int sysrq_ch;/* char for sysrq */ #endif /* flags must be updated while holding port mutex */
@@ -470,8 +471,42 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch) }return 0 ; } +static inline int +uart_prepare_sysrq_char (struct uart_port *port,unsigned int ch) +{ +if (port->sysrq) { +if (ch &&time_before (jiffies, port->sysrq)) { + port->sysrq_ch = ch; + port->sysrq =0 ; +return 1 ; + } + port->sysrq =0 ; + } +return 0 ; +} +static inline void +uart_unlock_and_check_sysrq (struct uart_port *port,unsigned long irqflags) +{ +int sysrq_ch; + + sysrq_ch = port->sysrq_ch; + port->sysrq_ch =0 ; + +spin_unlock_irqrestore (&port->lock, irqflags); + +if (sysrq_ch) +handle_sysrq (sysrq_ch); +}#else -#define uart_handle_sysrq_char (port,ch) ({ (void)port; 0; }) +static inline int +uart_handle_sysrq_char (struct uart_port *port,unsigned int ch) {return 0 ; } +static inline int +uart_prepare_sysrq_char (struct uart_port *port,unsigned int ch) {return 0 ; } +static inline void +uart_unlock_and_check_sysrq (struct uart_port *port,unsigned long irqflags) +{ +spin_unlock_irqrestore (&port->lock, irqflags); +}#endif /*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/199 cxgb4vf: fix memleak in mac_hlist initialization
In reply to Greg Kroah-HartmanFrom: Arjun Vynipadath <[email protected]>
[ Upstream commit 24357e06ba511ad874d664d39475dbb01c1ca450 ]
mac_hlist was initialized during adapter_up, which will be called every time a vf device is first brought up, or every time when device is brought up again after bringing all devices down. This means our state of previous list is lost, causing a memleak if entries are present in the list. To fix that, move list init to the condition that performs initial one time adapter setup.
--- drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +4 -2
@@ -718,6 +718,10 @@ static int adapter_up(struct adapter *adapter)if (adapter->flags &USING_MSIX )name_msix_vecs (adapter); + +/* Initialize hash mac addr list*/ +INIT_LIST_HEAD (&adapter->mac_hlist); + adapter->flags |=FULL_INIT_DONE ; }
@@ -743,8 +747,6 @@ static int adapter_up(struct adapter *adapter)enable_rx (adapter);t4vf_sge_start (adapter); -/* Initialize hash mac addr list*/ -INIT_LIST_HEAD (&adapter->mac_hlist);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/199 iwlwifi: mvm: Send non offchannel traffic via AP sta
In reply to Greg Kroah-HartmanFrom: Andrei Otcheretianski <[email protected]>
[ Upstream commit dc1aca22f8f38b7e2ad7b118db87404d11e68771 ]
TDLS discovery response frame is a unicast direct frame to the peer. Since we don't have a STA for this peer, this frame goes through iwl_tx_skb_non_sta(). As the result aux_sta and some completely arbitrary queue would be selected for this frame, resulting in a queue hang. Fix that by sending such frames through AP sta instead.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +15 -0
@@ -805,6 +805,21 @@ static void iwl_mvm_mac_tx(struct ieee80211_hw *hw, !ieee80211_is_action(hdr->frame_control))) sta =NULL ; +/* If there is no sta, and it's not offchannel - send through AP */ +if (info->control.vif->type ==NL80211_IFTYPE_STATION && + info->hw_queue !=IWL_MVM_OFFCHANNEL_QUEUE && !sta) { +struct iwl_mvm_vif *mvmvif = +iwl_mvm_vif_from_mac80211 (info->control.vif); +u8 ap_sta_id =READ_ONCE (mvmvif->ap_sta_id); + +if (ap_sta_id <IWL_MVM_STATION_COUNT ) { +/* mac80211 holds rcu read lock */ + sta =rcu_dereference (mvm->fw_id_to_mac_id[ap_sta_id]); +if (IS_ERR_OR_NULL (sta)) + goto drop; + } + } +if (sta) {if (iwl_mvm_defer_tx (mvm, sta, skb))return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/199 ARM: 8813/1: Make aligned 2-byte getuser()/putuser() atomic on ARMv6+
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
[ Upstream commit 344eb5539abf3e0b6ce22568c03e86450073e097 ]
getuser() and putuser() (and there underscored variants) use two strb[t]/ldrb[t] instructions when they are asked to get/put 16-bits. This means that the read/write is not atomic even when performed to a 16-bit-aligned address.
This leads to problems with vhost: vhost uses __getuser() to read the vring's 16-bit avail.index field, and if it happens to observe a partial update of the index, wrong descriptors will be used which will lead to a breakdown of the virtio communication. A similar problem exists for __putuser() which is used to write to the vring's used.index field.
The reason these functions use strb[t]/ldrb[t] is because strht/ldrht instructions did not exist until ARMv6T2/ARMv7. So we should be easily able to fix this on ARMv7. Also, since all ARMv6 processors also don't actually use the unprivileged instructions anymore for uaccess (since CONFIG_CPU_USE_DOMAINS is not used) we can easily fix them too.
--- arch/arm/include/asm/uaccess.h | 18 ++++++++++++++++++ arch/arm/lib/getuser.S | 11 +++++++++++ arch/arm/lib/putuser.S | 20 ++++++++++---------- 3 files changed, 39 insertions(+), 10 deletions(-)
arch/arm/include/asm/uaccess.h +18 -0
@@ -379,6 +379,13 @@ do { \#define __get_user_asm_byte (x, addr, err) \ __get_user_asm(x, addr, err, ldrb) +#if __LINUX_ARM_ARCH__ >=6 + +#define __get_user_asm_half (x, addr, err) \ + __get_user_asm(x, addr, err, ldrh) + +#else +#ifndef __ARMEB__#define __get_user_asm_half (x, __gu_addr, err) \ ({ \
@@ -397,6 +404,8 @@ do { \ })#endif +#endif /* __LINUX_ARM_ARCH__ >= 6 */ +#define __get_user_asm_word (x, addr, err) \ __get_user_asm(x, addr, err, ldr)#endif
@@ -472,6 +481,13 @@ do { \#define __put_user_asm_byte (x, __pu_addr, err) \ __put_user_asm(x, __pu_addr, err, strb) +#if __LINUX_ARM_ARCH__ >=6 + +#define __put_user_asm_half (x, __pu_addr, err) \ + __put_user_asm(x, __pu_addr, err, strh) + +#else +#ifndef __ARMEB__#define __put_user_asm_half (x, __pu_addr, err) \ ({ \
@@ -488,6 +504,8 @@ do { \ })#endif +#endif /* __LINUX_ARM_ARCH__ >= 6 */ +#define __put_user_asm_word (x, __pu_addr, err) \ __put_user_asm(x, __pu_addr, err, str)
arch/arm/lib/getuser.S +11 -0
@@ -42,6 +42,12 @@ _ASM_NOKPROBE(__get_user_1) ENTRY(__get_user_2) check_uaccess r0, 2, r1, r2, __get_user_bad +#if __LINUX_ARM_ARCH__ >= 6 + +2: TUSER(ldrh) r2, [r0] + +#else + #ifdef CONFIG_CPU_USE_DOMAINS rb .req ip 2: ldrbt r2, [r0], #1
@@ -56,6 +62,9 @@ rb .req r0 #else orr r2, rb, r2, lsl #8 #endif + +#endif /* __LINUX_ARM_ARCH__ >= 6 */ + mov r0, #0 ret lr ENDPROC(__get_user_2)
@@ -145,7 +154,9 @@ _ASM_NOKPROBE(__get_user_bad8) .pushsection __ex_table, "a" .long 1b, __get_user_bad .long 2b, __get_user_bad +#if __LINUX_ARM_ARCH__ < 6 .long 3b, __get_user_bad +#endif .long 4b, __get_user_bad .long 5b, __get_user_bad8 .long 6b, __get_user_bad8
arch/arm/lib/putuser.S +10 -10
@@ -41,16 +41,13 @@ ENDPROC(__put_user_1) ENTRY(__put_user_2) check_uaccess r0, 2, r1, ip, __put_user_bad - mov ip, r2, lsr #8 -#ifdef CONFIG_THUMB2_KERNEL -#ifndef __ARMEB__ -2: TUSER(strb) r2, [r0] -3: TUSER(strb) ip, [r0, #1] +#if __LINUX_ARM_ARCH__ >= 6 + +2: TUSER(strh) r2, [r0] + #else -2: TUSER(strb) ip, [r0] -3: TUSER(strb) r2, [r0, #1] -#endif -#else /* !CONFIG_THUMB2_KERNEL */ + + mov ip, r2, lsr #8 #ifndef __ARMEB__ 2: TUSER(strb) r2, [r0], #1 3: TUSER(strb) ip, [r0]
@@ -58,7 +55,8 @@ ENTRY(__put_user_2) 2: TUSER(strb) ip, [r0], #1 3: TUSER(strb) r2, [r0] #endif -#endif /* CONFIG_THUMB2_KERNEL */ + +#endif /* __LINUX_ARM_ARCH__ >= 6 */ mov r0, #0 ret lr ENDPROC(__put_user_2)
@@ -91,7 +89,9 @@ ENDPROC(__put_user_bad) .pushsection __ex_table, "a" .long 1b, __put_user_bad .long 2b, __put_user_bad +#if __LINUX_ARM_ARCH__ < 6 .long 3b, __put_user_bad +#endif .long 4b, __put_user_bad .long 5b, __put_user_bad .long 6b, __put_user_bad
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/199 usb: gadget: u_serial: add missing port entry locking
In reply to Greg Kroah-HartmanFrom: Michał Mirosław <[email protected]>
commit daf82bd24e308c5a83758047aff1bd81edda4f11 upstream.
gserial_alloc_line() misses locking (for a release barrier) while resetting port entry on TTY allocation failure. Fix this.
--- drivers/usb/gadget/function/u_serial.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/gadget/function/u_serial.c +2 -0
@@ -1391,8 +1391,10 @@ int gserial_alloc_line(unsigned char *li __func__, port_num, PTR_ERR(tty_dev)); ret =PTR_ERR (tty_dev); +mutex_lock (&ports[port_num].lock); port = ports[port_num].port; ports[port_num].port =NULL ; +mutex_unlock (&ports[port_num].lock);gserial_free_port (port); goto err; }
Greg Kroah-Hartman
maintainerPATCH 23/199 clk: rockchip: fix rk3188 sclk_smc gate data
In reply to Greg Kroah-HartmanFrom: Finley Xiao <[email protected]>
[ Upstream commit a9f0c0e563717b9f63b3bb1c4a7c2df436a206d9 ]
Fix sclk_smc gate data.
Change variable order, flags come before the register address.
--- drivers/clk/rockchip/clk-rk3188.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/rockchip/clk-rk3188.c +2 -2
@@ -390,8 +390,8 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = {* Clock-Architecture Diagram 4 */ -GATE (SCLK_SMC ,"sclk_smc" ,"hclk_peri" , -RK2928_CLKGATE_CON (2 ),4 ,0 ,GFLAGS ), +GATE (SCLK_SMC ,"sclk_smc" ,"hclk_peri" ,0 , +RK2928_CLKGATE_CON (2 ),4 ,GFLAGS ), COMPOSITE_NOMUX(SCLK_SPI0, "sclk_spi0", "pclk_peri", 0, RK2928_CLKSEL_CON(25), 0, 7, DFLAGS,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/199 extcon: max8997: Fix lack of path setting in USB device mode
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit a2dc50914744eea9f83a70a5db0486be625e5dc0 ]
MAX8997 driver disables automatic path selection from MicroUSB connector and manually sets path to either UART or USB lines. However the code for setting USB path worked only for USB host mode (when ID pin is set to ground). When standard USB cable (USB device mode) is connected, path registers are not touched. This means that once the non-USB accessory is connected to MAX8997-operated micro USB port, the path is no longer set to USB and USB device mode doesn't work. This patch fixes it by setting USB path both for USB and USB host modes.
--- drivers/extcon/extcon-max8997.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/extcon/extcon-max8997.c +4 -6
@@ -321,12 +321,10 @@ static int max8997_muic_handle_usb(struct max8997_muic_info *info, {int ret =0 ; -if (usb_type ==MAX8997_USB_HOST ) { - ret =max8997_muic_set_path (info, info->path_usb, attached); -if (ret <0 ) { -dev_err (info->dev,"failed to update muic register\n" ); -return ret; - } + ret =max8997_muic_set_path (info, info->path_usb, attached); +if (ret <0 ) { +dev_err (info->dev,"failed to update muic register\n" ); +return ret; }switch (usb_type) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/199 clk: rockchip: fix rk3188 sclk_mac_lbtest parameter ordering
In reply to Greg Kroah-HartmanFrom: Heiko Stuebner <[email protected]>
[ Upstream commit ac8cb53829a6ba119082e067f5bc8fab3611ce6a ]
Similar to commit a9f0c0e56371 ("clk: rockchip: fix rk3188 sclk_smc gate data") there is one other gate clock in the rk3188 clock driver with a similar wrong ordering, the sclk_mac_lbtest. So fix it as well.
--- drivers/clk/rockchip/clk-rk3188.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/rockchip/clk-rk3188.c +2 -2
@@ -361,8 +361,8 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKGATE_CON(2), 5, GFLAGS),MUX (SCLK_MAC ,"sclk_macref" , mux_sclk_macref_p,CLK_SET_RATE_PARENT ,RK2928_CLKSEL_CON (21 ),4 ,1 ,MFLAGS ), -GATE (0 ,"sclk_mac_lbtest" ,"sclk_macref" , -RK2928_CLKGATE_CON (2 ),12 ,0 ,GFLAGS ), +GATE (0 ,"sclk_mac_lbtest" ,"sclk_macref" ,0 , +RK2928_CLKGATE_CON (2 ),12 ,GFLAGS ), COMPOSITE(0, "hsadc_src", mux_pll_src_gpll_cpll_p, 0, RK2928_CLKSEL_CON(22), 0, 1, MFLAGS, 8, 8, DFLAGS,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/199 dlm: fix missing idr_destroy for recover_idr
In reply to Greg Kroah-HartmanFrom: David Teigland <[email protected]>
[ Upstream commit 8fc6ed9a3508a0435b9270c313600799d210d319 ]
Which would leak memory for the idr internals.
--- fs/dlm/lockspace.c | 1 + 1 file changed, 1 insertion(+)
fs/dlm/lockspace.c +1 -0
@@ -800,6 +800,7 @@ static int release_lockspace(struct dlm_ls *ls, int force)dlm_delete_debug_file (ls); +idr_destroy (&ls->ls_recover_idr);kfree (ls->ls_recover_buf);/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/199 scsi: zfcp: drop default switch case which might paper over missing case
In reply to Greg Kroah-HartmanFrom: Steffen Maier <[email protected]>
[ Upstream commit 0c902936e55cff9335b27ed632fc45e7115ced75 ]
This was introduced with v4.18 commit 8c3d20aada70 ("scsi: zfcp: fix missing REC trigger trace for all objects in ERP_FAILED") but would now suppress helpful -Wswitch compiler warnings when building with W=1 such as the following forced example:
drivers/s390/scsi/zfcp_erp.c: In function 'zfcp_erp_handle_failed':drivers/s390/scsi/zfcp_erp.c:126:2: warning: enumeration value 'ZFCP_ERP_ACTION_REOPEN_PORT_FORCED' not handled in switch [-Wswitch]
switch (want) {
^~~~~~
But then again, only with W=1 we would notice unhandled enum cases. Without the default cases and a missed unhandled enum case, the code might perform unforeseen things we might not want...
As of today, we never run through the removed default case, so removing it is no functional change. In the future, we never should run through a default case but introduce the necessary specific case(s) to handle new functionality.
--- drivers/s390/scsi/zfcp_erp.c | 3 --- 1 file changed, 3 deletions(-)
drivers/s390/scsi/zfcp_erp.c +0 -3
@@ -178,9 +178,6 @@ static int zfcp_erp_handle_failed(int want, struct zfcp_adapter *adapter, adapter, ZFCP_STATUS_COMMON_ERP_FAILED); }break ; -default : - need =0 ; -break ; }return need;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/199 pinctrl: qcom: ssbi-gpio: fix gpio-hog related boot issues
In reply to Greg Kroah-HartmanFrom: Brian Masney <[email protected]>
[ Upstream commit 7ed07855773814337b9814f1c3e866df52ebce68 ]
When attempting to setup up a gpio hog, device probing will repeatedly fail with -EPROBE_DEFERED errors. It is caused by a circular dependency between the gpio and pinctrl frameworks. If the gpio-ranges property is present in device tree, then the gpio framework will handle the gpio pin registration and eliminate the circular dependency.
See Christian Lamparter's commit a86caa9ba5d7 ("pinctrl: msm: fix gpio-hog related boot issues") for a detailed commit message that explains the issue in much more detail. The code comment in this commit came from Christian's commit.
I did not test this change against any hardware supported by this particular driver, however I was able to validate this same fix works for pinctrl-spmi-gpio.c using a LG Nexus 5 (hammerhead) phone.
--- drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c +17 -6
@@ -762,12 +762,23 @@ static int pm8xxx_gpio_probe(struct platform_device *pdev)return ret; } - ret =gpiochip_add_pin_range (&pctrl->chip, -dev_name (pctrl->dev), -0 ,0 , pctrl->chip.ngpio); -if (ret) { -dev_err (pctrl->dev,"failed to add pin range\n" ); - goto unregister_gpiochip; +/* +* For DeviceTree-supported systems, the gpio core checks the +* pinctrl's device node for the "gpio-ranges" property. +* If it is present, it takes care of adding the pin ranges +* for the driver. In this case the driver can skip ahead. +* +* In order to remain compatible with older, existing DeviceTree +* files which don't set the "gpio-ranges" property or systems that +* utilize ACPI the driver has to call gpiochip_add_pin_range(). +*/ +if (!of_property_read_bool (pctrl->dev->of_node,"gpio-ranges" )) { + ret =gpiochip_add_pin_range (&pctrl->chip,dev_name (pctrl->dev), +0 ,0 , pctrl->chip.ngpio); +if (ret) { +dev_err (pctrl->dev,"failed to add pin range\n" ); + goto unregister_gpiochip; + } }platform_set_drvdata (pdev, pctrl);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/199 tty: serial: fsl_lpuart: use the sg count from dma_map_sg
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
commit 487ee861de176090b055eba5b252b56a3b9973d6 upstream.
The dmaengine_prep_slave_sg needs to use sg count returned by dma_map_sg, not use sport->dma_tx_nents, because the return value of dma_map_sg is not always same with "nents".
When enabling iommu for lpuart + edma, iommu framework may concatenate two sgs into one.
--- drivers/tty/serial/fsl_lpuart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/fsl_lpuart.c +2 -2
@@ -346,8 +346,8 @@ static void lpuart_dma_tx(struct lpuart_ } sport->dma_tx_desc =dmaengine_prep_slave_sg (sport->dma_tx_chan, sgl, - sport->dma_tx_nents, -DMA_MEM_TO_DEV ,DMA_PREP_INTERRUPT ); + ret,DMA_MEM_TO_DEV , +DMA_PREP_INTERRUPT );if (!sport->dma_tx_desc) {dma_unmap_sg (dev, sgl, sport->dma_tx_nents,DMA_TO_DEVICE );dev_err (dev,"Cannot prepare TX slave DMA!\n" );
Greg Kroah-Hartman
maintainerPATCH 31/199 regulator: Fix return value of _set_load() stub
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit f1abf67217de91f5cd3c757ae857632ca565099a ]
The stub implementation of _set_load() returns a mode value which is within the bounds of valid return codes for success (the documentation just says that failures are negative error codes) but not sensible or what the actual implementation does. Fix it to just return 0.
--- include/linux/regulator/consumer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/regulator/consumer.h +1 -1
@@ -479,7 +479,7 @@ static inline unsigned int regulator_get_mode(struct regulator *regulator)static inline int regulator_set_load (struct regulator *regulator,int load_uA) { -return REGULATOR_MODE_NORMAL ; +return 0 ; } static inline int regulator_allow_bypass(struct regulator *regulator,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/199 MIPS: OCTEON: octeon-platform: fix typing
In reply to Greg Kroah-HartmanFrom: Aaro Koskinen <[email protected]>
[ Upstream commit 2cf1c8933dd93088cfb5f8f58b3bb9bbdf1781b9 ]
Use correct type for fdt_property nameoff field.
Patchwork: https://patchwork.linux-mips.org/patch/21204/
--- arch/mips/cavium-octeon/octeon-platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/cavium-octeon/octeon-platform.c +1 -1
@@ -502,7 +502,7 @@ static void __init octeon_fdt_set_phy(int eth, int phy_addr)if (phy_addr >=256 && alt_phy >0 ) {const struct fdt_property *phy_prop;struct fdt_property *alt_prop; -u32 phy_handle_name; +fdt32_t phy_handle_name;/* Use the alt phy node instead.*/ phy_prop =fdt_get_property (initial_boot_params, eth,"phy-handle" ,NULL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/199 math-emu/soft-fp.h: (_FP_ROUND_ZERO) cast 0 to void to fix warning
In reply to Greg Kroah-HartmanFrom: Vincent Chen <[email protected]>
[ Upstream commit 83312f1b7ae205dca647bf52bbe2d51303cdedfb ]
_FP_ROUND_ZERO is defined as 0 and used as a statemente in macro _FP_ROUND. This generates "error: statement with no effect [-Werror=unused-value]" from gcc. Defining _FP_ROUND_ZERO as (void)0 to fix it.
This modification is quoted from glibc 'commit <In libc/:> (8ed1e7d5894000c155acbd06f)'
--- include/math-emu/soft-fp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/math-emu/soft-fp.h +1 -1
@@ -138,7 +138,7 @@ do { \ _FP_FRAC_ADDI_##wc(X, _FP_WORK_ROUND); \ } while (0) -#define _FP_ROUND_ZERO (wc,X ) 0 +#define _FP_ROUND_ZERO (wc,X ) (void)0#define _FP_ROUND_PINF (wc,X ) \ do { \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/199 rtc: max8997: Fix the returned value in case of error in max8997_rtc_read_alarm()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 41ef3878203cd9218d92eaa07df4b85a2cb128fb ]
In case of error, we return 0.
This is spurious and not consistent with the other functions of the driver. Propagate the error code instead.
--- drivers/rtc/rtc-max8997.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-max8997.c +1 -1
@@ -221,7 +221,7 @@ static int max8997_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) out:mutex_unlock (&info->lock); -return 0 ; +return ret; }static int max8997_rtc_stop_alarm (struct max8997_rtc_info *info)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/199 ARM: dts: exynos: Use Samsung SoC specific compatible for DWC2 module
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 6035cbcceb069f87296b3cd0bc4736ad5618bf47 ]
DWC2 hardware module integrated in Samsung SoCs requires some quirks to operate properly, so use Samsung SoC specific compatible to notify driver to apply respective fixes.
--- arch/arm/boot/dts/exynos3250.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/exynos3250.dtsi +1 -1
@@ -345,7 +345,7 @@ }; hsotg: hsotg@12480000 { - compatible = "snps,dwc2"; + compatible = "samsung,s3c6400-hsotg", "snps,dwc2"; reg = <0x12480000 0x20000>; interrupts = <0 141 0>; clocks = <&cmu CLK_USBOTG>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/199 media: pulse8-cec: return 0 when invalidating the logical address
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 2e84eb9affac43eeaf834992888b72426a8cd442 ]
Return 0 when invalidating the logical address. The cec core produces a warning for drivers that do this.
--- drivers/staging/media/pulse8-cec/pulse8-cec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/pulse8-cec/pulse8-cec.c +1 -1
@@ -580,7 +580,7 @@ unlock:else pulse8->config_pending = true;mutex_unlock (&pulse8->config_lock); -return err; +return log_addr ==CEC_LOG_ADDR_INVALID ?0 : err; } static int pulse8_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/199 tty: serial: msm_serial: Fix flow control
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
commit b027ce258369cbfa88401a691c23dad01deb9f9b upstream.
hci_qca interfaces to the wcn3990 via a uart_dm on the msm8998 mtp and Lenovo Miix 630 laptop. As part of initializing the wcn3990, hci_qca disables flow, configures the uart baudrate, and then reenables flow - at which point an event is expected to be received over the uart from the wcn3990. It is observed that this event comes after the baudrate change but before hci_qca re-enables flow. This is unexpected, and is a result of msm_reset() being broken.
According to the uart_dm hardware documentation, it is recommended that automatic hardware flow control be enabled by setting RX_RDY_CTL. Auto hw flow control will manage RFR based on the configured watermark. When there is space to receive data, the hw will assert RFR. When the watermark is hit, the hw will de-assert RFR.
The hardware documentation indicates that RFR can me manually managed via CR when RX_RDY_CTL is not set. SET_RFR asserts RFR, and RESET_RFR de-asserts RFR.
msm_reset() is broken because after resetting the hardware, it unconditionally asserts RFR via SET_RFR. This enables flow regardless of the current configuration, and would undo a previous flow disable operation. It should instead de-assert RFR via RESET_RFR to block flow until the hardware is reconfigured. msm_serial should rely on the client to specify that flow should be enabled, either via mctrl() or the termios structure, and only assert RFR in response to those triggers.
--- drivers/tty/serial/msm_serial.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/tty/serial/msm_serial.c +5 -1
@@ -988,6 +988,7 @@ static unsigned int msm_get_mctrl(structstatic void msm_reset (struct uart_port *port) {struct msm_port *msm_port =UART_TO_MSM (port); +unsigned int mr;/* reset everything */ msm_write (port,UART_CR_CMD_RESET_RX ,UART_CR );
@@ -995,7 +996,10 @@ static void msm_reset(struct uart_port *msm_write (port,UART_CR_CMD_RESET_ERR ,UART_CR );msm_write (port,UART_CR_CMD_RESET_BREAK_INT ,UART_CR );msm_write (port,UART_CR_CMD_RESET_CTS ,UART_CR ); -msm_write (port,UART_CR_CMD_SET_RFR ,UART_CR ); +msm_write (port,UART_CR_CMD_RESET_RFR ,UART_CR ); + mr =msm_read (port,UART_MR1 ); + mr &= ~UART_MR1_RX_RDY_CTL ; +msm_write (port, mr,UART_MR1 );/* Disable DM modes */ if (msm_port->is_uartdm)
Greg Kroah-Hartman
maintainerPATCH 5/199 serial: pl011: Fix DMA ->flush_buffer()
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
commit f6a196477184b99a31d16366a8e826558aa11f6d upstream.
PL011's ->flush_buffer() implementation releases and reacquires the port lock. Due to a race condition here, data can end up being added to the circular buffer but neither being discarded nor being sent out. This leads to, for example, tcdrain(2) waiting indefinitely.
Process A Process B
uart_flush_buffer()
- acquire lock
- circ_clear
- pl011_flush_buffer()
-- release lock
-- dmaengine_terminate_all()
uart_write()
- acquire lock
- add chars to circ buffer
- start_tx()
-- start DMA
- release lock
-- acquire lock
-- turn off DMA
-- release lock
// Data in circ buffer but DMA is off
According to the comment in the code, the releasing of the lock around dmaengine_terminate_all() is to avoid a deadlock with the DMA engine callback. However, since the time this code was written, the DMA engine API documentation seems to have been clarified to say that dmaengine_terminate_all() (in the identically implemented but differently named dmaengine_terminate_async() variant) does not wait for any running complete callback to be completed and can even be called from a complete callback. So there is no possibility of deadlock if the DMA engine driver implements this API correctly.
So we should be able to just remove this release and reacquire of the lock to prevent the aforementioned race condition.
--- drivers/tty/serial/amba-pl011.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/tty/serial/amba-pl011.c +2 -4
@@ -811,10 +811,8 @@ __acquires(&uap->port.lock)if (!uap->using_tx_dma)return ; -/* Avoid deadlock with the DMA engine callback */ -spin_unlock (&uap->port.lock); -dmaengine_terminate_all (uap->dmatx.chan); -spin_lock (&uap->port.lock); +dmaengine_terminate_async (uap->dmatx.chan); +if (uap->dmatx.queued) {dma_unmap_sg (uap->dmatx.chan->device->dev, &uap->dmatx.sg,1 ,DMA_TO_DEVICE );
Greg Kroah-Hartman
maintainerPATCH 8/199 autofs: fix a leak in autofs_expire_indirect()
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
[ Upstream commit 03ad0d703df75c43f78bd72e16124b5b94a95188 ]
if the second call of should_expire() in there ends up grabbing and returning a new reference to dentry, we need to drop it before continuing.
--- fs/autofs4/expire.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/autofs4/expire.c +3 -2
@@ -469,9 +469,10 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,*/ flags &= ~AUTOFS_EXP_LEAVES ; found =should_expire (expired, mnt, timeout, how); -if (!found || found != expired) -/* Something has changed, continue */ +if (found != expired) {// something has changed, continue +dput (found); goto next; + }if (expired != dentry)dput (dentry);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/199 RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN
In reply to Greg Kroah-HartmanFrom: Sirong Wang <[email protected]>
[ Upstream commit 531eb45b3da4267fc2a64233ba256c8ffb02edd2 ]
Size of pointer to buf field of struct hns_roce_hem_chunk should be considered when calculating HNS_ROCE_HEM_CHUNK_LEN, or sg table size will be larger than expected when allocating hem.
--- drivers/infiniband/hw/hns/hns_roce_hem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_hem.h +1 -1
@@ -52,7 +52,7 @@ enum {#define HNS_ROCE_HEM_CHUNK_LEN \ ((256 - sizeof(struct list_head) - 2 * sizeof(int)) / \ - (sizeof(struct scatterlist))) + (sizeof(struct scatterlist) + sizeof(void *)))enum {HNS_ROCE_HEM_PAGE_SHIFT =12 ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/199 dmaengine: coh901318: Remove unused variable
In reply to Greg Kroah-HartmanFrom: Vinod Koul <[email protected]>
commit 35faaf0df42d285b40f8a6310afbe096720f7758 upstream.
Commit 627469e4445b ("dmaengine: coh901318: Fix a double-lock bug") left flags variable unused, so remove it to fix the warning.
drivers/dma/coh901318.c: In function 'coh901318_config':drivers/dma/coh901318.c:1805:16: warning: unused variable 'flags' [-Wunused-variable]
unsigned long flags;
^~~~~--- drivers/dma/coh901318.c | 1 - 1 file changed, 1 deletion(-)
drivers/dma/coh901318.c +0 -1
@@ -1797,7 +1797,6 @@ static struct dma_chan *coh901318_xlate(static int coh901318_config (struct coh901318_chan *cohc,struct coh901318_params *param) { -unsigned long flags;const struct coh901318_params *p;int channel = cohc->id;void __iomem *virtbase = cohc->base->virtbase;
Greg Kroah-Hartman
maintainercover 4.9.207-stable review
This is the start of the stable review cycle for the 4.9.207 release. There are 199 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 Sat, 21 Dec 2019 18:24:44 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.207-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.207-rc1
Aaro Koskinen <[email protected]>
net: stmmac: don't stop NAPI processing when dropping a packet
Aaro Koskinen <[email protected]>
net: stmmac: use correct DMA buffer size in the RX descriptor
Mathias Nyman <[email protected]>
xhci: fix USB3 device initiated resume race with roothub autosuspend
Alex Deucher <[email protected]>
drm/radeon: fix r1xx/r2xx register checker for POT textures
Bart Van Assche <[email protected]>
scsi: iscsi: Fix a potential deadlock in the timeout handler
Hou Tao <[email protected]>
dm btree: increase rebalance threshold in __rebalance2()
Navid Emamdoost <[email protected]>
dma-buf: Fix memory leak in sync_file_merge()
Jiang Yi <[email protected]>
vfio/pci: call irq_bypass_unregister_producer() before freeing irq
Dmitry Osipenko <[email protected]>
ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()
Lihua Yao <[email protected]>
ARM: dts: s3c64xx: Fix init order of clock providers
Pavel Shilovsky <[email protected]>
CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
Max Filippov <[email protected]>
xtensa: fix TLB sanity checker
Jian-Hong Pan <[email protected]>
PCI/MSI: Fix incorrect MSI-X masking on resume
Steffen Liebergeld <[email protected]>
PCI: Fix Intel ACS quirk UPDCR register address
Greg Kroah-Hartman <[email protected]>
Revert "regulator: Defer init completion for a while after late_initcall"
Guillaume Nault <[email protected]>
tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE()
Guillaume Nault <[email protected]>
tcp: tighten acceptance of ACKs not matching a child socket
Guillaume Nault <[email protected]>
tcp: fix rejected syncookies due to stale timestamps
Eric Dumazet <[email protected]>
inet: protect against too small mtu values.
Taehee Yoo <[email protected]>
tipc: fix ordering of tipc module init and exit routine
Eric Dumazet <[email protected]>
tcp: md5: fix potential overestimation of TCP option space
Aaron Conole <[email protected]>
openvswitch: support asymmetric conntrack
Grygorii Strashko <[email protected]>
net: ethernet: ti: cpsw: fix extra rx interrupt
Nikolay Aleksandrov <[email protected]>
net: bridge: deny dev_set_mac_address() when unregistering
Ivan Bornyakov <[email protected]>
nvme: host: core: fix precedence of ternary operator
Konstantin Khorenko <[email protected]>
kernel/module.c: wakeup processes in module_wq on module unload
Eran Ben Elisha <[email protected]>
net/mlx5e: Fix SFF 8472 eeprom length
Pavel Tikhomirov <[email protected]>
sunrpc: fix crash when cache_head become valid before update
Tejun Heo <[email protected]>
workqueue: Fix missing kfree(rescuer) in destroy_workqueue()
Ming Lei <[email protected]>
blk-mq: make sure that line break can be printed
yangerkun <[email protected]>
ext4: fix a bug in ext4_wait_for_tail_page_commit
Chen Jun <[email protected]>
mm/shmem.c: cast the type of unmap_start to u64
Will Deacon <[email protected]>
firmware: qcom: scm: Ensure 'a0' status code is treated as signed
Jeff Mahoney <[email protected]>
reiserfs: fix extended attributes on the root directory
Vincenzo Frascino <[email protected]>
powerpc: Fix vDSO clock_getres()
Bart Van Assche <[email protected]>
scsi: qla2xxx: Always check the qla2x00_wait_for_hba_online() return value
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix qla24xx_process_bidir_cmd()
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix session lookup in qlt_abort_work()
Himanshu Madhani <[email protected]>
scsi: qla2xxx: Fix DMA unmap leak
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init
Jarkko Nikula <[email protected]>
ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity
Miaoqing Pan <[email protected]>
ath10k: fix fw crash by moving chip reset after napi disabled
Shirish S <[email protected]>
x86/MCE/AMD: Carve out the MC4_MISC thresholding quirk
Shirish S <[email protected]>
x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models
YueHaibing <[email protected]>
e100: Fix passing zero to 'PTR_ERR' warning in e100_load_ucode_wait
James Smart <[email protected]>
scsi: lpfc: Cap NPIV vports to 256
H. Nikolaus Schaller <[email protected]>
omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
Filipe Manana <[email protected]>
Btrfs: fix negative subv_writers counter and data space leak after buffered write
Nuno Sá <[email protected]>
iio: adis16480: Add debugfs_reg_access entry
Mathias Nyman <[email protected]>
xhci: make sure interrupts are restored to correct state
Mika Westerberg <[email protected]>
xhci: Fix memory leak in xhci_add_in_port()
Henry Lin <[email protected]>
usb: xhci: only set D3hot for pci device
Steffen Maier <[email protected]>
scsi: zfcp: trace channel log even for FCP command responses
Dmitry Monakhov <[email protected]>
quota: fix livelock in dquot_writeback_dquots
Chengguang Xu <[email protected]>
ext2: check err when partial != NULL
Dmitry Monakhov <[email protected]>
quota: Check that quota is not dirty before release
Ville Syrjälä <[email protected]>
video/hdmi: Fix AVI bar unpack
Alastair D'Silva <[email protected]>
powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB
Arnd Bergmann <[email protected]>
ppdev: fix PPGETTIME/PPSETTIME ioctls
H. Nikolaus Schaller <[email protected]>
mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: Fix device node refcount leaks in init code
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init
Rafael J. Wysocki <[email protected]>
ACPI: PM: Avoid attaching ACPI PM domain to certain devices
Vamshi K Sthambamkadi <[email protected]>
ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data()
Francesco Ruggeri <[email protected]>
ACPI: OSL: only free map once in osl.c
Leonard Crestez <[email protected]>
PM / devfreq: Lock devfreq in trans_stat_show
Zhenzhong Duan <[email protected]>
cpuidle: Do not unset the driver if it is there already
Johan Hovold <[email protected]>
media: radio: wl1273: fix interrupt masking on release
Johan Hovold <[email protected]>
media: bdisp: fix memleak on release
Denis Efremov <[email protected]>
ar5523: check NULL before memcpy() in ar5523_cmd()
Aleksa Sarai <[email protected]>
cgroup: pids: use atomic64_t for pids->limit
Ming Lei <[email protected]>
blk-mq: avoid sysfs buffer overflow with too many CPU cores
Pawel Harlozinski <[email protected]>
ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report
Tejun Heo <[email protected]>
workqueue: Fix pwq ref leak in rescuer_thread()
Tejun Heo <[email protected]>
workqueue: Fix spurious sanity check failures in destroy_workqueue()
Takashi Iwai <[email protected]>
ALSA: hda - Fix pending unsol events at shutdown
Greg Kroah-Hartman <[email protected]>
lib: raid6: fix awk build warnings
Larry Finger <[email protected]>
rtlwifi: rtl8192de: Fix missing enable interrupt flag
Larry Finger <[email protected]>
rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer
Larry Finger <[email protected]>
rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address
Josef Bacik <[email protected]>
btrfs: record all roots for rename exchange on a subvol
Filipe Manana <[email protected]>
Btrfs: send, skip backreference walking for extents with many references
Qu Wenruo <[email protected]>
btrfs: Remove btrfs_bio::flags member
Josef Bacik <[email protected]>
btrfs: check page->mapping when loading free space cache
David Hildenbrand <[email protected]>
virtio-balloon: fix managed page counts when migrating pages between zones
Miquel Raynal <[email protected]>
mtd: spear_smi: Fix Write Burst mode
Pete Zaitcev <[email protected]>
usb: mon: Fix a deadlock in usbmon between mmap and read
Emiliano Ingrassia <[email protected]>
usb: core: urb: fix URB structure initialization function
Johan Hovold <[email protected]>
USB: adutux: fix interface sanity check
Johan Hovold <[email protected]>
USB: serial: io_edgeport: fix epic endpoint lookup
Johan Hovold <[email protected]>
USB: idmouse: fix interface sanity checks
Johan Hovold <[email protected]>
USB: atm: ueagle-atm: add missing endpoint check
Chris Lesiak <[email protected]>
iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting
H. Nikolaus Schaller <[email protected]>
ARM: dts: pandora-common: define wl1251 as child node of mmc3
Kai-Heng Feng <[email protected]>
xhci: Increase STS_HALT timeout in xhci_suspend()
Johan Hovold <[email protected]>
staging: gigaset: add endpoint-type sanity check
Johan Hovold <[email protected]>
staging: gigaset: fix illegal free on probe errors
Johan Hovold <[email protected]>
staging: gigaset: fix general protection fault on probe
Johan Hovold <[email protected]>
staging: rtl8712: fix interface sanity check
Johan Hovold <[email protected]>
staging: rtl8188eu: fix interface sanity check
Kai-Heng Feng <[email protected]>
usb: Allow USB device to be warm reset in suspended state
Oliver Neukum <[email protected]>
USB: uas: heed CAPACITY_HEURISTICS
Oliver Neukum <[email protected]>
USB: uas: honor flag to avoid CAPACITY16
Wei Yongjun <[email protected]>
usb: gadget: configfs: Fix missing spin_lock_init()
YueHaibing <[email protected]>
appletalk: Set error code if register_snap_client failed
YueHaibing <[email protected]>
appletalk: Fix potential NULL pointer dereference in unregister_snap_client
Paolo Bonzini <[email protected]>
KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332)
Wei Wang <[email protected]>
thermal: Fix deadlock in thermal thermal_zone_device_check
Viresh Kumar <[email protected]>
RDMA/qib: Validate ->show()/store() callbacks before calling them
Gregory CLEMENT <[email protected]>
spi: atmel: Fix CS high support
Navid Emamdoost <[email protected]>
crypto: user - fix memory leak in crypto_report
Ard Biesheuvel <[email protected]>
crypto: ecdh - fix big endian bug in ECC library
Mark Salter <[email protected]>
crypto: ccp - fix uninitialized list head
Christian Lamparter <[email protected]>
crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr
Paolo Bonzini <[email protected]>
KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES
Paolo Bonzini <[email protected]>
KVM: x86: do not modify masked bits of shared MSRs
Dan Carpenter <[email protected]>
drm/i810: Prevent underflow in ioctl
Jan Kara <[email protected]>
jbd2: Fix possible overflow in jbd2_log_space_left()
Jouni Hogander <[email protected]>
can: slcan: Fix use-after-free Read in slcan_open
Dmitry Torokhov <[email protected]>
tty: vt: keyboard: reject invalid keycodes
Pavel Shilovsky <[email protected]>
CIFS: Fix SMB2 oplock break processing
Pavel Shilovsky <[email protected]>
CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks
Kai-Heng Feng <[email protected]>
x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect
Mike Leach <[email protected]>
coresight: etm4x: Fix input validation for sysfs.
Hans de Goede <[email protected]>
Input: goodix - add upside-down quirk for Teclast X89 tablet
Takashi Iwai <[email protected]>
ALSA: pcm: oss: Avoid potential buffer overflows
Miklos Szeredi <[email protected]>
fuse: verify attributes
Miklos Szeredi <[email protected]>
fuse: verify nlink
Xuewei Zhang <[email protected]>
sched/fair: Scale bandwidth quota and period without losing quota/period ratio precision
Rob Herring <[email protected]>
ARM: dts: sunxi: Fix PMU compatible strings
Qian Cai <[email protected]>
mlx4: Use snprintf instead of complicated strcpy
Andreas Pape <[email protected]>
media: stkwebcam: Bugfix for wrong return values
Dmitry Safonov <[email protected]>
tty: Don't block on IO when ldisc change is pending
zhengbin <[email protected]>
nfsd: Return EPERM, not EACCES, in some SETATTR cases
Aaro Koskinen <[email protected]>
MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition
Joel Stanley <[email protected]>
powerpc/math-emu: Update macros from GCC
Erez Alfasi <[email protected]>
net/mlx4_core: Fix return codes of unsupported operations
David Teigland <[email protected]>
dlm: fix invalid cluster name warning
Rob Herring <[email protected]>
ARM: dts: realview: Fix some more duplicate regulator nodes
Chen-Yu Tsai <[email protected]>
clk: sunxi-ng: h3/h5: Fix CSI_MCLK parent
Daniel Mack <[email protected]>
ARM: dts: pxa: clean up USB controller nodes
Miquel Raynal <[email protected]>
mtd: fix mtd_oobavail() incoherent returned value
Masahiro Yamada <[email protected]>
kbuild: fix single target build for external module
Paul Walmsley <[email protected]>
modpost: skip ELF local symbols during section mismatch check
Yuchung Cheng <[email protected]>
tcp: fix SNMP TCP timeout under-estimation
Yuchung Cheng <[email protected]>
tcp: fix off-by-one bug on aborting window-probing socket
Rob Herring <[email protected]>
ARM: dts: realview-pbx: Fix duplicate regulator nodes
Lubomir Rintel <[email protected]>
ARM: dts: mmp2: fix the gpio interrupt cell number
Martin Schiller <[email protected]>
net/x25: fix null_x25_address handling
Martin Schiller <[email protected]>
net/x25: fix called/calling length calculation in x25_parse_address_block
Aaro Koskinen <[email protected]>
ARM: OMAP1/2: fix SoC name printing
Scott Mayhew <[email protected]>
nfsd: fix a warning in __cld_pipe_upcall()
Clément Péron <[email protected]>
ARM: debug: enable UART1 for socfpga Cyclone5
Wen Yang <[email protected]>
dlm: NULL check before kmem_cache_destroy is not needed
Lucas Stach <[email protected]>
i2c: imx: don't print error message on probe defer
Stefan Agner <[email protected]>
serial: imx: fix error handling in console_setup
Colin Ian King <[email protected]>
altera-stapl: check for a null key before strcasecmp'ing it
Niklas Söderlund <[email protected]>
dma-mapping: fix return type of dma_set_max_seg_size()
Alexey Dobriyan <[email protected]>
ACPI: fix acpi_find_child_device() invocation in acpi_preset_companion()
Brian Norris <[email protected]>
usb: dwc3: don't log probe deferrals; but do log other error codes
Vinod Koul <[email protected]>
dmaengine: coh901318: Remove unused variable
Jia-Ju Bai <[email protected]>
dmaengine: coh901318: Fix a double-lock bug
Hans Verkuil <[email protected]>
media: pulse8-cec: return 0 when invalidating the logical address
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Use Samsung SoC specific compatible for DWC2 module
Baruch Siach <[email protected]>
rtc: dt-binding: abx80x: fix resistance scale
Christophe JAILLET <[email protected]>
rtc: max8997: Fix the returned value in case of error in 'max8997_rtc_read_alarm()'
Vincent Chen <[email protected]>
math-emu/soft-fp.h: (_FP_ROUND_ZERO) cast 0 to void to fix warning
Aaro Koskinen <[email protected]>
MIPS: OCTEON: octeon-platform: fix typing
Mark Brown <[email protected]>
regulator: Fix return value of _set_load() stub
Shreeya Patel <[email protected]>
Staging: iio: adt7316: Fix i2c data reading, set the data field
Brian Masney <[email protected]>
pinctrl: qcom: ssbi-gpio: fix gpio-hog related boot issues
Steffen Maier <[email protected]>
scsi: zfcp: drop default switch case which might paper over missing case
Maciej W. Rozycki <[email protected]>
MIPS: SiByte: Enable ZONE_DMA32 for LittleSur
David Teigland <[email protected]>
dlm: fix missing idr_destroy for recover_idr
John Keeping <[email protected]>
ARM: dts: rockchip: Fix rk3288-rock2 vcc_flash name
Heiko Stuebner <[email protected]>
clk: rockchip: fix rk3188 sclk_mac_lbtest parameter ordering
Finley Xiao <[email protected]>
clk: rockchip: fix rk3188 sclk_smc gate data
Marek Szyprowski <[email protected]>
extcon: max8997: Fix lack of path setting in USB device mode
Moni Shoua <[email protected]>
net/mlx5: Release resource on error flow
Vincent Whitchurch <[email protected]>
ARM: 8813/1: Make aligned 2-byte getuser()/putuser() atomic on ARMv6+
Andrei Otcheretianski <[email protected]>
iwlwifi: mvm: Send non offchannel traffic via AP sta
Arjun Vynipadath <[email protected]>
cxgb4vf: fix memleak in mac_hlist initialization
Douglas Anderson <[email protected]>
serial: core: Allow processing sysrq at port unlock time
Chuhong Yuan <[email protected]>
net: ep93xx_eth: fix mismatch of request_mem_region in remove
Chuhong Yuan <[email protected]>
rsxx: add missed destroy_workqueue calls in remove
paulhsia <[email protected]>
ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed()
Pan Bian <[email protected]>
Input: cyttsp4_core - fix use after free bug
Stephan Gerhold <[email protected]>
NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error
Al Viro <[email protected]>
audit_get_nd(): don't unlock parent too early
Al Viro <[email protected]>
exportfs_decode_fh(): negative pinned may become positive without the parent locked
Sirong Wang <[email protected]>
RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN
Al Viro <[email protected]>
autofs: fix a leak in autofs_expire_indirect()
Chuhong Yuan <[email protected]>
serial: ifx6x60: add missed pm_runtime_disable
Jiangfeng Xiao <[email protected]>
serial: serial_core: Perform NULL checks for break_ctl ops
Vincent Whitchurch <[email protected]>
serial: pl011: Fix DMA ->flush_buffer()
Jeffrey Hugo <[email protected]>
tty: serial: msm_serial: Fix flow control
Peng Fan <[email protected]>
tty: serial: fsl_lpuart: use the sg count from dma_map_sg
Michał Mirosław <[email protected]>
usb: gadget: u_serial: add missing port entry locking
Jon Hunter <[email protected]>
arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator
-------------
Diffstat:
.../devicetree/bindings/rtc/abracon,abx80x.txt | 2 +- Makefile | 15 ++-- arch/arm/Kconfig.debug | 23 ++++-- arch/arm/boot/dts/arm-realview-pb1176.dts | 4 +- arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 +- arch/arm/boot/dts/arm-realview-pbx.dtsi | 5 +- arch/arm/boot/dts/exynos3250.dtsi | 2 +- arch/arm/boot/dts/mmp2.dtsi | 2 +- arch/arm/boot/dts/omap3-pandora-common.dtsi | 36 ++++++++- arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +- arch/arm/boot/dts/pxa27x.dtsi | 2 +- arch/arm/boot/dts/pxa2xx.dtsi | 7 -- arch/arm/boot/dts/pxa3xx.dtsi | 2 +- arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +- arch/arm/boot/dts/s3c6410-mini6410.dts | 4 + arch/arm/boot/dts/s3c6410-smdk6410.dts | 4 + arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- arch/arm/include/asm/uaccess.h | 18 +++++ arch/arm/lib/getuser.S | 11 +++ arch/arm/lib/putuser.S | 20 ++--- arch/arm/mach-omap1/id.c | 6 +- arch/arm/mach-omap2/id.c | 4 +- arch/arm/mach-omap2/pdata-quirks.c | 93 ---------------------- arch/arm/mach-tegra/reset-handler.S | 6 +- arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +- arch/mips/Kconfig | 1 + arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 2 +- arch/mips/cavium-octeon/octeon-platform.c | 2 +- arch/mips/include/asm/octeon/cvmx-pko.h | 2 +- arch/powerpc/include/asm/sfp-machine.h | 92 +++++++-------------- arch/powerpc/include/asm/vdso_datapage.h | 2 + arch/powerpc/kernel/asm-offsets.c | 2 +- arch/powerpc/kernel/time.c | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +- arch/powerpc/kernel/vdso64/cacheflush.S | 4 +- arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +- arch/x86/kernel/cpu/mcheck/mce.c | 30 ------- arch/x86/kernel/cpu/mcheck/mce_amd.c | 36 +++++++++ arch/x86/kvm/cpuid.c | 5 +- arch/x86/kvm/x86.c | 14 +++- arch/x86/pci/fixup.c | 11 +++ arch/xtensa/mm/tlb.c | 4 +- block/blk-mq-sysfs.c | 15 ++-- crypto/crypto_user.c | 4 +- crypto/ecc.c | 3 +- drivers/acpi/bus.c | 2 +- drivers/acpi/device_pm.c | 12 ++- drivers/acpi/osl.c | 28 ++++--- drivers/block/rsxx/core.c | 2 + drivers/char/ppdev.c | 16 +++- drivers/clk/rockchip/clk-rk3188.c | 8 +- drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 2 +- drivers/cpuidle/driver.c | 15 ++-- drivers/crypto/amcc/crypto4xx_core.c | 6 +- drivers/crypto/ccp/ccp-dmaengine.c | 1 + drivers/devfreq/devfreq.c | 12 ++- drivers/dma-buf/sync_file.c | 2 +- drivers/dma/coh901318.c | 5 -- drivers/extcon/extcon-max8997.c | 10 +-- drivers/firmware/qcom_scm-64.c | 2 +- drivers/gpu/drm/i810/i810_dma.c | 4 +- drivers/gpu/drm/radeon/r100.c | 4 +- drivers/gpu/drm/radeon/r200.c | 4 +- .../hwtracing/coresight/coresight-etm4x-sysfs.c | 21 +++-- drivers/i2c/busses/i2c-imx.c | 3 +- drivers/iio/humidity/hdc100x.c | 2 +- drivers/iio/imu/adis16480.c | 1 + drivers/infiniband/hw/hns/hns_roce_hem.h | 2 +- drivers/infiniband/hw/mlx4/sysfs.c | 12 +-- drivers/infiniband/hw/qib/qib_sysfs.c | 6 ++ drivers/input/touchscreen/cyttsp4_core.c | 7 -- drivers/input/touchscreen/goodix.c | 9 +++ drivers/isdn/gigaset/usb-gigaset.c | 23 ++++-- drivers/md/persistent-data/dm-btree-remove.c | 8 +- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +- drivers/media/radio/radio-wl1273.c | 3 +- drivers/media/usb/stkwebcam/stk-webcam.c | 6 +- drivers/misc/altera-stapl/altera.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 30 +++++++ drivers/mtd/devices/spear_smi.c | 38 ++++++++- drivers/net/can/slcan.c | 1 + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 6 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 5 +- drivers/net/ethernet/intel/e100.c | 4 +- drivers/net/ethernet/mellanox/mlx4/main.c | 11 ++- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/qp.c | 4 +- drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- drivers/net/ethernet/stmicro/stmmac/descs_com.h | 23 ++++-- drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 +- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 10 ++- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 10 ++- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 ++--- drivers/net/ethernet/ti/cpsw.c | 2 +- drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- drivers/net/wireless/ath/ath10k/pci.c | 9 ++- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 15 ++++ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 9 ++- .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 1 + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 25 +++++- .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 2 + drivers/nfc/nxp-nci/i2c.c | 6 +- drivers/nvme/host/core.c | 4 +- drivers/pci/msi.c | 2 +- drivers/pci/quirks.c | 2 +- drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 23 ++++-- drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +- drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 3 + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++- drivers/regulator/core.c | 42 +++------- drivers/rtc/rtc-max8997.c | 2 +- drivers/s390/scsi/zfcp_dbf.c | 8 +- drivers/s390/scsi/zfcp_erp.c | 3 - drivers/scsi/libiscsi.c | 4 +- drivers/scsi/lpfc/lpfc.h | 3 +- drivers/scsi/lpfc/lpfc_attr.c | 12 ++- drivers/scsi/lpfc/lpfc_init.c | 3 + drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 15 ++-- drivers/scsi/qla2xxx/qla_target.c | 11 +-- drivers/spi/spi-atmel.c | 6 +- drivers/staging/iio/addac/adt7316-i2c.c | 2 + drivers/staging/media/pulse8-cec/pulse8-cec.c | 2 +- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- drivers/staging/rtl8712/usb_intf.c | 2 +- drivers/thermal/thermal_core.c | 4 +- drivers/tty/n_hdlc.c | 4 +- drivers/tty/n_r3964.c | 2 +- drivers/tty/n_tty.c | 8 +- drivers/tty/serial/amba-pl011.c | 6 +- drivers/tty/serial/fsl_lpuart.c | 4 +- drivers/tty/serial/ifx6x60.c | 3 + drivers/tty/serial/imx.c | 2 +- drivers/tty/serial/msm_serial.c | 6 +- drivers/tty/serial/serial_core.c | 2 +- drivers/tty/tty_ldisc.c | 7 ++ drivers/tty/vt/keyboard.c | 2 +- drivers/usb/atm/ueagle-atm.c | 18 +++-- drivers/usb/core/hub.c | 5 +- drivers/usb/core/urb.c | 1 + drivers/usb/dwc3/core.c | 3 +- drivers/usb/gadget/configfs.c | 1 + drivers/usb/gadget/function/u_serial.c | 2 + drivers/usb/host/xhci-hub.c | 16 +++- drivers/usb/host/xhci-mem.c | 4 + drivers/usb/host/xhci-pci.c | 13 +++ drivers/usb/host/xhci-ring.c | 6 +- drivers/usb/host/xhci.c | 7 +- drivers/usb/host/xhci.h | 2 + drivers/usb/misc/adutux.c | 2 +- drivers/usb/misc/idmouse.c | 2 +- drivers/usb/mon/mon_bin.c | 32 +++++--- drivers/usb/serial/io_edgeport.c | 10 ++- drivers/usb/storage/uas.c | 10 +++ drivers/vfio/pci/vfio_pci_intrs.c | 2 +- drivers/video/hdmi.c | 8 +- drivers/virtio/virtio_balloon.c | 11 +++ fs/autofs4/expire.c | 5 +- fs/btrfs/file.c | 2 +- fs/btrfs/free-space-cache.c | 6 ++ fs/btrfs/inode.c | 3 + fs/btrfs/send.c | 25 +++++- fs/btrfs/volumes.h | 1 - fs/cifs/file.c | 14 +++- fs/cifs/smb2misc.c | 7 +- fs/dlm/lockspace.c | 1 + fs/dlm/memory.c | 9 +-- fs/dlm/user.c | 3 +- fs/exportfs/expfs.c | 31 +++++--- fs/ext2/inode.c | 7 +- fs/ext4/inode.c | 12 ++- fs/fuse/dir.c | 27 +++++-- fs/fuse/fuse_i.h | 2 + fs/nfsd/nfs4recover.c | 17 ++-- fs/nfsd/vfs.c | 17 +++- fs/ocfs2/quota_global.c | 2 +- fs/quota/dquot.c | 11 +-- fs/reiserfs/inode.c | 12 ++- fs/reiserfs/namei.c | 7 +- fs/reiserfs/reiserfs.h | 2 + fs/reiserfs/super.c | 2 + fs/reiserfs/xattr.c | 19 +++-- fs/reiserfs/xattr_acl.c | 4 +- include/linux/acpi.h | 2 +- include/linux/atalk.h | 2 +- include/linux/dma-mapping.h | 3 +- include/linux/jbd2.h | 4 +- include/linux/mtd/mtd.h | 2 +- include/linux/netdevice.h | 5 ++ include/linux/quotaops.h | 10 +++ include/linux/regulator/consumer.h | 2 +- include/linux/serial_core.h | 37 ++++++++- include/linux/time.h | 12 +++ include/linux/tty.h | 7 ++ include/math-emu/soft-fp.h | 2 +- include/net/ip.h | 5 ++ include/net/tcp.h | 18 +++-- kernel/audit_watch.c | 2 +- kernel/cgroup_pids.c | 11 +-- kernel/module.c | 2 + kernel/sched/fair.c | 36 +++++---- kernel/workqueue.c | 38 +++++++-- lib/raid6/unroll.awk | 2 +- mm/shmem.c | 2 +- net/appletalk/aarp.c | 15 +++- net/appletalk/ddp.c | 21 +++-- net/bridge/br_device.c | 6 ++ net/core/dev.c | 3 +- net/ipv4/devinet.c | 5 -- net/ipv4/ip_output.c | 14 ++-- net/ipv4/tcp_output.c | 5 +- net/ipv4/tcp_timer.c | 10 +-- net/openvswitch/conntrack.c | 11 +++ net/sunrpc/cache.c | 6 -- net/tipc/core.c | 29 +++---- net/x25/af_x25.c | 18 +++-- scripts/mod/modpost.c | 12 +++ sound/core/oss/linear.c | 2 + sound/core/oss/mulaw.c | 2 + sound/core/oss/route.c | 2 + sound/core/pcm_lib.c | 8 +- sound/pci/hda/hda_bind.c | 4 + sound/pci/hda/hda_intel.c | 3 + sound/soc/soc-jack.c | 3 +- 225 files changed, 1265 insertions(+), 749 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 48/199 nfsd: fix a warning in __cld_pipe_upcall()
From: Scott Mayhew <[email protected]>
[ Upstream commit b493fd31c0b89d9453917e977002de58bebc3802 ]
__cld_pipe_upcall() emits a "do not call blocking ops when !TASK_RUNNING" warning due to the dput() call in rpc_queue_upcall(). Fix it by using a completion instead of hand coding the wait.
--- fs/nfsd/nfs4recover.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
fs/nfsd/nfs4recover.c +6 -11
@@ -661,7 +661,7 @@ struct cld_net {struct cld_upcall {struct list_head cu_list;struct cld_net *cu_net; -struct task_struct *cu_task; +struct completion cu_done;struct cld_msg cu_msg; };
@@ -670,23 +670,18 @@ __cld_pipe_upcall(struct rpc_pipe *pipe, struct cld_msg *cmsg) {int ret;struct rpc_pipe_msg msg; + struct cld_upcall *cup = container_of(cmsg, struct cld_upcall, cu_msg);memset (&msg,0 ,sizeof (msg)); msg.data = cmsg; msg.len =sizeof (*cmsg); -/* -* Set task state before we queue the upcall. That prevents -* wake_up_process in the downcall from racing with schedule. -*/ -set_current_state (TASK_UNINTERRUPTIBLE ); ret =rpc_queue_upcall (pipe, &msg);if (ret <0 ) { -set_current_state (TASK_RUNNING ); goto out; } -schedule (); +wait_for_completion (&cup->cu_done);if (msg.errno <0 ) ret = msg.errno;
@@ -753,7 +748,7 @@ cld_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)if (copy_from_user (&cup->cu_msg, src, mlen) !=0 )return -EFAULT ; -wake_up_process (cup->cu_task); +complete (&cup->cu_done);return mlen; }
@@ -768,7 +763,7 @@ cld_pipe_destroy_msg(struct rpc_pipe_msg *msg)if (msg->errno >=0 )return ; -wake_up_process (cup->cu_task); +complete (&cup->cu_done); }static const struct rpc_pipe_ops cld_upcall_ops = {
@@ -899,7 +894,7 @@ restart_search: goto restart_search; } } - new->cu_task = current; +init_completion (&new->cu_done); new->cu_msg.cm_vers =CLD_UPCALL_VERSION ;put_unaligned (cn->cn_xid++, &new->cu_msg.cm_xid); new->cu_net = cn;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/199 ARM: OMAP1/2: fix SoC name printing
In reply to Greg Kroah-HartmanFrom: Aaro Koskinen <[email protected]>
[ Upstream commit 04a92358b3964988c78dfe370a559ae550383886 ]
Currently we get extra newlines on OMAP1/2 when the SoC name is printed:
[ 0.000000] OMAP1510 [ 0.000000] revision 2 handled as 15xx id: bc058c9b93111a16
[ 0.000000] OMAP2420 [ 0.000000]
Fix by using pr_cont.
--- arch/arm/mach-omap1/id.c | 6 +++--- arch/arm/mach-omap2/id.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-omap1/id.c +3 -3
@@ -200,10 +200,10 @@ void __init omap_check_revision(void)printk (KERN_INFO "Unknown OMAP cpu type: 0x%02x\n" , cpu_type); } -printk (KERN_INFO "OMAP%04x" , omap_revision >>16 ); +pr_info ("OMAP%04x" , omap_revision >>16 );if ((omap_revision >>8 ) &0xff ) -printk (KERN_INFO "%x" , (omap_revision >>8 ) &0xff ); -printk (KERN_INFO " revision %i handled as %02xxx id: %08x%08x\n" , +pr_cont ("%x" , (omap_revision >>8 ) &0xff ); +pr_cont (" revision %i handled as %02xxx id: %08x%08x\n" , die_rev, omap_revision &0xff , system_serial_low, system_serial_high); }
arch/arm/mach-omap2/id.c +2 -2
@@ -199,8 +199,8 @@ void __init omap2xxx_check_revision(void)pr_info ("%s" , soc_name);if ((omap_rev () >>8 ) &0x0f ) -pr_info ("%s" , soc_rev); -pr_info ("\n" ); +pr_cont ("%s" , soc_rev); +pr_cont ("\n" ); }#define OMAP3_SHOW_FEATURE (feat) \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/199 net/x25: fix null_x25_address handling
In reply to Greg Kroah-HartmanFrom: Martin Schiller <[email protected]>
[ Upstream commit 06137619f061f498c2924f6543fa45b7d39f0501 ]
o x25_find_listener(): the compare for the null_x25_address was wrong. We have to check the x25_addr of the listener socket instead of the x25_addr of the incomming call.
o x25_bind(): it was not possible to bind a socket to null_x25_address
--- net/x25/af_x25.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
net/x25/af_x25.c +10 -6
@@ -288,7 +288,7 @@ static struct sock *x25_find_listener(struct x25_address *addr,sk_for_each (s, &x25_list)if ((!strcmp (addr->x25_addr,x25_sk (s)->source_addr.x25_addr) || - !strcmp (addr->x25_addr, + !strcmp (x25_sk (s)->source_addr.x25_addr, null_x25_address.x25_addr)) && s->sk_state ==TCP_LISTEN ) {/*
@@ -684,11 +684,15 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) goto out; } - len =strlen (addr->sx25_addr.x25_addr); -for (i =0 ; i < len; i++) { -if (!isdigit (addr->sx25_addr.x25_addr[i])) { - rc = -EINVAL ; - goto out; +/* check for the null_x25_address */ +if (strcmp (addr->sx25_addr.x25_addr, null_x25_address.x25_addr)) { + + len =strlen (addr->sx25_addr.x25_addr); +for (i =0 ; i < len; i++) { +if (!isdigit (addr->sx25_addr.x25_addr[i])) { + rc = -EINVAL ; + goto out; + } } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/199 ARM: dts: mmp2: fix the gpio interrupt cell number
In reply to Greg Kroah-HartmanFrom: Lubomir Rintel <[email protected]>
[ Upstream commit 400583983f8a8e95ec02c9c9e2b50188753a87fb ]
gpio-pxa uses two cell to encode the interrupt source: the pin number and the trigger type. Adjust the device node accordingly.
--- arch/arm/boot/dts/mmp2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mmp2.dtsi +1 -1
@@ -180,7 +180,7 @@ clocks = <&soc_clocks MMP2_CLK_GPIO>; resets = <&soc_clocks MMP2_CLK_GPIO>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; ranges; gcb0: gpio@d4019000 {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/199 ARM: dts: realview-pbx: Fix duplicate regulator nodes
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 7f4b001b7f6e0480b5bdab9cd8ce1711e43e5cb5 ]
There's a bug in dtc in checking for duplicate node names when there's another section (e.g. "/ { };"). In this case, skeleton.dtsi provides another section. Upon removal of skeleton.dtsi, the dtb fails to build due to a duplicate node 'fixedregulator@0'. As both nodes were pretty much the same 3.3V fixed regulator, it hasn't really mattered. Fix this by renaming the nodes to something unique. In the process, drop the unit-address which shouldn't be present wtihout reg property.
--- arch/arm/boot/dts/arm-realview-pbx.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/arm/boot/dts/arm-realview-pbx.dtsi +2 -3
@@ -43,7 +43,7 @@ }; /* The voltage to the MMC card is hardwired at 3.3V */ - vmmc: fixedregulator@0 { + vmmc: regulator-vmmc { compatible = "regulator-fixed"; regulator-name = "vmmc"; regulator-min-microvolt = <3300000>;
@@ -51,7 +51,7 @@ regulator-boot-on; }; - veth: fixedregulator@0 { + veth: regulator-veth { compatible = "regulator-fixed"; regulator-name = "veth"; regulator-min-microvolt = <3300000>;
@@ -539,4 +539,3 @@ }; }; }; -
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/199 tcp: fix SNMP TCP timeout under-estimation
In reply to Greg Kroah-HartmanFrom: Yuchung Cheng <[email protected]>
[ Upstream commit e1561fe2dd69dc5dddd69bd73aa65355bdfb048b ]
Previously the SNMP TCPTIMEOUTS counter has inconsistent accounting:
1. It counts all SYN and SYN-ACK timeouts
2. It counts timeouts in other states except recurring timeouts and timeouts after fast recovery or disorder state.
Such selective accounting makes analysis difficult and complicated. For example the monitoring system needs to collect many other SNMP counters to infer the total amount of timeout events. This patch makes TCPTIMEOUTS counter simply counts all the retransmit timeout (SYN or data or FIN).
--- net/ipv4/tcp_timer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/ipv4/tcp_timer.c +4 -4
@@ -478,11 +478,12 @@ void tcp_retransmit_timer(struct sock *sk) goto out_reset_timer; } +__NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPTIMEOUTS );if (tcp_write_timeout (sk)) goto out;if (icsk->icsk_retransmits ==0 ) { -int mib_idx; +int mib_idx =0 ;if (icsk->icsk_ca_state == TCP_CA_Recovery) {if (tcp_is_sack (tp))
@@ -497,10 +498,9 @@ void tcp_retransmit_timer(struct sock *sk) mib_idx =LINUX_MIB_TCPSACKFAILURES ; else mib_idx =LINUX_MIB_TCPRENOFAILURES ; - }else { - mib_idx =LINUX_MIB_TCPTIMEOUTS ; } -__NET_INC_STATS (sock_net (sk), mib_idx); +if (mib_idx) +__NET_INC_STATS (sock_net (sk), mib_idx); }tcp_enter_loss (sk);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/199 kbuild: fix single target build for external module
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit e07db28eea38ed4e332b3a89f3995c86b713cb5b ]
Building a single target in an external module fails due to missing .tmp_versions directory.
For example,
$ make -C /lib/modules/$(uname -r)/build M=$PWD foo.o
will fail in the following way:
CC [M] /home/masahiro/foo/foo.o/bin/sh: 1: cannot create /home/masahiro/foo/.tmp_versions/foo.mod: Directory nonexistent
This is because $(cmd_crmodverdir) is executed only before building /, %/, %.ko single targets of external modules. Create .tmp_versions in the 'prepare' target.
--- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
Makefile +3 -8
@@ -1521,9 +1521,6 @@ else # KBUILD_EXTMOD # We are always building modules KBUILD_MODULES := 1 -PHONY += crmodverdir -crmodverdir: - $(cmd_crmodverdir) PHONY += $(objtree)/Module.symvers $(objtree)/Module.symvers:
@@ -1535,7 +1532,7 @@ $(objtree)/Module.symvers: module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD)) PHONY += $(module-dirs) modules -$(module-dirs): crmodverdir $(objtree)/Module.symvers +$(module-dirs): prepare $(objtree)/Module.symvers $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) modules: $(module-dirs)
@@ -1576,7 +1573,8 @@ help: # Dummies... PHONY += prepare scripts -prepare: ; +prepare: + $(cmd_crmodverdir) scripts: ; endif # KBUILD_EXTMOD
@@ -1701,17 +1699,14 @@ endif # Modules /: prepare scripts FORCE - $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) # Make sure the latest headers are built for Documentation Documentation/ samples/: headers_install %/: prepare scripts FORCE - $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) %.ko: prepare scripts FORCE - $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) $(@:.ko=.o) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/199 usb: dwc3: dont log probe deferrals; but do log other error codes
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
[ Upstream commit 408d3ba006af57380fa48858b39f72fde6405031 ]
It's not very useful to repeat a bunch of probe deferral errors. And it's also not very useful to log "failed" without telling the error code.
--- drivers/usb/dwc3/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/dwc3/core.c +2 -1
@@ -1102,7 +1102,8 @@ static int dwc3_probe(struct platform_device *pdev) ret =dwc3_core_init (dwc);if (ret) { -dev_err (dev,"failed to initialize core\n" ); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"failed to initialize core: %d\n" , ret); goto err4; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/199 mtd: fix mtd_oobavail() incoherent returned value
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 4348433d8c0234f44adb6e12112e69343f50f0c5 ]
mtd_oobavail() returns either mtd->oovabail or mtd->oobsize. Both values are unsigned 32-bit entities, so there is no reason to pretend returning a signed one.
--- include/linux/mtd/mtd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mtd/mtd.h +1 -1
@@ -392,7 +392,7 @@ static inline struct device_node *mtd_get_of_node(struct mtd_info *mtd)return mtd->dev.of_node; } -static inline int mtd_oobavail (struct mtd_info *mtd,struct mtd_oob_ops *ops) +static inline u32 mtd_oobavail (struct mtd_info *mtd,struct mtd_oob_ops *ops) {return ops->mode ==MTD_OPS_AUTO_OOB ? mtd->oobavail : mtd->oobsize; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/199 ARM: dts: pxa: clean up USB controller nodes
In reply to Greg Kroah-HartmanFrom: Daniel Mack <[email protected]>
[ Upstream commit c40ad24254f1dbd54f2df5f5f524130dc1862122 ]
PXA25xx SoCs don't have a USB controller, so drop the node from the common pxa2xx.dtsi base file. Both pxa27x and pxa3xx have a dedicated node already anyway.
While at it, unify the names for the nodes across all pxa platforms.
--- arch/arm/boot/dts/pxa27x.dtsi | 2 +- arch/arm/boot/dts/pxa2xx.dtsi | 7 ------- arch/arm/boot/dts/pxa3xx.dtsi | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-)
arch/arm/boot/dts/pxa27x.dtsi +1 -1
@@ -34,7 +34,7 @@ clocks = <&clks CLK_NONE>; }; - pxa27x_ohci: usb@4c000000 { + usb0: usb@4c000000 { compatible = "marvell,pxa-ohci"; reg = <0x4c000000 0x10000>; interrupts = <3>;
arch/arm/boot/dts/pxa2xx.dtsi +0 -7
@@ -117,13 +117,6 @@ status = "disabled"; }; - usb0: ohci@4c000000 { - compatible = "marvell,pxa-ohci"; - reg = <0x4c000000 0x10000>; - interrupts = <3>; - status = "disabled"; - }; - mmc0: mmc@41100000 { compatible = "marvell,pxa-mmc"; reg = <0x41100000 0x1000>;
arch/arm/boot/dts/pxa3xx.dtsi +1 -1
@@ -187,7 +187,7 @@ status = "disabled"; }; - pxa3xx_ohci: usb@4c000000 { + usb0: usb@4c000000 { compatible = "marvell,pxa-ohci"; reg = <0x4c000000 0x10000>; interrupts = <3>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/199 ARM: dts: realview: Fix some more duplicate regulator nodes
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit f3b2f758ec1e6cdb13c925647cbd8ad4938b78fb ]
There's a bug in dtc in checking for duplicate node names when there's another section (e.g. "/ { };"). In this case, skeleton.dtsi provides another section. Upon removal of skeleton.dtsi, the dtb fails to build due to a duplicate node 'fixedregulator@0'. As both nodes were pretty much the same 3.3V fixed regulator, it hasn't really mattered. Fix this by renaming the nodes to something unique. In the process, drop the unit-address which shouldn't be present wtihout reg property.
--- arch/arm/boot/dts/arm-realview-pb1176.dts | 4 ++-- arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/arm-realview-pb1176.dts +2 -2
@@ -45,7 +45,7 @@ }; /* The voltage to the MMC card is hardwired at 3.3V */ - vmmc: fixedregulator@0 { + vmmc: regulator-vmmc { compatible = "regulator-fixed"; regulator-name = "vmmc"; regulator-min-microvolt = <3300000>;
@@ -53,7 +53,7 @@ regulator-boot-on; }; - veth: fixedregulator@0 { + veth: regulator-veth { compatible = "regulator-fixed"; regulator-name = "veth"; regulator-min-microvolt = <3300000>;
arch/arm/boot/dts/arm-realview-pb11mp.dts +2 -2
@@ -145,7 +145,7 @@ }; /* The voltage to the MMC card is hardwired at 3.3V */ - vmmc: fixedregulator@0 { + vmmc: regulator-vmmc { compatible = "regulator-fixed"; regulator-name = "vmmc"; regulator-min-microvolt = <3300000>;
@@ -153,7 +153,7 @@ regulator-boot-on; }; - veth: fixedregulator@0 { + veth: regulator-veth { compatible = "regulator-fixed"; regulator-name = "veth"; regulator-min-microvolt = <3300000>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/199 dlm: fix invalid cluster name warning
In reply to Greg Kroah-HartmanFrom: David Teigland <[email protected]>
[ Upstream commit 3595c559326d0b660bb088a88e22e0ca630a0e35 ]
The warning added in commit 3b0e761ba83
"dlm: print log message when cluster name is not set"
did not account for the fact that lockspaces created from userland do not supply a cluster name, so bogus warnings are printed every time a userland lockspace is created.
--- fs/dlm/user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/dlm/user.c +2 -1
@@ -25,6 +25,7 @@#include "lvb_table.h" #include "user.h" #include "ast.h" +#include "config.h" static const char name_prefix[] ="dlm" ;static const struct file_operations device_fops;
@@ -402,7 +403,7 @@ static int device_create_lockspace(struct dlm_lspace_params *params)if (!capable (CAP_SYS_ADMIN ))return -EPERM ; - error =dlm_new_lockspace (params->name,NULL , params->flags, + error =dlm_new_lockspace (params->name, dlm_config.ci_cluster_name, params->flags,DLM_USER_LVB_LEN ,NULL ,NULL ,NULL , &lockspace);if (error)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/199 net/mlx4_core: Fix return codes of unsupported operations
In reply to Greg Kroah-HartmanFrom: Erez Alfasi <[email protected]>
[ Upstream commit 95aac2cdafd8c8298c9b2589c52f44db0d824e0e ]
Functions __set_port_type and mlx4_check_port_params returned -EINVAL while the proper return code is -EOPNOTSUPP as a result of an unsupported operation. All drivers should generate this and all users should check for it when detecting an unsupported functionality.
--- drivers/net/ethernet/mellanox/mlx4/main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx4/main.c +5 -6
@@ -198,7 +198,7 @@ int mlx4_check_port_params(struct mlx4_dev *dev,for (i =0 ; i < dev->caps.num_ports -1 ; i++) {if (port_type[i] != port_type[i +1 ]) {mlx4_err (dev,"Only same port types supported on this HCA, aborting\n" ); -return -EINVAL ; +return -EOPNOTSUPP ; } } }
@@ -207,7 +207,7 @@ int mlx4_check_port_params(struct mlx4_dev *dev,if (!(port_type[i] & dev->caps.supported_type[i+1 ])) {mlx4_err (dev,"Requested port type for port %d is not supported on this HCA\n" , i +1 ); -return -EINVAL ; +return -EOPNOTSUPP ; } }return 0 ;
@@ -1122,8 +1122,7 @@ static int __set_port_type(struct mlx4_port_info *info,mlx4_err (mdev,"Requested port type for port %d is not supported on this HCA\n" , info->port); - err = -EINVAL ; - goto err_sup; +return -EOPNOTSUPP ; }mlx4_stop_sense (mdev);
@@ -1145,7 +1144,7 @@ static int __set_port_type(struct mlx4_port_info *info,for (i =1 ; i <= mdev->caps.num_ports; i++) {if (mdev->caps.possible_type[i] ==MLX4_PORT_TYPE_AUTO ) { mdev->caps.possible_type[i] = mdev->caps.port_type[i]; - err = -EINVAL ; + err = -EOPNOTSUPP ; } } }
@@ -1171,7 +1170,7 @@ static int __set_port_type(struct mlx4_port_info *info, out:mlx4_start_sense (mdev);mutex_unlock (&priv->port_mutex); -err_sup: +return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/199 MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition
In reply to Greg Kroah-HartmanFrom: Aaro Koskinen <[email protected]>
[ Upstream commit 1c6121c39677175bd372076020948e184bad4b6b ]
cn58xx is compatible with cn50xx, so use the latter.
--- arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 2 +- arch/mips/include/asm/octeon/cvmx-pko.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c +1 -1
@@ -266,7 +266,7 @@ int cvmx_cmd_queue_length(cvmx_cmd_queue_id_t queue_id) }else {union cvmx_pko_mem_debug8 debug8; debug8.u64 =cvmx_read_csr (CVMX_PKO_MEM_DEBUG8 ); -return debug8.cn58xx.doorbell; +return debug8.cn50xx.doorbell; }case CVMX_CMD_QUEUE_ZIP :case CVMX_CMD_QUEUE_DFA :
arch/mips/include/asm/octeon/cvmx-pko.h +1 -1
@@ -611,7 +611,7 @@ static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear, pko_reg_read_idx.s.index =cvmx_pko_get_base_queue (port_num);cvmx_write_csr (CVMX_PKO_REG_READ_IDX , pko_reg_read_idx.u64); debug8.u64 =cvmx_read_csr (CVMX_PKO_MEM_DEBUG8 ); - status->doorbell = debug8.cn58xx.doorbell; + status->doorbell = debug8.cn50xx.doorbell; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/199 nfsd: Return EPERM, not EACCES, in some SETATTR cases
In reply to Greg Kroah-HartmanFrom: zhengbin <[email protected]>
[ Upstream commit 255fbca65137e25b12bced18ec9a014dc77ecda0 ]
As the man(2) page for utime/utimes states, EPERM is returned when the second parameter of utime or utimes is not NULL, the caller's effective UID does not match the owner of the file, and the caller is not privileged.
However, in a NFS directory mounted from knfsd, it will return EACCES (from nfsd_setattr-> fh_verify->nfsd_permission). This patch fixes that.
--- fs/nfsd/vfs.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
fs/nfsd/vfs.c +15 -2
@@ -395,10 +395,23 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,bool get_write_count;bool size_change = (iap->ia_valid &ATTR_SIZE ); -if (iap->ia_valid & (ATTR_ATIME |ATTR_MTIME |ATTR_SIZE )) +if (iap->ia_valid &ATTR_SIZE ) { accmode |=NFSD_MAY_WRITE |NFSD_MAY_OWNER_OVERRIDE ; -if (iap->ia_valid &ATTR_SIZE ) ftype =S_IFREG ; + } + +/* +* If utimes(2) and friends are called with times not NULL, we should +* not set NFSD_MAY_WRITE bit. Otherwise fh_verify->nfsd_permission +* will return EACCESS, when the caller's effective UID does not match +* the owner of the file, and the caller is not privileged. In this +* situation, we should return EPERM(notify_change will return this). +*/ +if (iap->ia_valid & (ATTR_ATIME |ATTR_MTIME )) { + accmode |=NFSD_MAY_OWNER_OVERRIDE ; +if (!(iap->ia_valid & (ATTR_ATIME_SET |ATTR_MTIME_SET ))) + accmode |=NFSD_MAY_WRITE ; + }/* Callers that do fh_verify should do the fh_want_write: */ get_write_count = !fhp->fh_dentry;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/199 tty: Dont block on IO when ldisc change is pending
In reply to Greg Kroah-HartmanFrom: Dmitry Safonov <[email protected]>
[ Upstream commit c96cf923a98d1b094df9f0cf97a83e118817e31b ]
There might be situations where tty_ldisc_lock() has blocked, but there is already IO on tty and it prevents line discipline changes. It might theoretically turn into dead-lock.
Basically, provide more priority to pending tty_ldisc_lock() than to servicing reads/writes over tty.
User-visible issue was reported by Mikulas where on pa-risc with Debian 5 reboot took either 80 seconds, 3 minutes or 3:25 after proper locking in tty_reopen().
--- drivers/tty/n_hdlc.c | 4 ++-- drivers/tty/n_r3964.c | 2 +- drivers/tty/n_tty.c | 8 ++++---- drivers/tty/tty_ldisc.c | 7 +++++++ include/linux/tty.h | 7 +++++++ 5 files changed, 21 insertions(+), 7 deletions(-)
drivers/tty/n_hdlc.c +2 -2
@@ -614,7 +614,7 @@ static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file, }/* no data */ -if (file->f_flags &O_NONBLOCK ) { +if (tty_io_nonblock (tty, file)) { ret = -EAGAIN ;break ; }
@@ -681,7 +681,7 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,if (tbuf)break ; -if (file->f_flags &O_NONBLOCK ) { +if (tty_io_nonblock (tty, file)) { error = -EAGAIN ;break ; }
drivers/tty/n_r3964.c +1 -1
@@ -1080,7 +1080,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file, pMsg =remove_msg (pInfo, pClient);if (pMsg ==NULL ) {/* no messages available. */ -if (file->f_flags &O_NONBLOCK ) { +if (tty_io_nonblock (tty, file)) { ret = -EAGAIN ; goto unlock; }
drivers/tty/n_tty.c +4 -4
@@ -1704,7 +1704,7 @@ n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp,down_read (&tty->termios_rwsem); -while (1 ) { + do { /* * When PARMRK is set, each input char may take up to 3 chars * in the read buf; reduce the buffer space avail by 3x
@@ -1746,7 +1746,7 @@ n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp, fp += n; count -= n; rcvd += n; - } + }while (!test_bit (TTY_LDISC_CHANGING , &tty->flags)); tty->receive_room = room;
@@ -2213,7 +2213,7 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,break ;if (!timeout)break ; -if (file->f_flags &O_NONBLOCK ) { +if (tty_io_nonblock (tty, file)) { retval = -EAGAIN ;break ; }
@@ -2367,7 +2367,7 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file, }if (!nr)break ; -if (file->f_flags &O_NONBLOCK ) { +if (tty_io_nonblock (tty, file)) { retval = -EAGAIN ;break ; }
drivers/tty/tty_ldisc.c +7 -0
@@ -348,6 +348,11 @@ int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout) {int ret; +/* Kindly asking blocked readers to release the read side */ +set_bit (TTY_LDISC_CHANGING , &tty->flags); +wake_up_interruptible_all (&tty->read_wait); +wake_up_interruptible_all (&tty->write_wait); + ret =__tty_ldisc_lock (tty, timeout);if (!ret)return -EBUSY ;
@@ -358,6 +363,8 @@ int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)void tty_ldisc_unlock (struct tty_struct *tty) {clear_bit (TTY_LDISC_HALTED , &tty->flags); +/* Can be cleared here - ldisc_unlock will wake up writers firstly */ +clear_bit (TTY_LDISC_CHANGING , &tty->flags);__tty_ldisc_unlock (tty); }
include/linux/tty.h +7 -0
@@ -356,6 +356,7 @@ struct tty_file_private {#define TTY_NO_WRITE_SPLIT 17/* Preserve write boundaries to driver */ #define TTY_HUPPED 18/* Post driver->hangup() */ #define TTY_HUPPING 19/* Hangup in progress */ +#define TTY_LDISC_CHANGING 20/* Change pending - non-block IO */ #define TTY_LDISC_HALTED 22/* Line discipline is halted */ /* Values for tty->flow_change */
@@ -373,6 +374,12 @@ static inline void tty_set_flow_change(struct tty_struct *tty, int val)smp_mb (); } +static inline bool tty_io_nonblock (struct tty_struct *tty,struct file *file) +{ +return file->f_flags &O_NONBLOCK || +test_bit (TTY_LDISC_CHANGING , &tty->flags); +} +static inline bool tty_io_error (struct tty_struct *tty) {return test_bit (TTY_IO_ERROR , &tty->flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/199 ACPI: fix acpi_find_child_device() invocation in acpi_preset_companion()
In reply to Greg Kroah-HartmanFrom: Alexey Dobriyan <[email protected]>
[ Upstream commit f8c6d1402b89f22a3647705d63cbd171aa19a77e ]
acpi_find_child_device() accepts boolean not pointer as last argument.
--- include/linux/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/acpi.h +1 -1
@@ -77,7 +77,7 @@ static inline bool has_acpi_companion(struct device *dev)static inline void acpi_preset_companion (struct device *dev,struct acpi_device *parent,u64 addr) { -ACPI_COMPANION_SET (dev,acpi_find_child_device (parent, addr,NULL )); +ACPI_COMPANION_SET (dev,acpi_find_child_device (parent, addr, false)); }static inline const char *acpi_dev_name (struct acpi_device *adev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/199 media: stkwebcam: Bugfix for wrong return values
In reply to Greg Kroah-HartmanFrom: Andreas Pape <[email protected]>
[ Upstream commit 3c28b91380dd1183347d32d87d820818031ebecf ]
usb_control_msg returns in case of a successfully sent message the number of sent bytes as a positive number. Don't use this value as a return value for stk_camera_read_reg, as a non-zero return value is used as an error condition in some cases when stk_camera_read_reg is called.
--- drivers/media/usb/stkwebcam/stk-webcam.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/media/usb/stkwebcam/stk-webcam.c +5 -1
@@ -166,7 +166,11 @@ int stk_camera_read_reg(struct stk_camera *dev, u16 index, u8 *value) *value = *buf;kfree (buf); -return ret; + +if (ret <0 ) +return ret; +else +return 0 ; }static int stk_start_stream (struct stk_camera *dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/199 ARM: dts: sunxi: Fix PMU compatible strings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 5719ac19fc32d892434939c1756c2f9a8322e6ef ]
"arm,cortex-a15-pmu" is not a valid fallback compatible string for an Cortex-A7 PMU, so drop it.
--- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sun6i-a31.dtsi +1 -1
@@ -174,7 +174,7 @@ }; pmu { - compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; + compatible = "arm,cortex-a7-pmu"; interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
arch/arm/boot/dts/sun7i-a20.dtsi +1 -1
@@ -172,7 +172,7 @@ }; pmu { - compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; + compatible = "arm,cortex-a7-pmu"; interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/199 sched/fair: Scale bandwidth quota and period without losing quota/period ratio precision
In reply to Greg Kroah-HartmanFrom: Xuewei Zhang <[email protected]>
commit 4929a4e6faa0f13289a67cae98139e727f0d4a97 upstream.
The quota/period ratio is used to ensure a child task group won't get more bandwidth than the parent task group, and is calculated as:
normalized_cfs_quota() = [(quota_us << 20) / period_us]
If the quota/period ratio was changed during this scaling due to precision loss, it will cause inconsistency between parent and child task groups.
See below example:
A userspace container manager (kubelet) does three operations:
1) Create a parent cgroup, set quota to 1,000us and period to 10,000us.
2) Create a few children cgroups.
3) Set quota to 1,000us and period to 10,000us on a child cgroup.
These operations are expected to succeed. However, if the scaling of 147/128 happens before step 3, quota and period of the parent cgroup will be changed:
new_quota: 1148437ns, 1148us
new_period: 11484375ns, 11484us
And when step 3 comes in, the ratio of the child cgroup will be 104857, which will be larger than the parent cgroup ratio (104821), and will fail.
Scaling them by a factor of 2 will fix the problem.
--- kernel/sched/fair.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
kernel/sched/fair.c +21 -13
@@ -4391,20 +4391,28 @@ static enum hrtimer_restart sched_cfs_peif (++count >3 ) {u64 new, old =ktime_to_ns (cfs_b->period); - new = (old *147 ) /128 ;/* ~115% */ - new =min (new, max_cfs_quota_period); +/* +* Grow period by a factor of 2 to avoid losing precision. +* Precision loss in the quota/period ratio can cause __cfs_schedulable +* to fail. +*/ + new = old *2 ; +if (new < max_cfs_quota_period) { + cfs_b->period =ns_to_ktime (new); + cfs_b->quota *=2 ; - cfs_b->period =ns_to_ktime (new); - -/* since max is 1s, this is limited to 1e9^2, which fits in u64 */ - cfs_b->quota *= new; - cfs_b->quota =div64_u64 (cfs_b->quota, old); - -pr_warn_ratelimited ( -"cfs_period_timer[cpu%d]: period too short, scaling up (new cfs_period_us %lld, cfs_quota_us = %lld)\n" , -smp_processor_id (), -div_u64 (new,NSEC_PER_USEC ), -div_u64 (cfs_b->quota,NSEC_PER_USEC )); +pr_warn_ratelimited ( +"cfs_period_timer[cpu%d]: period too short, scaling up (new cfs_period_us = %lld, cfs_quota_us = %lld)\n" , +smp_processor_id (), +div_u64 (new,NSEC_PER_USEC ), +div_u64 (cfs_b->quota,NSEC_PER_USEC )); + }else { +pr_warn_ratelimited ( +"cfs_period_timer[cpu%d]: period too short, but cannot scale up without losing precision (cfs_period_us = %lld, cfs_quota_us = %lld)\n" , +smp_processor_id (), +div_u64 (old,NSEC_PER_USEC ), +div_u64 (cfs_b->quota,NSEC_PER_USEC )); + }/* reset count so we don't come right back in here */ count =0 ;
Greg Kroah-Hartman
maintainerPATCH 72/199 fuse: verify nlink
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit c634da718db9b2fac201df2ae1b1b095344ce5eb upstream.
When adding a new hard link, make sure that i_nlink doesn't overflow.
--- fs/fuse/dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/fuse/dir.c +2 -1
@@ -830,7 +830,8 @@ static int fuse_link(struct dentry *entrspin_lock (&fc->lock); fi->attr_version = ++fc->attr_version; -inc_nlink (inode); +if (likely (inode->i_nlink <UINT_MAX )) +inc_nlink (inode);spin_unlock (&fc->lock);fuse_invalidate_attr (inode);fuse_update_ctime (inode);
Greg Kroah-Hartman
maintainerPATCH 73/199 fuse: verify attributes
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit eb59bd17d2fa6e5e84fba61a5ebdea984222e6d5 upstream.
If a filesystem returns negative inode sizes, future reads on the file were causing the cpu to spin on truncate_pagecache.
Create a helper to validate the attributes. This now does two things:
- check the file mode
- check if the file size fits in i_size without overflowing
--- fs/fuse/dir.c | 24 +++++++++++++++++------- fs/fuse/fuse_i.h | 2 ++ 2 files changed, 19 insertions(+), 7 deletions(-)
fs/fuse/dir.c +17 -7
@@ -234,7 +234,8 @@ static int fuse_dentry_revalidate(structkfree (forget);if (ret == -ENOMEM ) goto out; -if (ret || (outarg.attr.mode ^ inode->i_mode) &S_IFMT ) +if (ret ||fuse_invalid_attr (&outarg.attr) || + (outarg.attr.mode ^ inode->i_mode) &S_IFMT ) goto invalid;forget_all_cached_acls (inode);
@@ -297,6 +298,12 @@ int fuse_valid_type(int m)S_ISBLK (m) ||S_ISFIFO (m) ||S_ISSOCK (m); } +bool fuse_invalid_attr (struct fuse_attr *attr) +{ +return !fuse_valid_type (attr->mode) || + attr->size >LLONG_MAX ; +} +int fuse_lookup_name (struct super_block *sb,u64 nodeid,const struct qstr *name,struct fuse_entry_out *outarg,struct inode **inode) {
@@ -328,7 +335,7 @@ int fuse_lookup_name(struct super_block err = -EIO ;if (!outarg->nodeid) goto out_put_forget; -if (!fuse_valid_type (outarg->attr.mode)) +if (fuse_invalid_attr (&outarg->attr)) goto out_put_forget; *inode = fuse_iget(sb, outarg->nodeid, outarg->generation,
@@ -451,7 +458,8 @@ static int fuse_create_open(struct inode goto out_free_ff; err = -EIO ; -if (!S_ISREG (outentry.attr.mode) ||invalid_nodeid (outentry.nodeid)) +if (!S_ISREG (outentry.attr.mode) ||invalid_nodeid (outentry.nodeid) || +fuse_invalid_attr (&outentry.attr)) goto out_free_ff; ff->fh = outopen.fh;
@@ -557,7 +565,7 @@ static int create_new_entry(struct fuse_ goto out_put_forget_req; err = -EIO ; -if (invalid_nodeid (outarg.nodeid)) +if (invalid_nodeid (outarg.nodeid) ||fuse_invalid_attr (&outarg.attr)) goto out_put_forget_req;if ((outarg.attr.mode ^ mode) &S_IFMT )
@@ -911,7 +919,8 @@ static int fuse_do_getattr(struct inode args.out.args[0 ].value = &outarg; err =fuse_simple_request (fc, &args);if (!err) { -if ((inode->i_mode ^ outarg.attr.mode) &S_IFMT ) { +if (fuse_invalid_attr (&outarg.attr) || + (inode->i_mode ^ outarg.attr.mode) &S_IFMT ) {make_bad_inode (inode); err = -EIO ; }else {
@@ -1219,7 +1228,7 @@ static int fuse_direntplus_link(struct fif (invalid_nodeid (o->nodeid))return -EIO ; -if (!fuse_valid_type (o->attr.mode)) +if (fuse_invalid_attr (&o->attr))return -EIO ; fc =get_fuse_conn (dir);
@@ -1696,7 +1705,8 @@ int fuse_do_setattr(struct dentry *dentr goto error; } -if ((inode->i_mode ^ outarg.attr.mode) &S_IFMT ) { +if (fuse_invalid_attr (&outarg.attr) || + (inode->i_mode ^ outarg.attr.mode) &S_IFMT ) {make_bad_inode (inode); err = -EIO ; goto error;
fs/fuse/fuse_i.h +2 -0
@@ -898,6 +898,8 @@ void fuse_ctl_remove_conn(struct fuse_co*/ int fuse_valid_type (int m); +bool fuse_invalid_attr (struct fuse_attr *attr); +/** * Is current process allowed to perform filesystem operation? */
Greg Kroah-Hartman
maintainerPATCH 75/199 Input: goodix - add upside-down quirk for Teclast X89 tablet
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit df5b5e555b356662a5e4a23c6774fdfce8547d54 upstream.
The touchscreen on the Teclast X89 is mounted upside down in relation to the display orientation (the touchscreen itself is mounted upright, but the display is mounted upside-down). Add a quirk for this so that we send coordinates which match the display orientation.
--- drivers/input/touchscreen/goodix.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/input/touchscreen/goodix.c +9 -0
@@ -90,6 +90,15 @@ static const unsigned long goodix_irq_flstatic const struct dmi_system_id rotated_screen[] = { #if defined(CONFIG_DMI) && defined(CONFIG_X86) { + .ident ="Teclast X89" , + .matches = { +/* tPAD is too generic, also match on bios date */ +DMI_MATCH (DMI_BOARD_VENDOR ,"TECLAST" ), +DMI_MATCH (DMI_BOARD_NAME ,"tPAD" ), +DMI_MATCH (DMI_BIOS_DATE ,"12/19/2014" ), + }, + }, + { .ident ="WinBook TW100" , .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"WinBook" ),
Greg Kroah-Hartman
maintainerPATCH 76/199 coresight: etm4x: Fix input validation for sysfs.
In reply to Greg Kroah-HartmanFrom: Mike Leach <[email protected]>
commit 2fe6899e36aa174abefd017887f9cfe0cb60c43a upstream.
A number of issues are fixed relating to sysfs input validation:-
1) bb_ctrl_store() - incorrect compare of bit select field to absolute value. Reworked per ETMv4 specification.
2) seq_event_store() - incorrect mask value - register has two event values.
3) cyc_threshold_store() - must mask with max before checking min otherwise wrapped values can set illegal value below min.
4) res_ctrl_store() - update to mask off all res0 bits.
--- drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +13 -8
@@ -667,10 +667,13 @@ static ssize_t cyc_threshold_store(strucif (kstrtoul (buf,16 , &val))return -EINVAL ; + +/* mask off max threshold before checking min value */ + val &=ETM_CYC_THRESHOLD_MASK ;if (val < drvdata->ccitmin)return -EINVAL ; - config->ccctlr = val &ETM_CYC_THRESHOLD_MASK ; + config->ccctlr = val;return size; }static DEVICE_ATTR_RW (cyc_threshold);
@@ -701,14 +704,16 @@ static ssize_t bb_ctrl_store(struct devireturn -EINVAL ;if (!drvdata->nr_addr_cmp)return -EINVAL ; +/* -* Bit[7:0] selects which address range comparator is used for -* branch broadcast control. +* Bit[8] controls include(1) / exclude(0), bits[0-7] select +* individual range comparators. If include then at least 1 +* range must be selected. */ -if (BMVAL (val,0 ,7 ) > drvdata->nr_addr_cmp) +if ((val &BIT (8 )) && (BMVAL (val,0 ,7 ) ==0 ))return -EINVAL ; - config->bb_ctrl = val; + config->bb_ctrl = val &GENMASK (8 ,0 );return size; }static DEVICE_ATTR_RW (bb_ctrl);
@@ -1341,8 +1346,8 @@ static ssize_t seq_event_store(struct despin_lock (&drvdata->spinlock); idx = config->seq_idx; -/* RST, bits[7:0] */ - config->seq_ctrl[idx] = val &0xFF ; +/* Seq control has two masks B[15:8] F[7:0] */ + config->seq_ctrl[idx] = val &0xFFFF ;spin_unlock (&drvdata->spinlock);return size; }
@@ -1597,7 +1602,7 @@ static ssize_t res_ctrl_store(struct devif (idx %2 !=0 )/* PAIRINV, bit[21] */ val &= ~BIT (21 ); - config->res_ctrl[idx] = val; + config->res_ctrl[idx] = val &GENMASK (21 ,0 );spin_unlock (&drvdata->spinlock);return size; }
Greg Kroah-Hartman
maintainerPATCH 42/199 dma-mapping: fix return type of dma_set_max_seg_size()
In reply to Greg Kroah-HartmanFrom: Niklas Söderlund <[email protected]>
[ Upstream commit c9d76d0655c06b8c1f944e46c4fd9e9cf4b331c0 ]
The function dma_set_max_seg_size() can return either 0 on success or -EIO on error. Change its return type from unsigned int to int to capture this.
--- include/linux/dma-mapping.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/linux/dma-mapping.h +1 -2
@@ -618,8 +618,7 @@ static inline unsigned int dma_get_max_seg_size(struct device *dev)return SZ_64K ; } -static inline unsigned int dma_set_max_seg_size (struct device *dev, -unsigned int size) +static inline int dma_set_max_seg_size (struct device *dev,unsigned int size) {if (dev->dma_parms) { dev->dma_parms->max_segment_size = size;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/199 CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks
In reply to Greg Kroah-HartmanFrom: Pavel Shilovsky <[email protected]>
commit 6f582b273ec23332074d970a7fb25bef835df71f upstream.
Currently when the client creates a cifsFileInfo structure for a newly opened file, it allocates a list of byte-range locks with a pointer to the new cfile and attaches this list to the inode's lock list. The latter happens before initializing all other fields, e.g. cfile->tlink. Thus a partially initialized cifsFileInfo structure becomes available to other threads that walk through the inode's lock list. One example of such a thread may be an oplock break worker thread that tries to push all cached byte-range locks. This causes NULL-pointer dereference in smb2_push_mandatory_locks() when accessing cfile->tlink:
[598428.945633] BUG: kernel NULL pointer dereference, address: 0000000000000038 ... [598428.945749] Workqueue: cifsoplockd cifs_oplock_break [cifs] [598428.945793] RIP: 0010:smb2_push_mandatory_locks+0xd6/0x5a0 [cifs] ... [598428.945834] Call Trace: [598428.945870] ? cifs_revalidate_mapping+0x45/0x90 [cifs] [598428.945901] cifs_oplock_break+0x13d/0x450 [cifs] [598428.945909] process_one_work+0x1db/0x380 [598428.945914] worker_thread+0x4d/0x400 [598428.945921] kthread+0x104/0x140 [598428.945925] ? process_one_work+0x380/0x380 [598428.945931] ? kthread_park+0x80/0x80 [598428.945937] ret_from_fork+0x35/0x40
Fix this by reordering initialization steps of the cifsFileInfo
structure: initialize all the fields first and then add the new byte-range lock list to the inode's lock list.
--- fs/cifs/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/cifs/file.c +4 -3
@@ -312,9 +312,6 @@ cifs_new_fileinfo(struct cifs_fid *fid,INIT_LIST_HEAD (&fdlocks->locks); fdlocks->cfile = cfile; cfile->llist = fdlocks; -cifs_down_write (&cinode->lock_sem); -list_add (&fdlocks->llist, &cinode->llist); -up_write (&cinode->lock_sem); cfile->count =1 ; cfile->pid = current->tgid;
@@ -338,6 +335,10 @@ cifs_new_fileinfo(struct cifs_fid *fid, oplock =0 ; } +cifs_down_write (&cinode->lock_sem); +list_add (&fdlocks->llist, &cinode->llist); +up_write (&cinode->lock_sem); +spin_lock (&tcon->open_file_lock);if (fid->pending_open->oplock !=CIFS_OPLOCK_NO_CHANGE && oplock) oplock = fid->pending_open->oplock;
Greg Kroah-Hartman
maintainerPATCH 43/199 altera-stapl: check for a null key before strcasecmping it
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 9ccb645683ef46e3c52c12c088a368baa58447d4 ]
Currently the null check on key is occurring after the strcasecmp on the key, hence there is a potential null pointer dereference on key. Fix this by checking if key is null first. Also replace the == 0 check on strcasecmp with just the ! operator.
Detected by CoverityScan, CID#1248787 ("Dereference before null check")
--- drivers/misc/altera-stapl/altera.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/misc/altera-stapl/altera.c +1 -2
@@ -2176,8 +2176,7 @@ static int altera_get_note(u8 *p, s32 program_size, key_ptr = &p[note_strings +get_unaligned_be32 ( &p[note_table + (8 * i)])]; -if ((strncasecmp (key, key_ptr,strlen (key_ptr)) ==0 ) && - (key !=NULL )) { +if (key && !strncasecmp (key, key_ptr,strlen (key_ptr))) { status =0 ; value_ptr = &p[note_strings +
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/199 i2c: imx: dont print error message on probe defer
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
[ Upstream commit fece4978510e43f09c8cd386fee15210e8c68493 ]
Probe deferral is a normal operating condition in the probe function, so don't spam the log with an error in this case.
--- drivers/i2c/busses/i2c-imx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-imx.c +2 -1
@@ -1088,7 +1088,8 @@ static int i2c_imx_probe(struct platform_device *pdev)/* Get I2C clock */ i2c_imx->clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (i2c_imx->clk)) { -dev_err (&pdev->dev,"can't get I2C clock\n" ); +if (PTR_ERR (i2c_imx->clk) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"can't get I2C clock\n" );return PTR_ERR (i2c_imx->clk); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/199 dlm: NULL check before kmem_cache_destroy is not needed
In reply to Greg Kroah-HartmanFrom: Wen Yang <[email protected]>
[ Upstream commit f31a89692830061bceba8469607e4e4b0f900159 ]
kmem_cache_destroy(NULL) is safe, so removes NULL check before freeing the mem. This patch also fix ifnullfree.cocci warnings.
--- fs/dlm/memory.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
fs/dlm/memory.c +3 -6
@@ -38,10 +38,8 @@ int __init dlm_memory_init(void)void dlm_memory_exit (void ) { -if (lkb_cache) -kmem_cache_destroy (lkb_cache); -if (rsb_cache) -kmem_cache_destroy (rsb_cache); +kmem_cache_destroy (lkb_cache); +kmem_cache_destroy (rsb_cache); }char *dlm_allocate_lvb (struct dlm_ls *ls)
@@ -86,8 +84,7 @@ void dlm_free_lkb(struct dlm_lkb *lkb)struct dlm_user_args *ua; ua = lkb->lkb_ua;if (ua) { -if (ua->lksb.sb_lvbptr) -kfree (ua->lksb.sb_lvbptr); +kfree (ua->lksb.sb_lvbptr);kfree (ua); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/199 dmaengine: coh901318: Fix a double-lock bug
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 627469e4445b9b12e0229b3bdf8564d5ce384dd7 ]
The function coh901318_alloc_chan_resources() calls spin_lock_irqsave() before calling coh901318_config().
But coh901318_config() calls spin_lock_irqsave() again in its definition, which may cause a double-lock bug.
Because coh901318_config() is only called by coh901318_alloc_chan_resources(), the bug fix is to remove the calls to spin-lock and -unlock functions in coh901318_config().
--- drivers/dma/coh901318.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/dma/coh901318.c +0 -4
@@ -1802,8 +1802,6 @@ static int coh901318_config(struct coh90int channel = cohc->id;void __iomem *virtbase = cohc->base->virtbase; -spin_lock_irqsave (&cohc->lock, flags); -if (param) p = param;else
@@ -1823,8 +1821,6 @@ static int coh901318_config(struct coh90coh901318_set_conf (cohc, p->config);coh901318_set_ctrl (cohc, p->ctrl_lli_last); -spin_unlock_irqrestore (&cohc->lock, flags); -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 47/199 ARM: debug: enable UART1 for socfpga Cyclone5
In reply to Greg Kroah-HartmanFrom: Clément Péron <[email protected]>
[ Upstream commit f6628486c8489e91c513b62608f89ccdb745600d ]
Cyclone5 and Arria10 doesn't have the same memory map for UART1.
Split the SOCFPGA_UART1 into 2 options to allow debugging on UART1 for Cyclone5.
--- arch/arm/Kconfig.debug | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
arch/arm/Kconfig.debug +16 -7
@@ -987,14 +987,21 @@ choice Say Y here if you want kernel low-level debugging support on SOCFPGA(Cyclone 5 and Arria 5) based platforms. - config DEBUG_SOCFPGA_UART1 + config DEBUG_SOCFPGA_ARRIA10_UART1 depends on ARCH_SOCFPGA - bool "Use SOCFPGA UART1 for low-level debug" + bool "Use SOCFPGA Arria10 UART1 for low-level debug" select DEBUG_UART_8250 help Say Y here if you want kernel low-level debugging support on SOCFPGA(Arria 10) based platforms. + config DEBUG_SOCFPGA_CYCLONE5_UART1 + depends on ARCH_SOCFPGA + bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug" + select DEBUG_UART_8250 + help + Say Y here if you want kernel low-level debugging support + on SOCFPGA(Cyclone 5 and Arria 5) based platforms. config DEBUG_SUN9I_UART0 bool "Kernel low-level debugging messages via sun9i UART0"
@@ -1534,7 +1541,8 @@ config DEBUG_UART_PHYS default 0xfe800000 if ARCH_IOP32X default 0xff690000 if DEBUG_RK32_UART2 default 0xffc02000 if DEBUG_SOCFPGA_UART0 - default 0xffc02100 if DEBUG_SOCFPGA_UART1 + default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1 + default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1 default 0xffd82340 if ARCH_IOP13XX default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0 default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2
@@ -1624,7 +1632,8 @@ config DEBUG_UART_VIRT default 0xfeb30c00 if DEBUG_KEYSTONE_UART0 default 0xfeb31000 if DEBUG_KEYSTONE_UART1 default 0xfec02000 if DEBUG_SOCFPGA_UART0 - default 0xfec02100 if DEBUG_SOCFPGA_UART1 + default 0xfec02100 if DEBUG_SOCFPGA_ARRIA10_UART1 + default 0xfec03000 if DEBUG_SOCFPGA_CYCLONE5_UART1 default 0xfec12000 if (DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE) && ARCH_MVEBU default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE default 0xfec10000 if DEBUG_SIRFATLAS7_UART0
@@ -1672,9 +1681,9 @@ config DEBUG_UART_8250_WORD depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 depends on DEBUG_UART_8250_SHIFT >= 2 default y if DEBUG_PICOXCELL_UART || \ - DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_UART1 || \ - DEBUG_KEYSTONE_UART0 || DEBUG_KEYSTONE_UART1 || \ - DEBUG_ALPINE_UART0 || \ + DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_ARRIA10_UART1 || \ + DEBUG_SOCFPGA_CYCLONE5_UART1 || DEBUG_KEYSTONE_UART0 || \ + DEBUG_KEYSTONE_UART1 || DEBUG_ALPINE_UART0 || \ DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \ DEBUG_DAVINCI_DA8XX_UART2 || \ DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/199 can: slcan: Fix use-after-free Read in slcan_open
In reply to Greg Kroah-HartmanFrom: Jouni Hogander <[email protected]>
commit 9ebd796e24008f33f06ebea5a5e6aceb68b51794 upstream.
Slcan_open doesn't clean-up device which registration failed from the slcan_devs device list. On next open this list is iterated and freed device is accessed. Fix this by calling slc_free_netdev in error path.
Driver/net/can/slcan.c is derived from slip.c. Use-after-free error was identified in slip_open by syzboz. Same bug is in slcan.c. Here is the trace from the Syzbot slip report:
__dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x197/0x210 lib/dump_stack.c:118 print_address_description.constprop.0.cold+0xd4/0x30b mm/kasan/report.c:374 __kasan_report.cold+0x1b/0x41 mm/kasan/report.c:506 kasan_report+0x12/0x20 mm/kasan/common.c:634 __asan_report_load8_noabort+0x14/0x20 mm/kasan/generic_report.c:132 sl_sync drivers/net/slip/slip.c:725 [inline] slip_open+0xecd/0x11b7 drivers/net/slip/slip.c:801 tty_ldisc_open.isra.0+0xa3/0x110 drivers/tty/tty_ldisc.c:469 tty_set_ldisc+0x30e/0x6b0 drivers/tty/tty_ldisc.c:596 tiocsetd drivers/tty/tty_io.c:2334 [inline] tty_ioctl+0xe8d/0x14f0 drivers/tty/tty_io.c:2594 vfs_ioctl fs/ioctl.c:46 [inline] file_ioctl fs/ioctl.c:509 [inline] do_vfs_ioctl+0xdb6/0x13e0 fs/ioctl.c:696 ksys_ioctl+0xab/0xd0 fs/ioctl.c:713 __do_sys_ioctl fs/ioctl.c:720 [inline] __se_sys_ioctl fs/ioctl.c:718 [inline] __x64_sys_ioctl+0x73/0xb0 fs/ioctl.c:718 do_syscall_64+0xfa/0x760 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/net/can/slcan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/can/slcan.c +1 -0
@@ -613,6 +613,7 @@ err_free_chan: sl->tty =NULL ; tty->disc_data =NULL ;clear_bit (SLF_INUSE , &sl->flags); +slc_free_netdev (sl->dev);free_netdev (sl->dev); err_exit:
Greg Kroah-Hartman
maintainerPATCH 90/199 spi: atmel: Fix CS high support
In reply to Greg Kroah-HartmanFrom: Gregory CLEMENT <[email protected]>
commit 7cbb16b2122c09f2ae393a1542fed628505b9da6 upstream.
Until a few years ago, this driver was only used with CS GPIO. The only exception is CS0 on AT91RM9200 which has to use internal CS. A limitation of the internal CS is that they don't support CS High.
So by using the CS GPIO the CS high configuration was available except for the particular case CS0 on RM9200.
When the support for the internal chip-select was added, the check of the CS high support was not updated. Due to this the driver accepts this configuration for all the SPI controller v2 (used by all SoCs excepting the AT91RM9200) whereas the hardware doesn't support it for infernal CS.
This patch fixes the test to match the hardware capabilities.
--- drivers/spi/spi-atmel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/spi/spi-atmel.c +2 -4
@@ -1209,10 +1209,8 @@ static int atmel_spi_setup(struct spi_de as =spi_master_get_devdata (spi->master);/* see notes above re chipselect */ -if (!atmel_spi_is_v2 (as) - && spi->chip_select ==0 - && (spi->mode &SPI_CS_HIGH )) { -dev_dbg (&spi->dev,"setup: can't be active-high\n" ); +if (!as->use_cs_gpios && (spi->mode &SPI_CS_HIGH )) { +dev_warn (&spi->dev,"setup: non GPIO CS can't be active-high\n" );return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 91/199 RDMA/qib: Validate ->show()/store() callbacks before calling them
In reply to Greg Kroah-HartmanFrom: Viresh Kumar <[email protected]>
commit 7ee23491b39259ae83899dd93b2a29ef0f22f0a7 upstream.
The permissions of the read-only or write-only sysfs files can be changed (as root) and the user can then try to read a write-only file or write to a read-only file which will lead to kernel crash here.
Protect against that by always validating the show/store callbacks.
--- drivers/infiniband/hw/qib/qib_sysfs.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/infiniband/hw/qib/qib_sysfs.c +6 -0
@@ -301,6 +301,9 @@ static ssize_t qib_portattr_show(structstruct qib_pportdata *ppd = container_of(kobj, struct qib_pportdata, pport_kobj); +if (!pattr->show) +return -EIO ; +return pattr->show (ppd, buf); }
@@ -312,6 +315,9 @@ static ssize_t qib_portattr_store(structstruct qib_pportdata *ppd = container_of(kobj, struct qib_pportdata, pport_kobj); +if (!pattr->store) +return -EIO ; +return pattr->store (ppd, buf, len); }
Greg Kroah-Hartman
maintainerPATCH 92/199 thermal: Fix deadlock in thermal thermal_zone_device_check
In reply to Greg Kroah-HartmanFrom: Wei Wang <[email protected]>
commit 163b00cde7cf2206e248789d2780121ad5e6a70b upstream.
1851799e1d29 ("thermal: Fix use-after-free when unregistering thermal zone device") changed cancel_delayed_work to cancel_delayed_work_sync to avoid a use-after-free issue. However, cancel_delayed_work_sync could be called insides the WQ causing deadlock.
[54109.642398] c0 1162 kworker/u17:1 D 0 11030 2 0x00000000 [54109.642437] c0 1162 Workqueue: thermal_passive_wq thermal_zone_device_check [54109.642447] c0 1162 Call trace: [54109.642456] c0 1162 __switch_to+0x138/0x158 [54109.642467] c0 1162 __schedule+0xba4/0x1434 [54109.642480] c0 1162 schedule_timeout+0xa0/0xb28 [54109.642492] c0 1162 wait_for_common+0x138/0x2e8 [54109.642511] c0 1162 flush_work+0x348/0x40c [54109.642522] c0 1162 __cancel_work_timer+0x180/0x218 [54109.642544] c0 1162 handle_thermal_trip+0x2c4/0x5a4 [54109.642553] c0 1162 thermal_zone_device_update+0x1b4/0x25c [54109.642563] c0 1162 thermal_zone_device_check+0x18/0x24 [54109.642574] c0 1162 process_one_work+0x3cc/0x69c [54109.642583] c0 1162 worker_thread+0x49c/0x7c0 [54109.642593] c0 1162 kthread+0x17c/0x1b0 [54109.642602] c0 1162 ret_from_fork+0x10/0x18 [54109.643051] c0 1162 kworker/u17:2 D 0 16245 2 0x00000000 [54109.643067] c0 1162 Workqueue: thermal_passive_wq thermal_zone_device_check [54109.643077] c0 1162 Call trace: [54109.643085] c0 1162 __switch_to+0x138/0x158 [54109.643095] c0 1162 __schedule+0xba4/0x1434 [54109.643104] c0 1162 schedule_timeout+0xa0/0xb28 [54109.643114] c0 1162 wait_for_common+0x138/0x2e8 [54109.643122] c0 1162 flush_work+0x348/0x40c [54109.643131] c0 1162 __cancel_work_timer+0x180/0x218 [54109.643141] c0 1162 handle_thermal_trip+0x2c4/0x5a4 [54109.643150] c0 1162 thermal_zone_device_update+0x1b4/0x25c [54109.643159] c0 1162 thermal_zone_device_check+0x18/0x24 [54109.643167] c0 1162 process_one_work+0x3cc/0x69c [54109.643177] c0 1162 worker_thread+0x49c/0x7c0 [54109.643186] c0 1162 kthread+0x17c/0x1b0 [54109.643195] c0 1162 ret_from_fork+0x10/0x18 [54109.644500] c0 1162 cat D 0 7766 1 0x00000001 [54109.644515] c0 1162 Call trace: [54109.644524] c0 1162 __switch_to+0x138/0x158 [54109.644536] c0 1162 __schedule+0xba4/0x1434 [54109.644546] c0 1162 schedule_preempt_disabled+0x80/0xb0 [54109.644555] c0 1162 __mutex_lock+0x3a8/0x7f0 [54109.644563] c0 1162 __mutex_lock_slowpath+0x14/0x20 [54109.644575] c0 1162 thermal_zone_get_temp+0x84/0x360 [54109.644586] c0 1162 temp_show+0x30/0x78 [54109.644609] c0 1162 dev_attr_show+0x5c/0xf0 [54109.644628] c0 1162 sysfs_kf_seq_show+0xcc/0x1a4 [54109.644636] c0 1162 kernfs_seq_show+0x48/0x88 [54109.644656] c0 1162 seq_read+0x1f4/0x73c [54109.644664] c0 1162 kernfs_fop_read+0x84/0x318 [54109.644683] c0 1162 __vfs_read+0x50/0x1bc [54109.644692] c0 1162 vfs_read+0xa4/0x140 [54109.644701] c0 1162 SyS_read+0xbc/0x144 [54109.644708] c0 1162 el0_svc_naked+0x34/0x38 [54109.845800] c0 1162 D 720.000s 1->7766->7766 cat [panic]
--- drivers/thermal/thermal_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thermal/thermal_core.c +2 -2
@@ -402,7 +402,7 @@ static void thermal_zone_device_set_pollmod_delayed_work (system_freezable_wq, &tz->poll_queue,msecs_to_jiffies (delay)); else - cancel_delayed_work_sync(&tz->poll_queue); + cancel_delayed_work(&tz->poll_queue); }static void monitor_thermal_zone (struct thermal_zone_device *tz)
@@ -2073,7 +2073,7 @@ void thermal_zone_device_unregister(strumutex_unlock (&thermal_list_lock); -thermal_zone_device_set_polling (tz,0 ); +cancel_delayed_work_sync (&tz->poll_queue);if (tz->type[0 ])device_remove_file (&tz->device, &dev_attr_type);
Greg Kroah-Hartman
maintainerPATCH 93/199 KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332)
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 433f4ba1904100da65a311033f17a9bf586b287e upstream.
The bounds check was present in KVM_GET_SUPPORTED_CPUID but not KVM_GET_EMULATED_CPUID.
--- arch/x86/kvm/cpuid.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kvm/cpuid.c +4 -1
@@ -389,7 +389,7 @@ static inline int __do_cpuid_ent(struct r = -E2BIG ; -if (*nent >= maxnent) +if (WARN_ON (*nent >= maxnent)) goto out;do_cpuid_1_ent (entry, function, index);
@@ -691,6 +691,9 @@ out:static int do_cpuid_ent (struct kvm_cpuid_entry2 *entry,u32 func,u32 idx,int *nent,int maxnent,unsigned int type) { +if (*nent >= maxnent) +return -E2BIG ; +if (type ==KVM_GET_EMULATED_CPUID )return __do_cpuid_ent_emulated (entry, func, idx, nent, maxnent);
Greg Kroah-Hartman
maintainerPATCH 94/199 appletalk: Fix potential NULL pointer dereference in unregister_snap_client
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
commit 9804501fa1228048857910a6bf23e085aade37cc upstream.
register_snap_client may return NULL, all the callers check it, but only print a warning. This will result in NULL pointer dereference in unregister_snap_client and other places.
It has always been used like this since v2.6
--- include/linux/atalk.h | 2 +- net/appletalk/aarp.c | 15 ++++++++++++--- net/appletalk/ddp.c | 20 ++++++++++++-------- 3 files changed, 25 insertions(+), 12 deletions(-)
include/linux/atalk.h +1 -1
@@ -107,7 +107,7 @@ static __inline__ struct elapaarp *aarp_#define AARP_RESOLVE_TIME (10 * HZ)extern struct datalink_proto *ddp_dl, *aarp_dl; -extern void aarp_proto_init (void ); +extern int aarp_proto_init (void );/* Inter module exports */
net/appletalk/aarp.c +12 -3
@@ -879,15 +879,24 @@ static struct notifier_block aarp_notifistatic unsigned char aarp_snap_id[] = {0x00 ,0x00 ,0x00 ,0x80 ,0xF3 }; -void __init aarp_proto_init (void ) +int __init aarp_proto_init (void ) { +int rc; + aarp_dl =register_snap_client (aarp_snap_id, aarp_rcv); -if (!aarp_dl) +if (!aarp_dl) {printk (KERN_CRIT "Unable to register AARP with SNAP.\n" ); +return -ENOMEM ; + }setup_timer (&aarp_timer, aarp_expire_timeout,0 ); aarp_timer.expires = jiffies + sysctl_aarp_expiry_time;add_timer (&aarp_timer); -register_netdevice_notifier (&aarp_notifier); + rc =register_netdevice_notifier (&aarp_notifier); +if (rc) { +del_timer_sync (&aarp_timer); +unregister_snap_client (aarp_dl); + } +return rc; }/* Remove the AARP entries associated with a device. */
net/appletalk/ddp.c +12 -8
@@ -1911,9 +1911,6 @@ static unsigned char ddp_snap_id[] = { 0EXPORT_SYMBOL (atrtr_get_dev);EXPORT_SYMBOL (atalk_find_dev_addr); -static const char atalk_err_snap[]__initconst = -KERN_CRIT "Unable to register DDP with SNAP.\n" ; -/* Called by proto.c on kernel start up */ static int __init atalk_init (void ) {
@@ -1928,17 +1925,22 @@ static int __init atalk_init(void) goto out_proto; ddp_dl =register_snap_client (ddp_snap_id, atalk_rcv); -if (!ddp_dl) -printk (atalk_err_snap); +if (!ddp_dl) { +pr_crit ("Unable to register DDP with SNAP.\n" ); + goto out_sock; + }dev_add_pack (<alk_packet_type);dev_add_pack (&ppptalk_packet_type); rc =register_netdevice_notifier (&ddp_notifier);if (rc) - goto out_sock; + goto out_snap; + + rc =aarp_proto_init (); +if (rc) + goto out_dev; -aarp_proto_init (); rc =atalk_proc_init ();if (rc) goto out_aarp;
@@ -1952,11 +1954,13 @@ out_proc:atalk_proc_exit (); out_aarp:aarp_cleanup_module (); +out_dev:unregister_netdevice_notifier (&ddp_notifier); -out_sock: +out_snap:dev_remove_pack (&ppptalk_packet_type);dev_remove_pack (<alk_packet_type);unregister_snap_client (ddp_dl); +out_sock:sock_unregister (PF_APPLETALK ); out_proto:proto_unregister (&ddp_proto);
Greg Kroah-Hartman
maintainerPATCH 96/199 usb: gadget: configfs: Fix missing spin_lock_init()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
commit 093edc2baad2c258b1f55d1ab9c63c2b5ae67e42 upstream.
The driver allocates the spinlock but not initialize it. Use spin_lock_init() on it to initialize it correctly.
This is detected by Coccinelle semantic patch.
--- drivers/usb/gadget/configfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/configfs.c +1 -0
@@ -1541,6 +1541,7 @@ static struct config_group *gadgets_make gi->composite.resume =NULL ; gi->composite.max_speed =USB_SPEED_SUPER ; +spin_lock_init (&gi->spinlock);mutex_init (&gi->lock);INIT_LIST_HEAD (&gi->string_list);INIT_LIST_HEAD (&gi->available_func);
Greg Kroah-Hartman
maintainerPATCH 97/199 USB: uas: honor flag to avoid CAPACITY16
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit bff000cae1eec750d62e265c4ba2db9af57b17e1 upstream.
Copy the support over from usb-storage to get feature parity
--- drivers/usb/storage/uas.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/storage/uas.c +4 -0
@@ -832,6 +832,10 @@ static int uas_slave_configure(struct sc sdev->wce_default_on =1 ; } +/* Some disks cannot handle READ_CAPACITY_16 */ +if (devinfo->flags &US_FL_NO_READ_CAPACITY_16 ) + sdev->no_read_capacity_16 =1 ; +/* * Some disks return the total number of blocks in response * to READ CAPACITY rather than the highest block number.
Greg Kroah-Hartman
maintainerPATCH 98/199 USB: uas: heed CAPACITY_HEURISTICS
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f upstream.
There is no need to ignore this flag. We should be as close to storage in that regard as makes sense, so honor flags whose cost is tiny.
--- drivers/usb/storage/uas.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/storage/uas.c +6 -0
@@ -845,6 +845,12 @@ static int uas_slave_configure(struct sc sdev->fix_capacity =1 ;/* +* in some cases we have to guess +*/ +if (devinfo->flags &US_FL_CAPACITY_HEURISTICS ) + sdev->guess_capacity =1 ; + +/* * Some devices don't like MODE SENSE with page=0x3f, * which is the command used for checking if a device * is write-protected. Now that we tell the sd driver
Greg Kroah-Hartman
maintainerPATCH 82/199 jbd2: Fix possible overflow in jbd2_log_space_left()
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit add3efdd78b8a0478ce423bb9d4df6bd95e8b335 upstream.
When number of free space in the journal is very low, the arithmetic in jbd2_log_space_left() could underflow resulting in very high number of free blocks and thus triggering assertion failure in transaction commit code complaining there's not enough space in the journal:
J_ASSERT(journal->j_free > 1);
Properly check for the low number of free blocks.
--- include/linux/jbd2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/jbd2.h +2 -2
@@ -1560,7 +1560,7 @@ static inline int jbd2_space_needed(jour static inline unsigned long jbd2_log_space_left(journal_t *journal) { /* Allow for rounding errors */ - unsigned long free = journal->j_free - 32; + long free = journal->j_free - 32; if (journal->j_committing_transaction) { unsigned long committing = atomic_read(&journal->
@@ -1569,7 +1569,7 @@ static inline unsigned long jbd2_log_spa/* Transaction + control blocks */ free -= committing + (committing >>JBD2_CONTROL_BLOCKS_SHIFT ); } -return free; +return max_t (long, free,0 ); }/*
Greg Kroah-Hartman
maintainerPATCH 100/199 staging: rtl8188eu: fix interface sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 74ca34118a0e05793935d804ccffcedd6eb56596 upstream.
Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -1
@@ -78,7 +78,7 @@ static struct dvobj_priv *usb_dvobj_init phost_conf = pusbd->actconfig; pconf_desc = &phost_conf->desc; - phost_iface = &usb_intf->altsetting[0 ]; + phost_iface = usb_intf->cur_altsetting; piface_desc = &phost_iface->desc; pdvobjpriv->NumInterfaces = pconf_desc->bNumInterfaces;
Greg Kroah-Hartman
maintainerPATCH 101/199 staging: rtl8712: fix interface sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit c724f776f048538ecfdf53a52b7a522309f5c504 upstream.
Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/staging/rtl8712/usb_intf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8712/usb_intf.c +1 -1
@@ -275,7 +275,7 @@ static uint r8712_usb_dvobj_init(struct pdvobjpriv->padapter = padapter; padapter->EepromAddressSize =6 ; - phost_iface = &pintf->altsetting[0 ]; + phost_iface = pintf->cur_altsetting; piface_desc = &phost_iface->desc; pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;if (pusbd->speed ==USB_SPEED_HIGH ) {
Greg Kroah-Hartman
maintainerPATCH 102/199 staging: gigaset: fix general protection fault on probe
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 53f35a39c3860baac1e5ca80bf052751cfb24a99 upstream.
Fix a general protection fault when accessing the endpoint descriptors which could be triggered by a malicious device due to missing sanity checks on the number of endpoints.
--- drivers/isdn/gigaset/usb-gigaset.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/isdn/gigaset/usb-gigaset.c +5 -0
@@ -688,6 +688,11 @@ static int gigaset_probe(struct usb_intereturn -ENODEV ; } +if (hostif->desc.bNumEndpoints <2 ) { +dev_err (&interface->dev,"missing endpoints\n" ); +return -ENODEV ; + } +dev_info (&udev->dev,"%s: Device matched ... !\n" , __func__);/* allocate memory for our device state and initialize it */
Greg Kroah-Hartman
maintainerPATCH 103/199 staging: gigaset: fix illegal free on probe errors
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 84f60ca7b326ed8c08582417493982fe2573a9ad upstream.
The driver failed to initialise its receive-buffer pointer, something which could lead to an illegal free on late probe errors.
Fix this by making sure to clear all driver data at allocation.
--- drivers/isdn/gigaset/usb-gigaset.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/isdn/gigaset/usb-gigaset.c +1 -5
@@ -574,8 +574,7 @@ static int gigaset_initcshw(struct cards {struct usb_cardstate *ucs; - cs->hw.usb = ucs = -kmalloc (sizeof (struct usb_cardstate ),GFP_KERNEL ); + cs->hw.usb = ucs =kzalloc (sizeof (struct usb_cardstate ),GFP_KERNEL );if (!ucs) {pr_err ("out of memory\n" );return -ENOMEM ;
@@ -587,9 +586,6 @@ static int gigaset_initcshw(struct cards ucs->bchars[3 ] =0 ; ucs->bchars[4 ] =0x11 ; ucs->bchars[5 ] =0x13 ; - ucs->bulk_out_buffer =NULL ; - ucs->bulk_out_urb =NULL ; - ucs->read_urb =NULL ;tasklet_init (&cs->write_tasklet, gigaset_modem_fill, (unsigned long ) cs);
Greg Kroah-Hartman
maintainerPATCH 104/199 staging: gigaset: add endpoint-type sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit ed9ed5a89acba51b82bdff61144d4e4a4245ec8a upstream.
Add missing endpoint-type sanity checks to probe.
This specifically prevents a warning in USB core on URB submission when fuzzing USB descriptors.
--- drivers/isdn/gigaset/usb-gigaset.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/isdn/gigaset/usb-gigaset.c +12 -0
@@ -708,6 +708,12 @@ static int gigaset_probe(struct usb_inte endpoint = &hostif->endpoint[0 ].desc; +if (!usb_endpoint_is_bulk_out (endpoint)) { +dev_err (&interface->dev,"missing bulk-out endpoint\n" ); + retval = -ENODEV ; + goto error; + } + buffer_size =le16_to_cpu (endpoint->wMaxPacketSize); ucs->bulk_out_size = buffer_size; ucs->bulk_out_epnum =usb_endpoint_num (endpoint);
@@ -727,6 +733,12 @@ static int gigaset_probe(struct usb_inte endpoint = &hostif->endpoint[1 ].desc; +if (!usb_endpoint_is_int_in (endpoint)) { +dev_err (&interface->dev,"missing int-in endpoint\n" ); + retval = -ENODEV ; + goto error; + } + ucs->busy =0 ; ucs->read_urb =usb_alloc_urb (0 ,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 105/199 xhci: Increase STS_HALT timeout in xhci_suspend()
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 7c67cf6658cec70d8a43229f2ce74ca1443dc95e upstream.
I've recently observed failed xHCI suspend attempt on AMD Raven Ridge system:
kernel: xhci_hcd 0000:04:00.4: WARN: xHC CMD_RUN timeout
kernel: PM: suspend_common(): xhci_pci_suspend+0x0/0xd0 returns -110
kernel: PM: pci_pm_suspend(): hcd_pci_suspend+0x0/0x30 returns -110
kernel: PM: dpm_run_callback(): pci_pm_suspend+0x0/0x150 returns -110
kernel: PM: Device 0000:04:00.4 failed to suspend async: error -110
Similar to commit ac343366846a ("xhci: Increase STS_SAVE timeout in xhci_suspend()") we also need to increase the HALT timeout to make it be able to suspend again.
--- drivers/usb/host/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci.c +1 -1
@@ -933,7 +933,7 @@ static bool xhci_pending_portevent(strucint xhci_suspend (struct xhci_hcd *xhci,bool do_wakeup) {int rc =0 ; -unsigned int delay =XHCI_MAX_HALT_USEC ; +unsigned int delay =XHCI_MAX_HALT_USEC *2 ;struct usb_hcd *hcd =xhci_to_hcd (xhci);u32 command;
Greg Kroah-Hartman
maintainerPATCH 108/199 USB: atm: ueagle-atm: add missing endpoint check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 09068c1ad53fb077bdac288869dec2435420bdc4 upstream.
Make sure that the interrupt interface has an endpoint before trying to access its endpoint descriptors to avoid dereferencing a NULL pointer.
The driver binds to the interrupt interface with interface number 0, but must not assume that this interface or its current alternate setting are the first entries in the corresponding configuration arrays.
--- drivers/usb/atm/ueagle-atm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/usb/atm/ueagle-atm.c +12 -6
@@ -2167,10 +2167,11 @@ resubmit:/* * Start the modem : init the data and start kernel thread */ -static int uea_boot (struct uea_softc *sc) +static int uea_boot (struct uea_softc *sc,struct usb_interface *intf) { -int ret, size;struct intr_pkt *intr; +int ret = -ENOMEM ; +int size;uea_enters (INS_TO_USBDEV (sc));
@@ -2195,6 +2196,11 @@ static int uea_boot(struct uea_softc *scif (UEA_CHIP_VERSION (sc) ==ADI930 )load_XILINX_firmware (sc); +if (intf->cur_altsetting->desc.bNumEndpoints <1 ) { + ret = -ENODEV ; + goto err0; + } + intr =kmalloc (size,GFP_KERNEL );if (!intr) goto err0;
@@ -2206,8 +2212,7 @@ static int uea_boot(struct uea_softc *scusb_fill_int_urb (sc->urb_int, sc->usb_dev,usb_rcvintpipe (sc->usb_dev,UEA_INTR_PIPE ), intr, size, uea_intr, sc, - sc->usb_dev->actconfig->interface[0 ]->altsetting[0 ]. - endpoint[0 ].desc.bInterval); + intf->cur_altsetting->endpoint[0 ].desc.bInterval); ret =usb_submit_urb (sc->urb_int,GFP_KERNEL );if (ret <0 ) {
@@ -2222,6 +2227,7 @@ static int uea_boot(struct uea_softc *sc sc->kthread =kthread_create (uea_kthread, sc,"ueagle-atm" );if (IS_ERR (sc->kthread)) {uea_err (INS_TO_USBDEV (sc),"failed to create thread\n" ); + ret =PTR_ERR (sc->kthread); goto err2; }
@@ -2236,7 +2242,7 @@ err1:kfree (intr); err0:uea_leaves (INS_TO_USBDEV (sc)); -return -ENOMEM ; +return ret; }/*
@@ -2597,7 +2603,7 @@ static int uea_bind(struct usbatm_data *if (ret <0 ) goto error; - ret =uea_boot (sc); + ret =uea_boot (sc, intf);if (ret <0 ) goto error_rm_grp;
Greg Kroah-Hartman
maintainerPATCH 109/199 USB: idmouse: fix interface sanity checks
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 59920635b89d74b9207ea803d5e91498d39e8b69 upstream.
Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/usb/misc/idmouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/idmouse.c +1 -1
@@ -342,7 +342,7 @@ static int idmouse_probe(struct usb_inteint result;/* check if we have gotten the data or the hid interface */ - iface_desc = &interface->altsetting[0 ]; + iface_desc = interface->cur_altsetting;if (iface_desc->desc.bInterfaceClass !=0x0A )return -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 83/199 drm/i810: Prevent underflow in ioctl
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 4f69851fbaa26b155330be35ce8ac393e93e7442 upstream.
The "used" variables here come from the user in the ioctl and it can be negative. It could result in an out of bounds write.
--- drivers/gpu/drm/i810/i810_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i810/i810_dma.c +2 -2
@@ -723,7 +723,7 @@ static void i810_dma_dispatch_vertex(strif (nbox >I810_NR_SAREA_CLIPRECTS ) nbox =I810_NR_SAREA_CLIPRECTS ; -if (used >4 *1024 ) +if (used <0 || used >4 *1024 ) used =0 ;if (sarea_priv->dirty)
@@ -1043,7 +1043,7 @@ static void i810_dma_dispatch_mc(structif (u !=I810_BUF_CLIENT )DRM_DEBUG ("MC found buffer that isn't mine!\n" ); -if (used >4 *1024 ) +if (used <0 || used >4 *1024 ) used =0 ; sarea_priv->dirty =0x7f ;
Greg Kroah-Hartman
maintainerPATCH 110/199 USB: serial: io_edgeport: fix epic endpoint lookup
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 7c5a2df3367a2c4984f1300261345817d95b71f8 upstream.
Make sure to use the current alternate setting when looking up the endpoints on epic devices to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/usb/serial/io_edgeport.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/serial/io_edgeport.c +6 -4
@@ -2852,16 +2852,18 @@ static int edge_startup(struct usb_seria response =0 ;if (edge_serial->is_epic) { +struct usb_host_interface *alt; + + alt = serial->interface->cur_altsetting; +/* EPIC thing, set up our interrupt polling now and our read * urb, so that the device knows it really is connected. */ interrupt_in_found = bulk_in_found = bulk_out_found = false; -for (i =0 ; i < serial->interface->altsetting[0 ] - .desc.bNumEndpoints; ++i) { +for (i =0 ; i < alt->desc.bNumEndpoints; ++i) {struct usb_endpoint_descriptor *endpoint;int buffer_size; - endpoint = &serial->interface->altsetting[0 ]. - endpoint[i].desc; + endpoint = &alt->endpoint[i].desc; buffer_size =usb_endpoint_maxp (endpoint);if (!interrupt_in_found && (usb_endpoint_is_int_in (endpoint))) {
Greg Kroah-Hartman
maintainerPATCH 111/199 USB: adutux: fix interface sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 3c11c4bed02b202e278c0f5c319ae435d7fb9815 upstream.
Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/usb/misc/adutux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/adutux.c +1 -1
@@ -685,7 +685,7 @@ static int adu_probe(struct usb_interfacinit_waitqueue_head (&dev->read_wait);init_waitqueue_head (&dev->write_wait); - iface_desc = &interface->altsetting[0 ]; + iface_desc = &interface->cur_altsetting[0 ];/* set up the endpoint information */ for (i =0 ; i < iface_desc->desc.bNumEndpoints; ++i) {
Greg Kroah-Hartman
maintainerPATCH 112/199 usb: core: urb: fix URB structure initialization function
In reply to Greg Kroah-HartmanFrom: Emiliano Ingrassia <[email protected]>
commit 1cd17f7f0def31e3695501c4f86cd3faf8489840 upstream.
Explicitly initialize URB structure urb_list field in usb_init_urb(). This field can be potentially accessed uninitialized and its initialization is coherent with the usage of list_del_init() in usb_hcd_unlink_urb_from_ep() and usb_giveback_urb_bh() and its explicit initialization in usb_hcd_submit_urb() error path.
--- drivers/usb/core/urb.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/core/urb.c +1 -0
@@ -40,6 +40,7 @@ void usb_init_urb(struct urb *urb)if (urb) {memset (urb,0 ,sizeof (*urb));kref_init (&urb->kref); +INIT_LIST_HEAD (&urb->urb_list);INIT_LIST_HEAD (&urb->anchor_list); } }
Greg Kroah-Hartman
maintainerPATCH 113/199 usb: mon: Fix a deadlock in usbmon between mmap and read
In reply to Greg Kroah-HartmanFrom: Pete Zaitcev <[email protected]>
commit 19e6317d24c25ee737c65d1ffb7483bdda4bb54a upstream.
The problem arises because our read() function grabs a lock of the circular buffer, finds something of interest, then invokes copy_to_user() straight from the buffer, which in turn takes mm->mmap_sem. In the same time, the callback mon_bin_vma_fault() is invoked under mm->mmap_sem. It attempts to take the fetch lock and deadlocks.
This patch does away with protecting of our page list with any semaphores, and instead relies on the kernel not close the device while mmap is active in a process.
In addition, we prohibit re-sizing of a buffer while mmap is active. This way, when (now unlocked) fault is processed, it works with the page that is intended to be mapped-in, and not some other random page. Note that this may have an ABI impact, but hopefully no legitimate program is this wrong.
--- drivers/usb/mon/mon_bin.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-)
drivers/usb/mon/mon_bin.c +21 -11
@@ -1036,12 +1036,18 @@ static long mon_bin_ioctl(struct file *fmutex_lock (&rp->fetch_lock);spin_lock_irqsave (&rp->b_lock, flags); -mon_free_buff (rp->b_vec, rp->b_size/CHUNK_SIZE ); -kfree (rp->b_vec); - rp->b_vec = vec; - rp->b_size = size; - rp->b_read = rp->b_in = rp->b_out = rp->b_cnt =0 ; - rp->cnt_lost =0 ; +if (rp->mmap_active) { +mon_free_buff (vec, size/CHUNK_SIZE ); +kfree (vec); + ret = -EBUSY ; + }else { +mon_free_buff (rp->b_vec, rp->b_size/CHUNK_SIZE ); +kfree (rp->b_vec); + rp->b_vec = vec; + rp->b_size = size; + rp->b_read = rp->b_in = rp->b_out = rp->b_cnt =0 ; + rp->cnt_lost =0 ; + }spin_unlock_irqrestore (&rp->b_lock, flags);mutex_unlock (&rp->fetch_lock); }
@@ -1213,13 +1219,21 @@ mon_bin_poll(struct file *file, struct pstatic void mon_bin_vma_open (struct vm_area_struct *vma) {struct mon_reader_bin *rp = vma->vm_private_data; +unsigned long flags; + +spin_lock_irqsave (&rp->b_lock, flags); rp->mmap_active++; +spin_unlock_irqrestore (&rp->b_lock, flags); }static void mon_bin_vma_close (struct vm_area_struct *vma) { +unsigned long flags; +struct mon_reader_bin *rp = vma->vm_private_data; +spin_lock_irqsave (&rp->b_lock, flags); rp->mmap_active--; +spin_unlock_irqrestore (&rp->b_lock, flags); }/*
@@ -1231,16 +1245,12 @@ static int mon_bin_vma_fault(struct vm_aunsigned long offset, chunk_idx;struct page *pageptr; -mutex_lock (&rp->fetch_lock); offset = vmf->pgoff <<PAGE_SHIFT ; -if (offset >= rp->b_size) { -mutex_unlock (&rp->fetch_lock); +if (offset >= rp->b_size)return VM_FAULT_SIGBUS ; - } chunk_idx = offset /CHUNK_SIZE ; pageptr = rp->b_vec[chunk_idx].pg;get_page (pageptr); -mutex_unlock (&rp->fetch_lock); vmf->page = pageptr;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 115/199 virtio-balloon: fix managed page counts when migrating pages between zones
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
commit 63341ab03706e11a31e3dd8ccc0fbc9beaf723f0 upstream.
In case we have to migrate a ballon page to a newpage of another zone, the managed page count of both zones is wrong. Paired with memory offlining (which will adjust the managed page count), we can trigger kernel crashes and all kinds of different symptoms.
One way to reproduce:
1. Start a QEMU guest with 4GB, no NUMA
2. Hotplug a 1GB DIMM and online the memory to ZONE_NORMAL
3. Inflate the balloon to 1GB
4. Unplug the DIMM (be quick, otherwise unmovable data ends up on it)
5. Observe /proc/zoneinfo
Node 0, zone Normal
pages free 16810
min 24848885473806
low 18471592959183339
high 36918337032892872
spanned 262144
present 262144
managed 18446744073709533486
6. Do anything that requires some memory (e.g., inflate the balloon some
more). The OOM goes crazy and the system crashes
[ 238.324946] Out of memory: Killed process 537 (login) total-vm:27584kB, anon-rss:860kB, file-rss:0kB, shmem-rss:00
[ 238.338585] systemd invoked oom-killer: gfp_mask=0x100cca(GFP_HIGHUSER_MOVABLE), order=0, oom_score_adj=0
[ 238.339420] CPU: 0 PID: 1 Comm: systemd Tainted: G D W 5.4.0-next-20191204+ #75
[ 238.340139] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu4
[ 238.341121] Call Trace:
[ 238.341337] dump_stack+0x8f/0xd0
[ 238.341630] dump_header+0x61/0x5ea
[ 238.341942] oom_kill_process.cold+0xb/0x10
[ 238.342299] out_of_memory+0x24d/0x5a0
[ 238.342625] __alloc_pages_slowpath+0xd12/0x1020
[ 238.343024] __alloc_pages_nodemask+0x391/0x410
[ 238.343407] pagecache_get_page+0xc3/0x3a0
[ 238.343757] filemap_fault+0x804/0xc30
[ 238.344083] ? ext4_filemap_fault+0x28/0x42
[ 238.344444] ext4_filemap_fault+0x30/0x42
[ 238.344789] __do_fault+0x37/0x1a0
[ 238.345087] __handle_mm_fault+0x104d/0x1ab0
[ 238.345450] handle_mm_fault+0x169/0x360
[ 238.345790] do_user_addr_fault+0x20d/0x490
[ 238.346154] do_page_fault+0x31/0x210
[ 238.346468] async_page_fault+0x43/0x50
[ 238.346797] RIP: 0033:0x7f47eba4197e
[ 238.347110] Code: Bad RIP value.
[ 238.347387] RSP: 002b:00007ffd7c0c1890 EFLAGS: 00010293
[ 238.347834] RAX: 0000000000000002 RBX: 000055d196a20a20 RCX: 00007f47eba4197e
[ 238.348437] RDX: 0000000000000033 RSI: 00007ffd7c0c18c0 RDI: 0000000000000004
[ 238.349047] RBP: 00007ffd7c0c1c20 R08: 0000000000000000 R09: 0000000000000033
[ 238.349660] R10: 00000000ffffffff R11: 0000000000000293 R12: 0000000000000001
[ 238.350261] R13: ffffffffffffffff R14: 0000000000000000 R15: 00007ffd7c0c18c0
[ 238.350878] Mem-Info:
[ 238.351085] active_anon:3121 inactive_anon:51 isolated_anon:0
[ 238.351085] active_file:12 inactive_file:7 isolated_file:0
[ 238.351085] unevictable:0 dirty:0 writeback:0 unstable:0
[ 238.351085] slab_reclaimable:5565 slab_unreclaimable:10170
[ 238.351085] mapped:3 shmem:111 pagetables:155 bounce:0
[ 238.351085] free:720717 free_pcp:2 free_cma:0
[ 238.353757] Node 0 active_anon:12484kB inactive_anon:204kB active_file:48kB inactive_file:28kB unevictable:0kB iss
[ 238.355979] Node 0 DMA free:11556kB min:36kB low:48kB high:60kB reserved_highatomic:0KB active_anon:152kB inactivB
[ 238.358345] lowmem_reserve[]: 0 2955 2884 2884 2884
[ 238.358761] Node 0 DMA32 free:2677864kB min:7004kB low:10028kB high:13052kB reserved_highatomic:0KB active_anon:0B
[ 238.361202] lowmem_reserve[]: 0 0 72057594037927865 72057594037927865 72057594037927865
[ 238.361888] Node 0 Normal free:193448kB min:99395541895224kB low:73886371836733356kB high:147673348131571488kB reB
[ 238.364765] lowmem_reserve[]: 0 0 0 0 0
[ 238.365101] Node 0 DMA: 7*4kB (U) 5*8kB (UE) 6*16kB (UME) 2*32kB (UM) 1*64kB (U) 2*128kB (UE) 3*256kB (UME) 2*512B
[ 238.366379] Node 0 DMA32: 0*4kB 1*8kB (U) 2*16kB (UM) 2*32kB (UM) 2*64kB (UM) 1*128kB (U) 1*256kB (U) 1*512kB (U)B
[ 238.367654] Node 0 Normal: 1985*4kB (UME) 1321*8kB (UME) 844*16kB (UME) 524*32kB (UME) 300*64kB (UME) 138*128kB (B
[ 238.369184] Node 0 hugepages_total=0 hugepages_free=0 hugepages_surp=0 hugepages_size=2048kB
[ 238.369915] 130 total pagecache pages
[ 238.370241] 0 pages in swap cache
[ 238.370533] Swap cache stats: add 0, delete 0, find 0/0
[ 238.370981] Free swap = 0kB
[ 238.371239] Total swap = 0kB
[ 238.371488] 1048445 pages RAM
[ 238.371756] 0 pages HighMem/MovableOnly
[ 238.372090] 306992 pages reserved
[ 238.372376] 0 pages cma reserved
[ 238.372661] 0 pages hwpoisonedIn another instance (older kernel), I was able to observe this (negative page count :/):
[ 180.896971] Offlined Pages 32768 [ 182.667462] Offlined Pages 32768 [ 184.408117] Offlined Pages 32768 [ 186.026321] Offlined Pages 32768 [ 187.684861] Offlined Pages 32768 [ 189.227013] Offlined Pages 32768 [ 190.830303] Offlined Pages 32768 [ 190.833071] Built 1 zonelists, mobility grouping on. Total pages: -36920272750453009
In another instance (older kernel), I was no longer able to start any process:
[root@vm ~]# [ 214.348068] Offlined Pages 32768
[ 215.973009] Offlined Pages 32768 cat /proc/meminfo -bash: fork: Cannot allocate memory [root@vm ~]# cat /proc/meminfo -bash: fork: Cannot allocate memory
Fix it by properly adjusting the managed page count when migrating if the zone changed. The managed page count of the zones now looks after unplug of the DIMM (and after deflating the balloon) just like before inflating the balloon (and plugging+onlining the DIMM).
We'll temporarily modify the totalram page count. If this ever becomes a problem, we can fine tune by providing helpers that don't touch the totalram pages (e.g., adjust_zone_managed_page_count()).
Please note that fixing up the managed page count is only necessary when we adjusted the managed page count when inflating - only if we don't have VIRTIO_BALLOON_F_DEFLATE_ON_OOM. With that feature, the managed page count is not touched when inflating/deflating.
--- drivers/virtio/virtio_balloon.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/virtio/virtio_balloon.c +11 -0
@@ -482,6 +482,17 @@ static int virtballoon_migratepage(strucget_page (newpage);/* balloon reference */ +/* +* When we migrate a page to a different zone and adjusted the +* managed page count when inflating, we have to fixup the count of +* both involved zones. +*/ +if (!virtio_has_feature (vb->vdev,VIRTIO_BALLOON_F_DEFLATE_ON_OOM ) && +page_zone (page) !=page_zone (newpage)) { +adjust_managed_page_count (page,1 ); +adjust_managed_page_count (newpage,-1 ); + } +/* balloon's page migration 1st step -- inflate "newpage" */ spin_lock_irqsave (&vb_dev_info->pages_lock, flags);balloon_page_insert (vb_dev_info, newpage);
Greg Kroah-Hartman
maintainerPATCH 118/199 Btrfs: send, skip backreference walking for extents with many references
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit fd0ddbe2509568b00df364156f47561e9f469f15 upstream.
Backreference walking, which is used by send to figure if it can issue clone operations instead of write operations, can be very slow and use too much memory when extents have many references. This change simply skips backreference walking when an extent has more than 64 references, in which case we fallback to a write operation instead of a clone operation. This limit is conservative and in practice I observed no signicant slowdown with up to 100 references and still low memory usage up to that limit.
This is a temporary workaround until there are speedups in the backref walking code, and as such it does not attempt to add extra interfaces or knobs to tweak the threshold.
--- fs/btrfs/send.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
fs/btrfs/send.c +24 -1
@@ -37,6 +37,14 @@#include "compression.h" /* +* Maximum number of references an extent can have in order for us to attempt to +* issue clone operations instead of write operations. This currently exists to +* avoid hitting limitations of the backreference walking code (taking a lot of +* time and using too much memory for extents with large number of references). +*/ +#define SEND_MAX_EXTENT_REFS 64 + +/* * A fs_path is a helper to dynamically build path names with unknown size. * It reallocates the internal buffer on demand. * It allows fast adding of path elements on the right side (normal path) and
@@ -1327,6 +1335,7 @@ static int find_extent_clone(struct sendstruct clone_root *cur_clone_root;struct btrfs_key found_key;struct btrfs_path *tmp_path; +struct btrfs_extent_item *ei;int compressed;u32 i;
@@ -1376,7 +1385,6 @@ static int find_extent_clone(struct send ret =extent_from_logical (fs_info, disk_byte, tmp_path, &found_key, &flags);up_read (&fs_info->commit_root_sem); -btrfs_release_path (tmp_path);if (ret <0 ) goto out;
@@ -1385,6 +1393,21 @@ static int find_extent_clone(struct send goto out; } + ei =btrfs_item_ptr (tmp_path->nodes[0 ], tmp_path->slots[0 ], + struct btrfs_extent_item); +/* +* Backreference walking (iterate_extent_inodes() below) is currently +* too expensive when an extent has a large number of references, both +* in time spent and used memory. So for now just fallback to write +* operations instead of clone operations when an extent has more than +* a certain amount of references. +*/ +if (btrfs_extent_refs (tmp_path->nodes[0 ], ei) >SEND_MAX_EXTENT_REFS ) { + ret = -ENOENT ; + goto out; + } +btrfs_release_path (tmp_path); +/* * Setup the clone roots. */
Greg Kroah-Hartman
maintainerPATCH 116/199 btrfs: check page->mapping when loading free space cache
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 3797136b626ad4b6582223660c041efdea8f26b2 upstream.
While testing 5.2 we ran into the following panic
[52238.017028] BUG: kernel NULL pointer dereference, address: 0000000000000001 [52238.105608] RIP: 0010:drop_buffers+0x3d/0x150 [52238.304051] Call Trace: [52238.308958] try_to_free_buffers+0x15b/0x1b0 [52238.317503] shrink_page_list+0x1164/0x1780 [52238.325877] shrink_inactive_list+0x18f/0x3b0 [52238.334596] shrink_node_memcg+0x23e/0x7d0 [52238.342790] ? do_shrink_slab+0x4f/0x290 [52238.350648] shrink_node+0xce/0x4a0 [52238.357628] balance_pgdat+0x2c7/0x510 [52238.365135] kswapd+0x216/0x3e0 [52238.371425] ? wait_woken+0x80/0x80 [52238.378412] ? balance_pgdat+0x510/0x510 [52238.386265] kthread+0x111/0x130 [52238.392727] ? kthread_create_on_node+0x60/0x60 [52238.401782] ret_from_fork+0x1f/0x30
The page we were trying to drop had a page->private, but had no page->mapping and so called drop_buffers, assuming that we had a buffer_head on the page, and then panic'ed trying to deref 1, which is our page->private for data pages.
This is happening because we're truncating the free space cache while we're trying to load the free space cache. This isn't supposed to happen, and I'll fix that in a followup patch. However we still shouldn't allow those sort of mistakes to result in messing with pages that do not belong to us. So add the page->mapping check to verify that we still own this page after dropping and re-acquiring the page lock.
This page being unlocked as:btrfs_readpage
extent_read_full_page
__extent_read_full_page
__do_readpage
if (!nr)
unlock_page <-- nr can be 0 only if submit_extent_page
returns an error
--- fs/btrfs/free-space-cache.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/btrfs/free-space-cache.c +6 -0
@@ -391,6 +391,12 @@ static int io_ctl_prepare_pages(struct bif (uptodate && !PageUptodate (page)) {btrfs_readpage (NULL , page);lock_page (page); +if (page->mapping != inode->i_mapping) { +btrfs_err (BTRFS_I (inode)->root->fs_info, +"free space cache page truncated" ); +io_ctl_drop_pages (io_ctl); +return -EIO ; + }if (!PageUptodate (page)) {btrfs_err (BTRFS_I (inode)->root->fs_info,"error reading free space cache" );
Greg Kroah-Hartman
maintainerPATCH 119/199 btrfs: record all roots for rename exchange on a subvol
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 3e1740993e43116b3bc71b0aad1e6872f6ccf341 upstream.
Testing with the new fsstress support for subvolumes uncovered a pretty bad problem with rename exchange on subvolumes. We're modifying two different subvolumes, but we only start the transaction on one of them, so the other one is not added to the dirty root list. This is caught by btrfs_cow_block() with a warning because the root has not been updated, however if we do not modify this root again we'll end up pointing at an invalid root because the root item is never updated.
Fix this by making sure we add the destination root to the trans list, the same as we do with normal renames. This fixes the corruption.
--- fs/btrfs/inode.c | 3 +++ 1 file changed, 3 insertions(+)
fs/btrfs/inode.c +3 -0
@@ -9616,6 +9616,9 @@ static int btrfs_rename_exchange(struct goto out_notrans; } +if (dest != root) +btrfs_record_root_in_trans (trans, dest); +/* * We need to find a free sequence number both in the source and * in the destination directory for the exchange.
Greg Kroah-Hartman
maintainerPATCH 84/199 KVM: x86: do not modify masked bits of shared MSRs
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit de1fca5d6e0105c9d33924e1247e2f386efc3ece upstream.
"Shared MSRs" are guest MSRs that are written to the host MSRs but keep their value until the next return to userspace. They support a mask, so that some bits keep the host value, but this mask is only used to skip an unnecessary MSR write and the value written to the MSR is always the guest MSR.
Fix this and, while at it, do not update smsr->values[slot].curr if for whatever reason the wrmsr fails. This should only happen due to reserved bits, so the value written to smsr->values[slot].curr will not match when the user-return notifier and the host value will always be restored. However, it is untidy and in rare cases this can actually avoid spurious WRMSRs on return to userspace.
--- arch/x86/kvm/x86.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +3 -2
@@ -273,13 +273,14 @@ int kvm_set_shared_msr(unsigned slot, u6struct kvm_shared_msrs *smsr =per_cpu_ptr (shared_msrs, cpu);int err; -if (((value ^ smsr->values[slot].curr) & mask) ==0 ) + value = (value & mask) | (smsr->values[slot].host & ~mask); +if (value == smsr->values[slot].curr)return 0 ; - smsr->values[slot].curr = value; err =wrmsrl_safe (shared_msrs_global.msrs[slot], value);if (err)return 1 ; + smsr->values[slot].curr = value;if (!smsr->registered) { smsr->urn.on_user_return = kvm_on_user_return;user_return_notifier_register (&smsr->urn);
Greg Kroah-Hartman
maintainerPATCH 85/199 KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit cbbaa2727aa3ae9e0a844803da7cef7fd3b94f2b upstream.
KVM does not implement MSR_IA32_TSX_CTRL, so it must not be presented to the guests. It is also confusing to have !ARCH_CAP_TSX_CTRL_MSR && !RTM && ARCH_CAP_TAA_NO: lack of MSR_IA32_TSX_CTRL suggests TSX was not hidden (it actually was), yet the value says that TSX is not vulnerable to microarchitectural data sampling. Fix both.
--- arch/x86/kvm/x86.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +7 -2
@@ -1075,10 +1075,15 @@ u64 kvm_get_arch_capabilities(void)* If TSX is disabled on the system, guests are also mitigated against * TAA and clear CPU buffer mitigation is not required for guests. */ -if (boot_cpu_has_bug (X86_BUG_TAA ) &&boot_cpu_has (X86_FEATURE_RTM ) && - (data &ARCH_CAP_TSX_CTRL_MSR )) +if (!boot_cpu_has (X86_FEATURE_RTM )) + data &= ~ARCH_CAP_TAA_NO ; +else if (!boot_cpu_has_bug (X86_BUG_TAA )) + data |=ARCH_CAP_TAA_NO ; +else if (data &ARCH_CAP_TSX_CTRL_MSR ) data &= ~ARCH_CAP_MDS_NO ; +/* KVM does not emulate MSR_IA32_TSX_CTRL. */ + data &= ~ARCH_CAP_TSX_CTRL_MSR ;return data; }
Greg Kroah-Hartman
maintainerPATCH 87/199 crypto: ccp - fix uninitialized list head
In reply to Greg Kroah-HartmanFrom: Mark Salter <[email protected]>
commit 691505a803a7f223b2af621848d581259c61f77d upstream.
A NULL-pointer dereference was reported in fedora bz#1762199 while reshaping a raid6 array after adding a fifth drive to an existing array.
[ 47.343549] md/raid:md0: raid level 6 active with 3 out of 5 devices, algorithm 2 [ 47.804017] md0: detected capacity change from 0 to 7885289422848 [ 47.822083] Unable to handle kernel read from unreadable memory at virtual address 0000000000000000 ... [ 47.940477] CPU: 1 PID: 14210 Comm: md0_raid6 Tainted: G W 5.2.18-200.fc30.aarch64 #1 [ 47.949594] Hardware name: AMD Overdrive/Supercharger/To be filled by O.E.M., BIOS ROD1002C 04/08/2016 [ 47.958886] pstate: 00400085 (nzcv daIf +PAN -UAO) [ 47.963668] pc : __list_del_entry_valid+0x2c/0xa8 [ 47.968366] lr : ccp_tx_submit+0x84/0x168 [ccp] [ 47.972882] sp : ffff00001369b970 [ 47.976184] x29: ffff00001369b970 x28: ffff00001369bdb8 [ 47.981483] x27: 00000000ffffffff x26: ffff8003b758af70 [ 47.986782] x25: ffff8003b758b2d8 x24: ffff8003e6245818 [ 47.992080] x23: 0000000000000000 x22: ffff8003e62450c0 [ 47.997379] x21: ffff8003dfd6add8 x20: 0000000000000003 [ 48.002678] x19: ffff8003e6245100 x18: 0000000000000000 [ 48.007976] x17: 0000000000000000 x16: 0000000000000000 [ 48.013274] x15: 0000000000000000 x14: 0000000000000000 [ 48.018572] x13: ffff7e000ef83a00 x12: 0000000000000001 [ 48.023870] x11: ffff000010eff998 x10: 00000000000019a0 [ 48.029169] x9 : 0000000000000000 x8 : ffff8003e6245180 [ 48.034467] x7 : 0000000000000000 x6 : 000000000000003f [ 48.039766] x5 : 0000000000000040 x4 : ffff8003e0145080 [ 48.045064] x3 : dead000000000200 x2 : 0000000000000000 [ 48.050362] x1 : 0000000000000000 x0 : ffff8003e62450c0 [ 48.055660] Call trace: [ 48.058095] __list_del_entry_valid+0x2c/0xa8 [ 48.062442] ccp_tx_submit+0x84/0x168 [ccp] [ 48.066615] async_tx_submit+0x224/0x368 [async_tx] [ 48.071480] async_trigger_callback+0x68/0xfc [async_tx] [ 48.076784] ops_run_biofill+0x178/0x1e8 [raid456] [ 48.081566] raid_run_ops+0x248/0x818 [raid456] [ 48.086086] handle_stripe+0x864/0x1208 [raid456] [ 48.090781] handle_active_stripes.isra.0+0xb0/0x278 [raid456] [ 48.096604] raid5d+0x378/0x618 [raid456] [ 48.100602] md_thread+0xa0/0x150 [ 48.103905] kthread+0x104/0x130 [ 48.107122] ret_from_fork+0x10/0x18 [ 48.110686] Code: d2804003 f2fbd5a3 eb03003f 54000320 (f9400021) [ 48.116766] ---[ end trace 23f390a527f7ad77 ]---
ccp_tx_submit is passed a dma_async_tx_descriptor which is contained in a ccp_dma_desc and adds it to a ccp channel's pending list:
list_del(&desc->entry); list_add_tail(&desc->entry, &chan->pending);
The problem is that desc->entry may be uninitialized in the async_trigger_callback path where the descriptor was gotten from ccp_prep_dma_interrupt which got it from ccp_alloc_dma_desc which doesn't initialize the desc->entry list head. So, just initialize the list head to avoid the problem.
--- drivers/crypto/ccp/ccp-dmaengine.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/ccp/ccp-dmaengine.c +1 -0
@@ -309,6 +309,7 @@ static struct ccp_dma_desc *ccp_alloc_dm desc->tx_desc.flags = flags; desc->tx_desc.tx_submit = ccp_tx_submit; desc->ccp = chan->ccp; +INIT_LIST_HEAD (&desc->entry);INIT_LIST_HEAD (&desc->pending);INIT_LIST_HEAD (&desc->active); desc->status =DMA_IN_PROGRESS ;
Greg Kroah-Hartman
maintainerPATCH 88/199 crypto: ecdh - fix big endian bug in ECC library
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit f398243e9fd6a3a059c1ea7b380c40628dbf0c61 upstream.
The elliptic curve arithmetic library used by the EC-DH KPP implementation assumes big endian byte order, and unconditionally reverses the byte and word order of multi-limb quantities. On big endian systems, the byte reordering is not necessary, while the word ordering needs to be retained.
So replace the __swab64() invocation with a call to be64_to_cpu() which should do the right thing for both little and big endian builds.
--- crypto/ecc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
crypto/ecc.c +2 -1
@@ -897,10 +897,11 @@ static void ecc_point_mult(struct ecc_postatic inline void ecc_swap_digits (const u64 *in,u64 *out,unsigned int ndigits) { +const __be64 *src = (__force __be64 *)in;int i;for (i =0 ; i < ndigits; i++) - out[i] =__swab64 (in[ndigits -1 - i]); + out[i] =be64_to_cpu (src[ndigits -1 - i]); } int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
Greg Kroah-Hartman
maintainerPATCH 89/199 crypto: user - fix memory leak in crypto_report
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
commit ffdde5932042600c6807d46c1550b28b0db6a3bc upstream.
In crypto_report, a new skb is created via nlmsg_new(). This skb should be released if crypto_report_alg() fails.
--- crypto/crypto_user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
crypto/crypto_user.c +3 -1
@@ -269,8 +269,10 @@ static int crypto_report(struct sk_buff drop_alg:crypto_mod_put (alg); -if (err) +if (err) { +kfree_skb (skb);return err; + }return nlmsg_unicast (crypto_nlsk, skb,NETLINK_CB (in_skb).portid); }
Greg Kroah-Hartman
maintainerPATCH 130/199 ar5523: check NULL before memcpy() in ar5523_cmd()
In reply to Greg Kroah-HartmanFrom: Denis Efremov <[email protected]>
commit 315cee426f87658a6799815845788fde965ddaad upstream.
memcpy() call with "idata == NULL && ilen == 0" results in undefined behavior in ar5523_cmd(). For example, NULL is passed in callchain "ar5523_stat_work() -> ar5523_cmd_write() -> ar5523_cmd()". This patch adds ilen check before memcpy() call in ar5523_cmd() to prevent an undefined behavior.
--- drivers/net/wireless/ath/ar5523/ar5523.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ar5523/ar5523.c +2 -1
@@ -255,7 +255,8 @@ static int ar5523_cmd(struct ar5523 *ar,if (flags &AR5523_CMD_FLAG_MAGIC ) hdr->magic =cpu_to_be32 (1 <<24 ); -memcpy (hdr +1 , idata, ilen); +if (ilen) +memcpy (hdr +1 , idata, ilen); cmd->odata = odata; cmd->olen = olen;
Greg Kroah-Hartman
maintainerPATCH 121/199 rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit 3155db7613edea8fb943624062baf1e4f9cfbfd6 upstream.
In commit 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers"), a callback needed to check if the hardware has released a buffer indicating that a DMA operation is completed was not added.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 1 + drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 17 +++++++++++++++++ drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 2 ++ 3 files changed, 20 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c +1 -0
@@ -243,6 +243,7 @@ static struct rtl_hal_ops rtl8192de_hal_ .led_control = rtl92de_led_control, .set_desc = rtl92de_set_desc, .get_desc = rtl92de_get_desc, + .is_tx_desc_closed = rtl92de_is_tx_desc_closed, .tx_polling = rtl92de_tx_polling, .enable_hw_sec = rtl92de_enable_hw_security_config, .set_key = rtl92de_set_key,
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +17 -0
@@ -862,6 +862,23 @@ u32 rtl92de_get_desc(u8 *p_desc, bool isreturn ret; } +bool rtl92de_is_tx_desc_closed (struct ieee80211_hw *hw, +u8 hw_queue,u16 index) +{ +struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw)); +struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue]; +u8 *entry = (u8 *)(&ring->desc[ring->idx]); +u8 own = (u8 )rtl92de_get_desc (entry, true,HW_DESC_OWN ); + +/* a beacon packet will only use the first +* descriptor by defaut, and the own bit may not +* be cleared by the hardware +*/ +if (own) +return false; +return true; +} +void rtl92de_tx_polling (struct ieee80211_hw *hw,u8 hw_queue) {struct rtl_priv *rtlpriv =rtl_priv (hw);
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h +2 -0
@@ -740,6 +740,8 @@ bool rtl92de_rx_query_desc(struct ieee80void rtl92de_set_desc (struct ieee80211_hw *hw,u8 *pdesc,bool istx,u8 desc_name,u8 *val);u32 rtl92de_get_desc (u8 *pdesc,bool istx,u8 desc_name); +bool rtl92de_is_tx_desc_closed (struct ieee80211_hw *hw, +u8 hw_queue,u16 index);void rtl92de_tx_polling (struct ieee80211_hw *hw,u8 hw_queue); void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, bool b_firstseg, bool b_lastseg,
Greg Kroah-Hartman
maintainerPATCH 133/199 cpuidle: Do not unset the driver if it is there already
In reply to Greg Kroah-HartmanFrom: Zhenzhong Duan <[email protected]>
commit 918c1fe9fbbe46fcf56837ff21f0ef96424e8b29 upstream.
Fix __cpuidle_set_driver() to check if any of the CPUs in the mask has a driver different from drv already and, if so, return -EBUSY before updating any cpuidle_drivers per-CPU pointers.
--- drivers/cpuidle/driver.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/cpuidle/driver.c +7 -8
@@ -61,24 +61,23 @@ static inline void __cpuidle_unset_drive* __cpuidle_set_driver - set per CPU driver variables for the given driver. * @drv: a valid pointer to a struct cpuidle_driver * -* For each CPU in the driver's cpumask, unset the registered driver per CPU -* to @drv. -* -* Returns 0 on success, -EBUSY if the CPUs have driver(s) already. +* Returns 0 on success, -EBUSY if any CPU in the cpumask have a driver +* different from drv already. */ static inline int __cpuidle_set_driver (struct cpuidle_driver *drv) {int cpu;for_each_cpu (cpu, drv->cpumask) { +struct cpuidle_driver *old_drv; -if (__cpuidle_get_cpu_driver (cpu)) { -__cpuidle_unset_driver (drv); + old_drv =__cpuidle_get_cpu_driver (cpu); +if (old_drv && old_drv != drv)return -EBUSY ; - } + } +for_each_cpu (cpu, drv->cpumask)per_cpu (cpuidle_drivers, cpu) = drv; - }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 136/199 ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data()
In reply to Greg Kroah-HartmanFrom: Vamshi K Sthambamkadi <[email protected]>
commit 627ead724eff33673597216f5020b72118827de4 upstream.
kmemleak reported backtrace:
[<bbee0454>] kmem_cache_alloc_trace+0x128/0x260
[<6677f215>] i2c_acpi_install_space_handler+0x4b/0xe0
[<1180f4fc>] i2c_register_adapter+0x186/0x400
[<6083baf7>] i2c_add_adapter+0x4e/0x70
[<a3ddf966>] intel_gmbus_setup+0x1a2/0x2c0 [i915]
[<84cb69ae>] i915_driver_probe+0x8d8/0x13a0 [i915]
[<81911d4b>] i915_pci_probe+0x48/0x160 [i915]
[<4b159af1>] pci_device_probe+0xdc/0x160
[<b3c64704>] really_probe+0x1ee/0x450
[<bc029f5a>] driver_probe_device+0x142/0x1b0
[<d8829d20>] device_driver_attach+0x49/0x50
[<de71f045>] __driver_attach+0xc9/0x150
[<df33ac83>] bus_for_each_dev+0x56/0xa0
[<80089bba>] driver_attach+0x19/0x20
[<cc73f583>] bus_add_driver+0x177/0x220
[<7b29d8c7>] driver_register+0x56/0xf0In i2c_acpi_remove_space_handler(), a leak occurs whenever the "data" parameter is initialized to 0 before being passed to acpi_bus_get_private_data().
This is because the NULL pointer check in acpi_bus_get_private_data() (condition->if(!*data)) returns EINVAL and, in consequence, memory is never freed in i2c_acpi_remove_space_handler().
Fix the NULL pointer check in acpi_bus_get_private_data() to follow the analogous check in acpi_get_data_full().
--- drivers/acpi/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/bus.c +1 -1
@@ -158,7 +158,7 @@ int acpi_bus_get_private_data(acpi_handl {acpi_status status; -if (!*data) +if (!data)return -EINVAL ; status =acpi_get_data (handle, acpi_bus_private_data_handler, data);
Greg Kroah-Hartman
maintainerPATCH 135/199 ACPI: OSL: only free map once in osl.c
In reply to Greg Kroah-HartmanFrom: Francesco Ruggeri <[email protected]>
commit 833a426cc471b6088011b3d67f1dc4e147614647 upstream.
acpi_os_map_cleanup checks map->refcount outside of acpi_ioremap_lock before freeing the map. This creates a race condition the can result in the map being freed more than once.
A panic can be caused by running
for ((i=0; i<10; i++))
do
for ((j=0; j<100000; j++))
do
cat /sys/firmware/acpi/tables/data/BERT >/dev/null
done &
done
This patch makes sure that only the process that drops the reference to 0 does the freeing.
--- drivers/acpi/osl.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
drivers/acpi/osl.c +17 -11
@@ -375,19 +375,21 @@ void *__ref acpi_os_map_memory(acpi_phys }EXPORT_SYMBOL_GPL (acpi_os_map_memory); -static void acpi_os_drop_map_ref (struct acpi_ioremap *map) +/* Must be called with mutex_lock(&acpi_ioremap_lock) */ +static unsigned long acpi_os_drop_map_ref (struct acpi_ioremap *map) { -if (!--map->refcount) +unsigned long refcount = --map->refcount; + +if (!refcount)list_del_rcu (&map->list); +return refcount; }static void acpi_os_map_cleanup (struct acpi_ioremap *map) { -if (!map->refcount) { -synchronize_rcu_expedited (); -acpi_unmap (map->phys, map->virt); -kfree (map); - } +synchronize_rcu_expedited (); +acpi_unmap (map->phys, map->virt); +kfree (map); }/**
@@ -407,6 +409,7 @@ static void acpi_os_map_cleanup(struct avoid __ref acpi_os_unmap_iomem (void __iomem *virt,acpi_size size) {struct acpi_ioremap *map; +unsigned long refcount;if (!acpi_gbl_permanent_mmap) {__acpi_unmap_table (virt, size);
@@ -420,10 +423,11 @@ void __ref acpi_os_unmap_iomem(void __ioWARN (true,PREFIX "%s: bad address %p\n" , __func__, virt);return ; } -acpi_os_drop_map_ref (map); + refcount =acpi_os_drop_map_ref (map);mutex_unlock (&acpi_ioremap_lock); -acpi_os_map_cleanup (map); +if (!refcount) +acpi_os_map_cleanup (map); }EXPORT_SYMBOL_GPL (acpi_os_unmap_iomem);
@@ -464,6 +468,7 @@ void acpi_os_unmap_generic_address(struc {u64 addr;struct acpi_ioremap *map; +unsigned long refcount;if (gas->space_id !=ACPI_ADR_SPACE_SYSTEM_MEMORY )return ;
@@ -479,10 +484,11 @@ void acpi_os_unmap_generic_address(strucmutex_unlock (&acpi_ioremap_lock);return ; } -acpi_os_drop_map_ref (map); + refcount =acpi_os_drop_map_ref (map);mutex_unlock (&acpi_ioremap_lock); -acpi_os_map_cleanup (map); +if (!refcount) +acpi_os_map_cleanup (map); }EXPORT_SYMBOL (acpi_os_unmap_generic_address);
Greg Kroah-Hartman
maintainerPATCH 137/199 ACPI: PM: Avoid attaching ACPI PM domain to certain devices
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit b9ea0bae260f6aae546db224daa6ac1bd9d94b91 upstream.
Certain ACPI-enumerated devices represented as platform devices in Linux, like fans, require special low-level power management handling implemented by their drivers that is not in agreement with the ACPI PM domain behavior. That leads to problems with managing ACPI fans during system-wide suspend and resume.
For this reason, make acpi_dev_pm_attach() skip the affected devices by adding a list of device IDs to avoid to it and putting the IDs of the affected devices into that list.
--- drivers/acpi/device_pm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/acpi/device_pm.c +11 -1
@@ -1096,9 +1096,19 @@ static void acpi_dev_pm_detach(struct de*/ int acpi_dev_pm_attach (struct device *dev,bool power_on) { +/* +* Skip devices whose ACPI companions match the device IDs below, +* because they require special power management handling incompatible +* with the generic ACPI PM domain. +*/ +static const struct acpi_device_id special_pm_ids[] = { + {"PNP0C0B" , },/* Generic ACPI fan */ + {"INT3404" , },/* Fan */ + {} + };struct acpi_device *adev =ACPI_COMPANION (dev); -if (!adev) +if (!adev || !acpi_match_device_ids (adev, special_pm_ids))return -ENODEV ;if (dev->pm_domain)
Greg Kroah-Hartman
maintainerPATCH 139/199 pinctrl: samsung: Fix device node refcount leaks in init code
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit a322b3377f4bac32aa25fb1acb9e7afbbbbd0137 upstream.
Several functions use for_each_child_of_node() loop with a break to find a matching child node. Although each iteration of for_each_child_of_node puts the previous node, but early exit from loop misses it. This leads to leak of device node.
--- drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/pinctrl/samsung/pinctrl-samsung.c +8 -2
@@ -281,6 +281,7 @@ static int samsung_dt_node_to_map(struct &reserved_maps, num_maps);if (ret <0 ) {samsung_dt_free_map (pctldev, *map, *num_maps); +of_node_put (np);return ret; } }
@@ -770,8 +771,10 @@ static struct samsung_pmx_func *samsung_if (!of_get_child_count (cfg_np)) { ret =samsung_pinctrl_create_function (dev, drvdata, cfg_np, func); -if (ret <0 ) +if (ret <0 ) { +of_node_put (cfg_np);return ERR_PTR (ret); + }if (ret >0 ) { ++func; ++func_cnt;
@@ -782,8 +785,11 @@ static struct samsung_pmx_func *samsung_for_each_child_of_node (cfg_np, func_np) { ret =samsung_pinctrl_create_function (dev, drvdata, func_np, func); -if (ret <0 ) +if (ret <0 ) { +of_node_put (func_np); +of_node_put (cfg_np);return ERR_PTR (ret); + }if (ret >0 ) { ++func; ++func_cnt;
Greg Kroah-Hartman
maintainerPATCH 140/199 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
commit f6498b922e57aecbe3b7fa30a308d9d586c0c369 upstream.
Pandora_wl1251_init_card was used to do special pdata based setup of the sdio mmc interface. This does no longer work with v4.7 and later. A fix requires a device tree based mmc3 setup.
Therefore we move the special setup to omap_hsmmc.c instead of calling some pdata supplied init_card function.
The new code checks for a DT child node compatible to wl1251 so it will not affect other MMC3 use cases.
Generally, this code was and still is a hack and should be moved to mmc core to e.g. read such properties from optional DT child nodes.
--- drivers/mmc/host/omap_hsmmc.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/mmc/host/omap_hsmmc.c +30 -0
@@ -1700,6 +1700,36 @@ static void omap_hsmmc_init_card(structif (mmc_pdata (host)->init_card)mmc_pdata (host)->init_card (card); +else if (card->type ==MMC_TYPE_SDIO || + card->type ==MMC_TYPE_SD_COMBO ) { +struct device_node *np =mmc_dev (mmc)->of_node; + +/* +* REVISIT: should be moved to sdio core and made more +* general e.g. by expanding the DT bindings of child nodes +* to provide a mechanism to provide this information: +* Documentation/devicetree/bindings/mmc/mmc-card.txt +*/ + + np =of_get_compatible_child (np,"ti,wl1251" ); +if (np) { +/* +* We have TI wl1251 attached to MMC3. Pass this +* information to the SDIO core because it can't be +* probed by normal methods. +*/ + +dev_info (host->dev,"found wl1251\n" ); + card->quirks |=MMC_QUIRK_NONSTD_SDIO ; + card->cccr.wide_bus =1 ; + card->cis.vendor =0x104c ; + card->cis.device =0x9066 ; + card->cis.blksize =512 ; + card->cis.max_dtr =24000000 ; + card->ocr =0x80 ; +of_node_put (np); + } + } }static void omap_hsmmc_enable_sdio_irq (struct mmc_host *mmc,int enable)
Greg Kroah-Hartman
maintainerPATCH 141/199 ppdev: fix PPGETTIME/PPSETTIME ioctls
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit 998174042da229e2cf5841f574aba4a743e69650 upstream.
Going through the uses of timeval in the user space API, I noticed two bugs in ppdev that were introduced in the y2038 conversion:
* The range check was accidentally moved from ppsettime to ppgettime
* On sparc64, the microseconds are in the other half of the 64-bit word.
Fix both, and mark the fix for stable backports.
--- drivers/char/ppdev.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/char/ppdev.c +12 -4
@@ -624,20 +624,27 @@ static int pp_do_ioctl(struct file *fileif (copy_from_user (time32, argp,sizeof (time32)))return -EFAULT ; +if ((time32[0 ] <0 ) || (time32[1 ] <0 )) +return -EINVAL ; +return pp_set_timeout (pp->pdev, time32[0 ], time32[1 ]);case PPSETTIME64 :if (copy_from_user (time64, argp,sizeof (time64)))return -EFAULT ; +if ((time64[0 ] <0 ) || (time64[1 ] <0 )) +return -EINVAL ; + +if (IS_ENABLED (CONFIG_SPARC64 ) && !in_compat_syscall ()) + time64[1 ] >>=32 ; +return pp_set_timeout (pp->pdev, time64[0 ], time64[1 ]);case PPGETTIME32 :jiffies_to_timespec64 (pp->pdev->timeout, &ts); time32[0 ] = ts.tv_sec; time32[1 ] = ts.tv_nsec /NSEC_PER_USEC ; -if ((time32[0 ] <0 ) || (time32[1 ] <0 )) -return -EINVAL ;if (copy_to_user (argp, time32,sizeof (time32)))return -EFAULT ;
@@ -648,8 +655,9 @@ static int pp_do_ioctl(struct file *filejiffies_to_timespec64 (pp->pdev->timeout, &ts); time64[0 ] = ts.tv_sec; time64[1 ] = ts.tv_nsec /NSEC_PER_USEC ; -if ((time64[0 ] <0 ) || (time64[1 ] <0 )) -return -EINVAL ; + +if (IS_ENABLED (CONFIG_SPARC64 ) && !in_compat_syscall ()) + time64[1 ] <<=32 ;if (copy_to_user (argp, time64,sizeof (time64)))return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 143/199 video/hdmi: Fix AVI bar unpack
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
commit 6039f37dd6b76641198e290f26b31c475248f567 upstream.
The bar values are little endian, not big endian. The pack function did it right but the unpack got it wrong. Fix it.
--- drivers/video/hdmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/hdmi.c +4 -4
@@ -1032,12 +1032,12 @@ static int hdmi_avi_infoframe_unpack(strif (ptr[0 ] &0x10 ) frame->active_aspect = ptr[1 ] &0xf ;if (ptr[0 ] &0x8 ) { - frame->top_bar = (ptr[5 ] <<8 ) + ptr[6 ]; - frame->bottom_bar = (ptr[7 ] <<8 ) + ptr[8 ]; + frame->top_bar = (ptr[6 ] <<8 ) | ptr[5 ]; + frame->bottom_bar = (ptr[8 ] <<8 ) | ptr[7 ]; }if (ptr[0 ] &0x4 ) { - frame->left_bar = (ptr[9 ] <<8 ) + ptr[10 ]; - frame->right_bar = (ptr[11 ] <<8 ) + ptr[12 ]; + frame->left_bar = (ptr[10 ] <<8 ) | ptr[9 ]; + frame->right_bar = (ptr[12 ] <<8 ) | ptr[11 ]; } frame->scan_mode = ptr[0 ] &0x3 ;
Greg Kroah-Hartman
maintainerPATCH 144/199 quota: Check that quota is not dirty before release
In reply to Greg Kroah-HartmanFrom: Dmitry Monakhov <[email protected]>
commit df4bb5d128e2c44848aeb36b7ceceba3ac85080d upstream.
There is a race window where quota was redirted once we drop dq_list_lock inside dqput(), but before we grab dquot->dq_lock inside dquot_release()
TASK1 TASK2 (chowner)
->dqput()
we_slept:
spin_lock(&dq_list_lock)
if (dquot_dirty(dquot)) {
spin_unlock(&dq_list_lock);
dquot->dq_sb->dq_op->write_dquot(dquot);
goto we_slept
if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
spin_unlock(&dq_list_lock);
dquot->dq_sb->dq_op->release_dquot(dquot);
dqget()
mark_dquot_dirty()
dqput()
goto we_slept;
}So dquot dirty quota will be released by TASK1, but on next we_sleept loop
we detect this and call ->write_dquot() for it.
XFSTEST: https://github.com/dmonakhov/xfstests/commit/440a80d4cbb39e9234df4d7240aee1d551c36107
--- fs/ocfs2/quota_global.c | 2 +- fs/quota/dquot.c | 2 +- include/linux/quotaops.h | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-)
fs/ocfs2/quota_global.c +1 -1
@@ -714,7 +714,7 @@ static int ocfs2_release_dquot(struct dqmutex_lock (&dquot->dq_lock);/* Check whether we are not racing with some other dqget() */ -if (atomic_read (&dquot->dq_count) >1 ) +if (dquot_is_busy (dquot)) goto out;/* Running from downconvert thread? Postpone quota processing to wq */ if (current == osb->dc_task) {
fs/quota/dquot.c +1 -1
@@ -479,7 +479,7 @@ int dquot_release(struct dquot *dquot)mutex_lock (&dquot->dq_lock);/* Check whether we are not racing with some other dqget() */ -if (atomic_read (&dquot->dq_count) >1 ) +if (dquot_is_busy (dquot)) goto out_dqlock;mutex_lock (&dqopt->dqio_mutex);if (dqopt->ops[dquot->dq_id.type]->release_dqblk) {
include/linux/quotaops.h +10 -0
@@ -54,6 +54,16 @@ static inline struct dquot *dqgrab(strucatomic_inc (&dquot->dq_count);return dquot; } + +static inline bool dquot_is_busy (struct dquot *dquot) +{ +if (test_bit (DQ_MOD_B , &dquot->dq_flags)) +return true; +if (atomic_read (&dquot->dq_count) >1 ) +return true; +return false; +} +void dqput (struct dquot *dquot); int dquot_scan_active(struct super_block *sb, int (*fn)(struct dquot *dquot, unsigned long priv),
Greg Kroah-Hartman
maintainerPATCH 145/199 ext2: check err when partial != NULL
In reply to Greg Kroah-HartmanFrom: Chengguang Xu <[email protected]>
commit e705f4b8aa27a59f8933e8f384e9752f052c469c upstream.
Check err when partial == NULL is meaningless because partial == NULL means getting branch successfully without error.
--- fs/ext2/inode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/ext2/inode.c +5 -2
@@ -697,10 +697,13 @@ static int ext2_get_blocks(struct inodeif (!partial) { count++;mutex_unlock (&ei->truncate_mutex); -if (err) - goto cleanup; goto got_it; } + +if (err) { +mutex_unlock (&ei->truncate_mutex); + goto cleanup; + } }/*
Greg Kroah-Hartman
maintainerPATCH 147/199 scsi: zfcp: trace channel log even for FCP command responses
In reply to Greg Kroah-HartmanFrom: Steffen Maier <[email protected]>
[ Upstream commit 100843f176109af94600e500da0428e21030ca7f ]
While v2.6.26 commit b75db73159cc ("[SCSI] zfcp: Add qtcb dump to hba debug trace") is right that we don't want to flood the (payload) trace ring buffer, we don't trace successful FCP command responses by default. So we can include the channel log for problem determination with failed responses of any FSF request type.
--- drivers/s390/scsi/zfcp_dbf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/s390/scsi/zfcp_dbf.c +3 -5
@@ -93,11 +93,9 @@ void zfcp_dbf_hba_fsf_res(char *tag, int level, struct zfcp_fsf_req *req)memcpy (rec->u.res.fsf_status_qual, &q_head->fsf_status_qual,FSF_STATUS_QUALIFIER_SIZE ); -if (req->fsf_command !=FSF_QTCB_FCP_CMND ) { - rec->pl_len = q_head->log_length; -zfcp_dbf_pl_write (dbf, (char *)q_pref + q_head->log_start, - rec->pl_len,"fsf_res" , req->req_id); - } + rec->pl_len = q_head->log_length; +zfcp_dbf_pl_write (dbf, (char *)q_pref + q_head->log_start, + rec->pl_len,"fsf_res" , req->req_id);debug_event (dbf->hba, level, rec,sizeof (*rec));spin_unlock_irqrestore (&dbf->hba_lock, flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 149/199 xhci: Fix memory leak in xhci_add_in_port()
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
[ Upstream commit ce91f1a43b37463f517155bdfbd525eb43adbd1a ]
When xHCI is part of Alpine or Titan Ridge Thunderbolt controller and the xHCI device is hot-removed as a result of unplugging a dock for example, the driver leaks memory it allocates for xhci->usb3_rhub.psi and xhci->usb2_rhub.psi in xhci_add_in_port() as reported by kmemleak:
unreferenced object 0xffff922c24ef42f0 (size 16):
comm "kworker/u16:2", pid 178, jiffies 4294711640 (age 956.620s) hex dump (first 16 bytes):
21 00 0c 00 12 00 dc 05 23 00 e0 01 00 00 00 00 !.......#.......
backtrace:
[<000000007ac80914>] xhci_mem_init+0xcf8/0xeb7
[<0000000001b6d775>] xhci_init+0x7c/0x160
[<00000000db443fe3>] xhci_gen_setup+0x214/0x340
[<00000000fdffd320>] xhci_pci_setup+0x48/0x110
[<00000000541e1e03>] usb_add_hcd.cold+0x265/0x747
[<00000000ca47a56b>] usb_hcd_pci_probe+0x219/0x3b4
[<0000000021043861>] xhci_pci_probe+0x24/0x1c0
[<00000000b9231f25>] local_pci_probe+0x3d/0x70
[<000000006385c9d7>] pci_device_probe+0xd0/0x150
[<0000000070241068>] really_probe+0xf5/0x3c0
[<0000000061f35c0a>] driver_probe_device+0x58/0x100
[<000000009da11198>] bus_for_each_drv+0x79/0xc0
[<000000009ce45f69>] __device_attach+0xda/0x160
[<00000000df201aaf>] pci_bus_add_device+0x46/0x70
[<0000000088a1bc48>] pci_bus_add_devices+0x27/0x60
[<00000000ad9ee708>] pci_bus_add_devices+0x52/0x60
unreferenced object 0xffff922c24ef3318 (size 8):
comm "kworker/u16:2", pid 178, jiffies 4294711640 (age 956.620s)
hex dump (first 8 bytes):
34 01 05 00 35 41 0a 00 4...5A..
backtrace:
[<000000007ac80914>] xhci_mem_init+0xcf8/0xeb7
[<0000000001b6d775>] xhci_init+0x7c/0x160
[<00000000db443fe3>] xhci_gen_setup+0x214/0x340
[<00000000fdffd320>] xhci_pci_setup+0x48/0x110
[<00000000541e1e03>] usb_add_hcd.cold+0x265/0x747
[<00000000ca47a56b>] usb_hcd_pci_probe+0x219/0x3b4
[<0000000021043861>] xhci_pci_probe+0x24/0x1c0
[<00000000b9231f25>] local_pci_probe+0x3d/0x70
[<000000006385c9d7>] pci_device_probe+0xd0/0x150
[<0000000070241068>] really_probe+0xf5/0x3c0
[<0000000061f35c0a>] driver_probe_device+0x58/0x100
[<000000009da11198>] bus_for_each_drv+0x79/0xc0
[<000000009ce45f69>] __device_attach+0xda/0x160
[<00000000df201aaf>] pci_bus_add_device+0x46/0x70
[<0000000088a1bc48>] pci_bus_add_devices+0x27/0x60
[<00000000ad9ee708>] pci_bus_add_devices+0x52/0x60Fix this by calling kfree() for the both psi objects in xhci_mem_cleanup().
--- drivers/usb/host/xhci-mem.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/host/xhci-mem.c +4 -0
@@ -1940,10 +1940,14 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)kfree (xhci->port_array);kfree (xhci->rh_bw);kfree (xhci->ext_caps); +kfree (xhci->usb2_rhub.psi); +kfree (xhci->usb3_rhub.psi); xhci->usb2_ports =NULL ; xhci->usb3_ports =NULL ; xhci->port_array =NULL ; + xhci->usb2_rhub.psi =NULL ; + xhci->usb3_rhub.psi =NULL ; xhci->rh_bw =NULL ; xhci->ext_caps =NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 150/199 xhci: make sure interrupts are restored to correct state
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
[ Upstream commit bd82873f23c9a6ad834348f8b83f3b6a5bca2c65 ]
spin_unlock_irqrestore() might be called with stale flags after reading port status, possibly restoring interrupts to a incorrect state.
If a usb2 port just finished resuming while the port status is read the spin lock will be temporary released and re-acquired in a separate function. The flags parameter is passed as value instead of a pointer, not updating flags properly before the final spin_unlock_irqrestore() is called.
--- drivers/usb/host/xhci-hub.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-hub.c +4 -4
@@ -728,7 +728,7 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd, struct xhci_bus_state *bus_state, __le32 __iomem **port_array, u16 wIndex, u32 raw_port_status, - unsigned long flags) + unsigned long *flags) __releases(&xhci->lock) __acquires(&xhci->lock) {
@@ -810,12 +810,12 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,xhci_set_link_state (xhci, port_array, wIndex,XDEV_U0 ); -spin_unlock_irqrestore (&xhci->lock, flags); +spin_unlock_irqrestore (&xhci->lock, *flags); time_left =wait_for_completion_timeout ( &bus_state->rexit_done[wIndex],msecs_to_jiffies (XHCI_MAX_REXIT_TIMEOUT_MS )); -spin_lock_irqsave (&xhci->lock, flags); +spin_lock_irqsave (&xhci->lock, *flags);if (time_left) { slot_id = xhci_find_slot_id_by_port(hcd,
@@ -961,7 +961,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,break ; } status =xhci_get_port_status (hcd, bus_state, port_array, - wIndex, temp, flags); + wIndex, temp, &flags);if (status ==0xffffffff ) goto error;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/199 lib: raid6: fix awk build warnings
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit 702600eef73033ddd4eafcefcbb6560f3e3a90f7 upstream.
Newer versions of awk spit out these fun warnings:
awk: ../lib/raid6/unroll.awk:16: warning: regexp escape sequence `\#' is not a known regexp operator
As commit 700c1018b86d ("x86/insn: Fix awk regexp warnings") showed, it turns out that there are a number of awk strings that do not need to be escaped and newer versions of awk now warn about this.
Fix the string up so that no warning is produced. The exact same kernel module gets created before and after this patch, showing that it wasn't needed.
--- lib/raid6/unroll.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/raid6/unroll.awk +1 -1
@@ -13,7 +13,7 @@ BEGIN { for (i = 0; i < rep; ++i) { tmp = $0 gsub(/\$\$/, i, tmp) - gsub(/\$\#/, n, tmp) + gsub(/\$#/, n, tmp) gsub(/\$\*/, "$", tmp) print tmp }
Greg Kroah-Hartman
maintainerPATCH 151/199 iio: adis16480: Add debugfs_reg_access entry
In reply to Greg Kroah-HartmanFrom: Nuno Sá <[email protected]>
[ Upstream commit 4c35b7a51e2f291471f7221d112c6a45c63e83bc ]
The driver is defining debugfs entries by calling adis16480_debugfs_init(). However, those entries are attached to the iio_dev debugfs entry which won't exist if no debugfs_reg_access callback is provided.
--- drivers/iio/imu/adis16480.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/imu/adis16480.c +1 -0
@@ -724,6 +724,7 @@ static const struct iio_info adis16480_info = { .write_raw = &adis16480_write_raw, .update_scan_mode = adis_update_scan_mode, .driver_module = THIS_MODULE, + .debugfs_reg_access = adis_debugfs_reg_access, };static int adis16480_stop_device (struct iio_dev *indio_dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 152/199 Btrfs: fix negative subv_writers counter and data space leak after buffered write
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit a0e248bb502d5165b3314ac3819e888fdcdf7d9f ]
When doing a buffered write it's possible to leave the subv_writers counter of the root, used for synchronization between buffered nocow writers and snapshotting. This happens in an exceptional case like the following:
1) We fail to allocate data space for the write, since there's not enough available data space nor enough unallocated space for allocating a new data block group;
2) Because of that failure, we try to go to NOCOW mode, which succeeds and therefore we set the local variable 'only_release_metadata' to true and set the root's sub_writers counter to 1 through the call to btrfs_start_write_no_snapshotting() made by check_can_nocow();
3) The call to btrfs_copy_from_user() returns zero, which is very unlikely to happen but not impossible;
4) No pages are copied because btrfs_copy_from_user() returned zero;
5) We call btrfs_end_write_no_snapshotting() which decrements the root's subv_writers counter to 0;
6) We don't set 'only_release_metadata' back to 'false' because we do it only if 'copied', the value returned by btrfs_copy_from_user(), is greater than zero;
7) On the next iteration of the while loop, which processes the same page range, we are now able to allocate data space for the write (we got enough data space released in the meanwhile);
8) After this if we fail at btrfs_delalloc_reserve_metadata(), because now there isn't enough free metadata space, or in some other place further below (prepare_pages(), lock_and_cleanup_extent_if_need(), btrfs_dirty_pages()), we break out of the while loop with 'only_release_metadata' having a value of 'true';
9) Because 'only_release_metadata' is 'true' we end up decrementing the root's subv_writers counter to -1 (through a call to btrfs_end_write_no_snapshotting()), and we also end up not releasing the data space previously reserved through btrfs_check_data_free_space(). As a consequence the mechanism for synchronizing NOCOW buffered writes with snapshotting gets broken.
Fix this by always setting 'only_release_metadata' to false at the start of each iteration.
--- fs/btrfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/file.c +1 -1
@@ -1555,6 +1555,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,break ; } + only_release_metadata = false; sector_offset = pos & (root->sectorsize -1 ); reserve_bytes =round_up (write_bytes + sector_offset, root->sectorsize);
@@ -1704,7 +1705,6 @@ again:set_extent_bit (&BTRFS_I (inode)->io_tree, lockstart, lockend,EXTENT_NORESERVE ,NULL ,NULL ,GFP_NOFS ); - only_release_metadata = false; }btrfs_drop_pages (pages, num_pages);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 154/199 scsi: lpfc: Cap NPIV vports to 256
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 8b47ae69e049ae0b3373859d901f0334322f9fe9 ]
Depending on the chipset, the number of NPIV vports may vary and be in excess of what most switches support (256). To avoid confusion with the users, limit the reported NPIV vports to 256.
Additionally correct the 16G adapter which is reporting a bogus NPIV vport number if the link is down.
--- drivers/scsi/lpfc/lpfc.h | 3 ++- drivers/scsi/lpfc/lpfc_attr.c | 12 ++++++++++-- drivers/scsi/lpfc/lpfc_init.c | 3 +++ 3 files changed, 15 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc.h +2 -1
@@ -878,7 +878,8 @@ struct lpfc_hba {struct list_head port_list;struct lpfc_vport *pport;/* physical lpfc_vport pointer */ uint16_t max_vpi;/* Maximum virtual nports */ -#define LPFC_MAX_VPI 0xFFFF/* Max number of VPI supported */ +#define LPFC_MAX_VPI 0xFF/* Max number VPI supported 0 - 0xff */ +#define LPFC_MAX_VPORTS 0x100/* Max vports per port, with pport */ uint16_t max_vports;/* * For IOV HBAs max_vpi can change * after a reset. max_vports is max
drivers/scsi/lpfc/lpfc_attr.c +10 -2
@@ -1214,6 +1214,9 @@ lpfc_get_hba_info(struct lpfc_hba *phba, max_vpi = (bf_get (lpfc_mbx_rd_conf_vpi_count, rd_config) >0 ) ? (bf_get (lpfc_mbx_rd_conf_vpi_count, rd_config) -1 ) :0 ; +/* Limit the max we support */ +if (max_vpi >LPFC_MAX_VPI ) + max_vpi =LPFC_MAX_VPI ;if (mvpi) *mvpi = max_vpi;if (avpi)
@@ -1229,8 +1232,13 @@ lpfc_get_hba_info(struct lpfc_hba *phba, *axri = pmb->un.varRdConfig.avail_xri;if (mvpi) *mvpi = pmb->un.varRdConfig.max_vpi; -if (avpi) - *avpi = pmb->un.varRdConfig.avail_vpi; +if (avpi) { +/* avail_vpi is only valid if link is up and ready */ +if (phba->link_state ==LPFC_HBA_READY ) + *avpi = pmb->un.varRdConfig.avail_vpi; +else + *avpi = pmb->un.varRdConfig.max_vpi; + } }mempool_free (pmboxq, phba->mbox_mem_pool);
drivers/scsi/lpfc/lpfc_init.c +3 -0
@@ -6973,6 +6973,9 @@ lpfc_sli4_read_config(struct lpfc_hba *phba)bf_get (lpfc_mbx_rd_conf_xri_base, rd_config); phba->sli4_hba.max_cfg_param.max_vpi =bf_get (lpfc_mbx_rd_conf_vpi_count, rd_config); +/* Limit the max we support */ +if (phba->sli4_hba.max_cfg_param.max_vpi >LPFC_MAX_VPORTS ) + phba->sli4_hba.max_cfg_param.max_vpi =LPFC_MAX_VPORTS ; phba->sli4_hba.max_cfg_param.vpi_base =bf_get (lpfc_mbx_rd_conf_vpi_base, rd_config); phba->sli4_hba.max_cfg_param.max_rpi =
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 153/199 omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 2398c41d64321e62af54424fd399964f3d48cdc2 ]
With a wl1251 child node of mmc3 in the device tree decoded in omap_hsmmc.c to handle special wl1251 initialization, we do no longer need to instantiate the mmc3 through pdata quirks.
We also can remove the wlan regulator and reset/interrupt definitions and do them through device tree.
--- arch/arm/mach-omap2/pdata-quirks.c | 93 ------------------------------ 1 file changed, 93 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +0 -93
@@ -308,108 +308,15 @@ static void __init omap3_logicpd_torpedo_init(void) }/* omap3pandora legacy devices */ -#define PANDORA_WIFI_IRQ_GPIO 21 -#define PANDORA_WIFI_NRESET_GPIO 23static struct platform_device pandora_backlight = { .name ="pandora-backlight" , .id =-1 , }; -static struct regulator_consumer_supply pandora_vmmc3_supply[] = { -REGULATOR_SUPPLY ("vmmc" ,"omap_hsmmc.2" ), -}; - -static struct regulator_init_data pandora_vmmc3 = { - .constraints = { - .valid_ops_mask =REGULATOR_CHANGE_STATUS , - }, - .num_consumer_supplies =ARRAY_SIZE (pandora_vmmc3_supply), - .consumer_supplies = pandora_vmmc3_supply, -}; - -static struct fixed_voltage_config pandora_vwlan = { - .supply_name ="vwlan" , - .microvolts =1800000 ,/* 1.8V */ - .gpio =PANDORA_WIFI_NRESET_GPIO , - .startup_delay =50000 ,/* 50ms */ - .enable_high =1 , - .init_data = &pandora_vmmc3, -}; - -static struct platform_device pandora_vwlan_device = { - .name ="reg-fixed-voltage" , - .id =1 , - .dev = { - .platform_data = &pandora_vwlan, - }, -}; - -static void pandora_wl1251_init_card (struct mmc_card *card) -{ -/* -* We have TI wl1251 attached to MMC3. Pass this information to -* SDIO core because it can't be probed by normal methods. -*/ -if (card->type ==MMC_TYPE_SDIO || card->type ==MMC_TYPE_SD_COMBO ) { - card->quirks |=MMC_QUIRK_NONSTD_SDIO ; - card->cccr.wide_bus =1 ; - card->cis.vendor =0x104c ; - card->cis.device =0x9066 ; - card->cis.blksize =512 ; - card->cis.max_dtr =24000000 ; - card->ocr =0x80 ; - } -} - -static struct omap2_hsmmc_info pandora_mmc3[] = { - { - .mmc =3 , - .caps =MMC_CAP_4_BIT_DATA |MMC_CAP_POWER_OFF_CARD , - .gpio_cd = -EINVAL , - .gpio_wp = -EINVAL , - .init_card = pandora_wl1251_init_card, - }, - {}/* Terminator */ -}; - -static void __init pandora_wl1251_init (void ) -{ -struct wl1251_platform_data pandora_wl1251_pdata; -int ret; - -memset (&pandora_wl1251_pdata,0 ,sizeof (pandora_wl1251_pdata)); - - pandora_wl1251_pdata.power_gpio =-1 ; - - ret =gpio_request_one (PANDORA_WIFI_IRQ_GPIO ,GPIOF_IN ,"wl1251 irq" ); -if (ret <0 ) - goto fail; - - pandora_wl1251_pdata.irq =gpio_to_irq (PANDORA_WIFI_IRQ_GPIO ); -if (pandora_wl1251_pdata.irq <0 ) - goto fail_irq; - - pandora_wl1251_pdata.use_eeprom = true; - ret =wl1251_set_platform_data (&pandora_wl1251_pdata); -if (ret <0 ) - goto fail_irq; - -return ; - -fail_irq: -gpio_free (PANDORA_WIFI_IRQ_GPIO ); -fail: -pr_err ("wl1251 board initialisation failed\n" ); -} -static void __init omap3_pandora_legacy_init (void ) {platform_device_register (&pandora_backlight); -platform_device_register (&pandora_vwlan_device); -omap_hsmmc_init (pandora_mmc3); -omap_hsmmc_late_init (pandora_mmc3); -pandora_wl1251_init (); }#endif /* CONFIG_ARCH_OMAP3 */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 155/199 e100: Fix passing zero to PTR_ERR warning in e100_load_ucode_wait
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit cd0d465bb697a9c7bf66a9fe940f7981232f1676 ]
Fix a static code checker warning:drivers/net/ethernet/intel/e100.c:1349
e100_load_ucode_wait() warn: passing zero to 'PTR_ERR'
--- drivers/net/ethernet/intel/e100.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/e100.c +2 -2
@@ -1370,8 +1370,8 @@ static inline int e100_load_ucode_wait(struct nic *nic) fw =e100_request_firmware (nic);/* If it's NULL, then no ucode is required */ -if (!fw ||IS_ERR (fw)) -return PTR_ERR (fw); +if (IS_ERR_OR_NULL (fw)) +return PTR_ERR_OR_ZERO (fw);if ((err =e100_exec_cb (nic, (void *)fw, e100_setup_ucode))) netif_err(nic, probe, nic->netdev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/199 ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity
In reply to Greg Kroah-HartmanFrom: Jarkko Nikula <[email protected]>
[ Upstream commit 287897f9aaa2ad1c923d9875914f57c4dc9159c8 ]
The MMC card detection GPIO polarity is active low on TAO3530, like in many other similar boards. Now the card is not detected and it is unable to mount rootfs from an SD card.
Fix this by using the correct polarity.
This incorrect polarity was defined already in the commit 30d95c6d7092 ("ARM: dts: omap3: Add Technexion TAO3530 SOM omap3-tao3530.dtsi") in v3.18 kernel and later changed to use defined GPIO constants in v4.4 kernel by the commit 3a637e008e54 ("ARM: dts: Use defined GPIO constants in flags cell for OMAP2+ boards").
While the latter commit did not introduce the issue I'm marking it with Fixes tag due the v4.4 kernels still being maintained.
--- arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap3-tao3530.dtsi +1 -1
@@ -225,7 +225,7 @@ pinctrl-0 = <&mmc1_pins>; vmmc-supply = <&vmmc1>; vmmc_aux-supply = <&vsim>; - cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>; + cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>; bus-width = <8>; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/199 ALSA: hda - Fix pending unsol events at shutdown
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit ca58f55108fee41d87c9123f85ad4863e5de7f45 ]
This is an alternative fix attemp for the issue reported in the commit caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was reverted later due to regressions. Instead of tweaking the hardware disablement order and the enforced irq flushing, do calling cancel_work_sync() of the unsol work early enough, and explicitly ignore the unsol events during the shutdown by checking the bus->shutdown flag.
--- sound/pci/hda/hda_bind.c | 4 ++++ sound/pci/hda/hda_intel.c | 3 +++ 2 files changed, 7 insertions(+)
sound/pci/hda/hda_bind.c +4 -0
@@ -42,6 +42,10 @@ static void hda_codec_unsol_event(struct { struct hda_codec *codec = container_of(dev, struct hda_codec, core); +/* ignore unsol events during shutdown */ +if (codec->bus->shutdown) +return ; +if (codec->patch_ops.unsol_event) codec->patch_ops.unsol_event (codec, ev); }
sound/pci/hda/hda_intel.c +3 -0
@@ -1275,8 +1275,11 @@ static int azx_free(struct azx *chip)static int azx_dev_disconnect (struct snd_device *device) {struct azx *chip = device->device_data; +struct hdac_bus *bus =azx_bus (chip); chip->bus.shutdown =1 ; +cancel_work_sync (&bus->unsol_work); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 158/199 ath10k: fix fw crash by moving chip reset after napi disabled
In reply to Greg Kroah-HartmanFrom: Miaoqing Pan <[email protected]>
[ Upstream commit 08d80e4cd27ba19f9bee9e5f788f9a9fc440a22f ]
On SMP platform, when continuously running wifi up/down, the napi poll can be scheduled during chip reset, which will call ath10k_pci_has_fw_crashed() to check the fw status. But in the reset period, the value from FW_INDICATOR_ADDRESS register will return 0xdeadbeef, which also be treated as fw crash. Fix the issue by moving chip reset after napi disabled.
ath10k_pci 0000:01:00.0: firmware crashed! (guid 73b30611-5b1e-4bdd-90b4-64c81eb947b6) ath10k_pci 0000:01:00.0: qca9984/qca9994 hw1.0 target 0x01000000 chip_id 0x00000000 sub 168c:cafe ath10k_pci 0000:01:00.0: htt-ver 2.2 wmi-op 6 htt-op 4 cal otp max-sta 512 raw 0 hwcrypto 1 ath10k_pci 0000:01:00.0: failed to get memcpy hi address for firmware address 4: -16 ath10k_pci 0000:01:00.0: failed to read firmware dump area: -16ath10k_pci 0000:01:00.0: Copy Engine register dump:
ath10k_pci 0000:01:00.0: [00]: 0x0004a000 0 0 0 0 ath10k_pci 0000:01:00.0: [01]: 0x0004a400 0 0 0 0 ath10k_pci 0000:01:00.0: [02]: 0x0004a800 0 0 0 0 ath10k_pci 0000:01:00.0: [03]: 0x0004ac00 0 0 0 0 ath10k_pci 0000:01:00.0: [04]: 0x0004b000 0 0 0 0 ath10k_pci 0000:01:00.0: [05]: 0x0004b400 0 0 0 0 ath10k_pci 0000:01:00.0: [06]: 0x0004b800 0 0 0 0 ath10k_pci 0000:01:00.0: [07]: 0x0004bc00 1 0 1 0 ath10k_pci 0000:01:00.0: [08]: 0x0004c000 0 0 0 0 ath10k_pci 0000:01:00.0: [09]: 0x0004c400 0 0 0 0 ath10k_pci 0000:01:00.0: [10]: 0x0004c800 0 0 0 0 ath10k_pci 0000:01:00.0: [11]: 0x0004cc00 0 0 0 0
Tested HW: QCA9984,QCA9887,WCN3990
--- drivers/net/wireless/ath/ath10k/pci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/pci.c +5 -4
@@ -1765,6 +1765,11 @@ static void ath10k_pci_hif_stop(struct ath10k *ar)ath10k_dbg (ar,ATH10K_DBG_BOOT ,"boot hif stop\n" ); +ath10k_pci_irq_disable (ar); +ath10k_pci_irq_sync (ar); +napi_synchronize (&ar->napi); +napi_disable (&ar->napi); +/* Most likely the device has HTT Rx ring configured. The only way to * prevent the device from accessing (and possible corrupting) host * memory is to reset the chip now.
@@ -1778,10 +1783,6 @@ static void ath10k_pci_hif_stop(struct ath10k *ar)*/ ath10k_pci_safe_chip_reset (ar); -ath10k_pci_irq_disable (ar); -ath10k_pci_irq_sync (ar); -napi_synchronize (&ar->napi); -napi_disable (&ar->napi);ath10k_pci_flush (ar);spin_lock_irqsave (&ar_pci->ps_lock, flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 163/199 scsi: qla2xxx: Fix qla24xx_process_bidir_cmd()
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit c29282c65d1cf54daeea63be46243d7f69d72f4d ]
Set the r??_data_len variables before using these instead of after.
This patch fixes the following Coverity complaint:
const: At condition req_data_len != rsp_data_len, the value of req_data_len must be equal to 0.
const: At condition req_data_len != rsp_data_len, the value of rsp_data_len must be equal to 0.dead_error_condition: The condition req_data_len != rsp_data_len cannot be true.
--- drivers/scsi/qla2xxx/qla_bsg.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_bsg.c +5 -6
@@ -1744,8 +1744,8 @@ qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)uint16_t nextlid =0 ;uint32_t tot_dsds;srb_t *sp =NULL ; -uint32_t req_data_len =0 ; -uint32_t rsp_data_len =0 ; +uint32_t req_data_len; +uint32_t rsp_data_len;/* Check the type of the adapter */ if (!IS_BIDI_CAPABLE (ha)) {
@@ -1850,6 +1850,9 @@ qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job) goto done_unmap_sg; } + req_data_len = bsg_job->request_payload.payload_len; + rsp_data_len = bsg_job->reply_payload.payload_len; +if (req_data_len != rsp_data_len) { rval =EXT_STATUS_BUSY ; ql_log(ql_log_warn, vha, 0x70aa,
@@ -1857,10 +1860,6 @@ qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job) goto done_unmap_sg; } - req_data_len = bsg_job->request_payload.payload_len; - rsp_data_len = bsg_job->reply_payload.payload_len; - -/* Alloc SRB structure */ sp =qla2x00_get_sp (vha, &(vha->bidir_fcport),GFP_KERNEL );if (!sp) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/199 workqueue: Fix pwq ref leak in rescuer_thread()
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit e66b39af00f426b3356b96433d620cb3367ba1ff upstream.
008847f66c3 ("workqueue: allow rescuer thread to do more work.") made the rescuer worker requeue the pwq immediately if there may be more work items which need rescuing instead of waiting for the next mayday timer expiration. Unfortunately, it doesn't check whether the pwq is already on the mayday list and unconditionally gets the ref and moves it onto the list. This doesn't corrupt the list but creates an additional reference to the pwq. It got queued twice but will only be removed once.
This leak later can trigger pwq refcnt warning on workqueue destruction and prevent freeing of the workqueue.
--- kernel/workqueue.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
kernel/workqueue.c +10 -3
@@ -2344,8 +2344,14 @@ repeat:*/ if (need_to_create_worker (pool)) {spin_lock (&wq_mayday_lock); -get_pwq (pwq); -list_move_tail (&pwq->mayday_node, &wq->maydays); +/* +* Queue iff we aren't racing destruction +* and somebody else hasn't queued it already. +*/ +if (wq->rescuer &&list_empty (&pwq->mayday_node)) { +get_pwq (pwq); +list_add_tail (&pwq->mayday_node, &wq->maydays); + }spin_unlock (&wq_mayday_lock); } }
@@ -4358,7 +4364,8 @@ static void show_pwq(struct pool_workquepr_info (" pwq %d:" , pool->id);pr_cont_pool_info (pool); -pr_cont (" active=%d/%d%s\n" , pwq->nr_active, pwq->max_active, +pr_cont (" active=%d/%d refcnt=%d%s\n" , + pwq->nr_active, pwq->max_active, pwq->refcnt, !list_empty (&pwq->mayday_node) ?" MAYDAY" :"" );hash_for_each (pool->busy_hash, bkt, worker, hentry) {
Greg Kroah-Hartman
maintainerPATCH 127/199 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report
In reply to Greg Kroah-HartmanFrom: Pawel Harlozinski <[email protected]>
commit 8f157d4ff039e03e2ed4cb602eeed2fd4687a58f upstream.
Check for existance of jack before tracing.
NULL pointer dereference has been reported by KASAN while unloading machine driver (snd_soc_cnl_rt274).
--- sound/soc/soc-jack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-jack.c +1 -2
@@ -80,10 +80,9 @@ void snd_soc_jack_report(struct snd_soc_unsigned int sync =0 ;int enable; -trace_snd_soc_jack_report (jack, mask, status); -if (!jack)return ; +trace_snd_soc_jack_report (jack, mask, status); dapm = &jack->card->dapm;
Greg Kroah-Hartman
maintainerPATCH 128/199 blk-mq: avoid sysfs buffer overflow with too many CPU cores
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
commit 8962842ca5abdcf98e22ab3b2b45a103f0408b95 upstream.
It is reported that sysfs buffer overflow can be triggered if the system has too many CPU cores(>841 on 4K PAGE_SIZE) when showing CPUs of hctx via /sys/block/$DEV/mq/$N/cpu_list.
Use snprintf to avoid the potential buffer overflow.
This version doesn't change the attribute format, and simply stops showing CPU numbers if the buffer is going to overflow.
--- block/blk-mq-sysfs.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
block/blk-mq-sysfs.c +10 -5
@@ -243,20 +243,25 @@ static ssize_t blk_mq_hw_sysfs_active_shstatic ssize_t blk_mq_hw_sysfs_cpus_show (struct blk_mq_hw_ctx *hctx,char *page) { +const size_t size =PAGE_SIZE -1 ;unsigned int i, first =1 ; -ssize_t ret =0 ; +int ret =0 , pos =0 ;for_each_cpu (i, hctx->cpumask) {if (first) - ret +=sprintf (ret + page,"%u" , i); + ret =snprintf (pos + page, size - pos,"%u" , i);else - ret +=sprintf (ret + page,", %u" , i); + ret =snprintf (pos + page, size - pos,", %u" , i); + +if (ret >= size - pos) +break ; first =0 ; + pos += ret; } - ret +=sprintf (ret + page,"\n" ); -return ret; + ret =snprintf (pos + page, size - pos,"\n" ); +return pos + ret; }static struct blk_mq_ctx_sysfs_entry blk_mq_sysfs_dispatched = {
Greg Kroah-Hartman
maintainerPATCH 129/199 cgroup: pids: use atomic64_t for pids->limit
In reply to Greg Kroah-HartmanFrom: Aleksa Sarai <[email protected]>
commit a713af394cf382a30dd28a1015cbe572f1b9ca75 upstream.
Because pids->limit can be changed concurrently (but we don't want to take a lock because it would be needlessly expensive), use atomic64_ts instead.
--- kernel/cgroup_pids.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
kernel/cgroup_pids.c +6 -5
@@ -48,7 +48,7 @@ struct pids_cgroup {* %PIDS_MAX = (%PID_MAX_LIMIT + 1). */ atomic64_t counter; -int64_t limit; +atomic64_t limit;/* Handle for "pids.events" */ struct cgroup_file events_file;
@@ -76,8 +76,8 @@ pids_css_alloc(struct cgroup_subsys_statif (!pids)return ERR_PTR (-ENOMEM ); - pids->limit =PIDS_MAX ;atomic64_set (&pids->counter,0 ); +atomic64_set (&pids->limit,PIDS_MAX );atomic64_set (&pids->events_limit,0 );return &pids->css; }
@@ -149,13 +149,14 @@ static int pids_try_charge(struct pids_cfor (p = pids;parent_pids (p); p =parent_pids (p)) {int64_t new =atomic64_add_return (num, &p->counter); +int64_t limit =atomic64_read (&p->limit);/* * Since new is capped to the maximum number of pid_t, if * p->limit is %PIDS_MAX then we know that this test will never * fail. */ -if (new > p->limit) +if (new > limit) goto revert; }
@@ -280,7 +281,7 @@ set_limit:* Limit updates don't need to be mutex'd, since it isn't * critical that any racing fork()s follow the new limit. */ - pids->limit = limit; +atomic64_set (&pids->limit, limit);return nbytes; }
@@ -288,7 +289,7 @@ static int pids_max_show(struct seq_file {struct cgroup_subsys_state *css =seq_css (sf);struct pids_cgroup *pids =css_pids (css); -int64_t limit = pids->limit; +int64_t limit =atomic64_read (&pids->limit);if (limit >=PIDS_MAX )seq_printf (sf,"%s\n" ,PIDS_MAX_STR );
Greg Kroah-Hartman
maintainerPATCH 165/199 powerpc: Fix vDSO clock_getres()
In reply to Greg Kroah-HartmanFrom: Vincenzo Frascino <[email protected]>
[ Upstream commit 552263456215ada7ee8700ce022d12b0cffe4802 ]
clock_getres in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res().
In particular, posix_get_hrtimer_res() does:
sec = 0;
ns = hrtimer_resolution;and hrtimer_resolution depends on the enablement of the high resolution timers that can happen either at compile or at run time.
Fix the powerpc vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly.
--- arch/powerpc/include/asm/vdso_datapage.h | 2 ++ arch/powerpc/kernel/asm-offsets.c | 2 +- arch/powerpc/kernel/time.c | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++-- 5 files changed, 14 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/vdso_datapage.h +2 -0
@@ -86,6 +86,7 @@ struct vdso_data {__s32 wtom_clock_nsec;struct timespec stamp_xtime;/* xtime as at tb_orig_stamp */ __u32 stamp_sec_fraction;/* fractional seconds of stamp_xtime */ +__u32 hrtimer_res;/* hrtimer resolution */ __u32 syscall_map_64[SYSCALL_MAP_SIZE ];/* map of syscalls */ __u32 syscall_map_32[SYSCALL_MAP_SIZE ];/* map of syscalls */ };
@@ -107,6 +108,7 @@ struct vdso_data {__s32 wtom_clock_nsec;struct timespec stamp_xtime;/* xtime as at tb_orig_stamp */ __u32 stamp_sec_fraction;/* fractional seconds of stamp_xtime */ +__u32 hrtimer_res;/* hrtimer resolution */ __u32 syscall_map_32[SYSCALL_MAP_SIZE ];/* map of syscalls */ __u32 dcache_block_size;/* L1 d-cache block size */ __u32 icache_block_size;/* L1 i-cache block size */
arch/powerpc/kernel/asm-offsets.c +1 -1
@@ -383,6 +383,7 @@ int main(void)DEFINE (WTOM_CLOCK_NSEC , offsetof(struct vdso_data , wtom_clock_nsec));DEFINE (STAMP_XTIME , offsetof(struct vdso_data , stamp_xtime));DEFINE (STAMP_SEC_FRAC , offsetof(struct vdso_data , stamp_sec_fraction)); +DEFINE (CLOCK_HRTIMER_RES , offsetof(struct vdso_data , hrtimer_res));DEFINE (CFG_ICACHE_BLOCKSZ , offsetof(struct vdso_data , icache_block_size));DEFINE (CFG_DCACHE_BLOCKSZ , offsetof(struct vdso_data , dcache_block_size));DEFINE (CFG_ICACHE_LOGBLOCKSZ , offsetof(struct vdso_data , icache_log_block_size));
@@ -411,7 +412,6 @@ int main(void)DEFINE (CLOCK_REALTIME ,CLOCK_REALTIME );DEFINE (CLOCK_MONOTONIC ,CLOCK_MONOTONIC );DEFINE (NSEC_PER_SEC ,NSEC_PER_SEC ); -DEFINE (CLOCK_REALTIME_RES ,MONOTONIC_RES_NSEC );#ifdef CONFIG_BUG DEFINE (BUG_ENTRY_SIZE ,sizeof (struct bug_entry ));
arch/powerpc/kernel/time.c +1 -0
@@ -862,6 +862,7 @@ void update_vsyscall_old(struct timespec vdso_data->wtom_clock_nsec = wtm->tv_nsec; vdso_data->stamp_xtime = *wall_time; vdso_data->stamp_sec_fraction = frac_sec; + vdso_data->hrtimer_res = hrtimer_resolution;smp_wmb (); ++(vdso_data->tb_update_count); }
arch/powerpc/kernel/vdso32/gettimeofday.S +5 -2
@@ -160,12 +160,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) cror cr0*4+eq,cr0*4+eq,cr1*4+eq bne cr0,99f + mflr r12 + .cfi_register lr,r12 + bl __get_datapage@local /* get data page */ + lwz r5, CLOCK_HRTIMER_RES(r3) + mtlr r12 li r3,0 cmpli cr0,r4,0 crclr cr0*4+so beqlr - lis r5,CLOCK_REALTIME_RES@h - ori r5,r5,CLOCK_REALTIME_RES@l stw r3,TSPC32_TV_SEC(r4) stw r5,TSPC32_TV_NSEC(r4) blr
arch/powerpc/kernel/vdso64/gettimeofday.S +5 -2
@@ -145,12 +145,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) cror cr0*4+eq,cr0*4+eq,cr1*4+eq bne cr0,99f + mflr r12 + .cfi_register lr,r12 + bl V_LOCAL_FUNC(__get_datapage) + lwz r5, CLOCK_HRTIMER_RES(r3) + mtlr r12 li r3,0 cmpldi cr0,r4,0 crclr cr0*4+so beqlr - lis r5,CLOCK_REALTIME_RES@h - ori r5,r5,CLOCK_REALTIME_RES@l std r3,TSPC64_TV_SEC(r4) std r5,TSPC64_TV_NSEC(r4) blr
Greg Kroah-Hartman
maintainerPATCH 120/199 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit 0e531cc575c4e9e3dd52ad287b49d3c2dc74c810 upstream.
In commit 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers"), a callback to get the RX buffer address was added to the PCI driver. Unfortunately, driver rtl8192de was not modified appropriately and the code runs into a WARN_ONCE() call. The use of an incorrect array is also fixed.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +5 -3
@@ -843,13 +843,15 @@ u32 rtl92de_get_desc(u8 *p_desc, bool isbreak ; } }else { -struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc;switch (desc_name) {case HW_DESC_OWN : - ret =GET_RX_DESC_OWN (pdesc); + ret =GET_RX_DESC_OWN (p_desc);break ;case HW_DESC_RXPKT_LEN : - ret =GET_RX_DESC_PKT_LEN (pdesc); + ret =GET_RX_DESC_PKT_LEN (p_desc); +break ; +case HW_DESC_RXBUFF_ADDR : + ret =GET_RX_DESC_BUFF_ADDR (p_desc);break ;default : RT_ASSERT(false, "ERR rxdesc :%d not process\n",
Greg Kroah-Hartman
maintainerPATCH 175/199 nvme: host: core: fix precedence of ternary operator
In reply to Greg Kroah-HartmanFrom: Ivan Bornyakov <[email protected]>
commit e9a9853c23c13a37546397b61b270999fd0fb759 upstream.
Ternary operator have lower precedence then bitwise or, so 'cdw10' was calculated wrong.
--- drivers/nvme/host/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +2 -2
@@ -1043,7 +1043,7 @@ static int nvme_pr_reserve(struct block_static int nvme_pr_preempt (struct block_device *bdev,u64 old,u64 new,enum pr_type type,bool abort) { -u32 cdw10 =nvme_pr_type (type) <<8 | abort ?2 :1 ; +u32 cdw10 =nvme_pr_type (type) <<8 | (abort ?2 :1 );return nvme_pr_command (bdev, cdw10, old, new, nvme_cmd_resv_acquire); }
@@ -1055,7 +1055,7 @@ static int nvme_pr_clear(struct block_destatic int nvme_pr_release (struct block_device *bdev,u64 key,enum pr_type type) { -u32 cdw10 =nvme_pr_type (type) <<8 | key ?1 <<3 :0 ; +u32 cdw10 =nvme_pr_type (type) <<8 | (key ?1 <<3 :0 );return nvme_pr_command (bdev, cdw10, key,0 , nvme_cmd_resv_release); }
Greg Kroah-Hartman
maintainerPATCH 177/199 net: ethernet: ti: cpsw: fix extra rx interrupt
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 51302f77bedab8768b761ed1899c08f89af9e4e2 ]
Now RX interrupt is triggered twice every time, because in cpsw_rx_interrupt() it is asked first and then disabled. So there will be pending interrupt always, when RX interrupt is enabled again in NAPI handler.
Fix it by first disabling IRQ and then do ask.
--- drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ti/cpsw.c +1 -1
@@ -773,8 +773,8 @@ static irqreturn_t cpsw_rx_interrupt(int {struct cpsw_common *cpsw = dev_id; -cpdma_ctlr_eoi (cpsw->dma,CPDMA_EOI_RX );writel (0 , &cpsw->wr_regs->rx_en); +cpdma_ctlr_eoi (cpsw->dma,CPDMA_EOI_RX );if (cpsw->quirk_irq) {disable_irq_nosync (cpsw->irqs_table[0 ]);
Greg Kroah-Hartman
maintainerPATCH 178/199 openvswitch: support asymmetric conntrack
In reply to Greg Kroah-HartmanFrom: Aaron Conole <[email protected]>
[ Upstream commit 5d50aa83e2c8e91ced2cca77c198b468ca9210f4 ]
The openvswitch module shares a common conntrack and NAT infrastructure exposed via netfilter. It's possible that a packet needs both SNAT and DNAT manipulation, due to e.g. tuple collision. Netfilter can support this because it runs through the NAT table twice - once on ingress and again after egress. The openvswitch module doesn't have such capability.
Like netfilter hook infrastructure, we should run through NAT twice to keep the symmetry.
--- net/openvswitch/conntrack.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/openvswitch/conntrack.c +11 -0
@@ -709,6 +709,17 @@ static int ovs_ct_nat(struct net *net, s } err =ovs_ct_nat_execute (skb, ct, ctinfo, &info->range, maniptype); +if (err ==NF_ACCEPT && + ct->status &IPS_SRC_NAT && ct->status &IPS_DST_NAT ) { +if (maniptype ==NF_NAT_MANIP_SRC ) + maniptype =NF_NAT_MANIP_DST ; +else + maniptype =NF_NAT_MANIP_SRC ; + + err =ovs_ct_nat_execute (skb, ct, ctinfo, &info->range, + maniptype); + } +/* Mark NAT done if successful and update the flow key. */ if (err ==NF_ACCEPT )ovs_nat_update_key (key, skb, maniptype);
Greg Kroah-Hartman
maintainerPATCH 179/199 tcp: md5: fix potential overestimation of TCP option space
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 9424e2e7ad93ffffa88f882c9bc5023570904b55 ]
Back in 2008, Adam Langley fixed the corner case of packets for flows having all of the following options : MD5 TS SACK
Since MD5 needs 20 bytes, and TS needs 12 bytes, no sack block can be cooked from the remaining 8 bytes.
tcp_established_options() correctly sets opts->num_sack_blocks to zero, but returns 36 instead of 32.
This means TCP cooks packets with 4 extra bytes at the end of options, containing unitialized bytes.
--- net/ipv4/tcp_output.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ipv4/tcp_output.c +3 -2
@@ -707,8 +707,9 @@ static unsigned int tcp_established_opti min_t(unsigned int, eff_sacks, (remaining -TCPOLEN_SACK_BASE_ALIGNED ) / TCPOLEN_SACK_PERBLOCK); - size +=TCPOLEN_SACK_BASE_ALIGNED + - opts->num_sack_blocks *TCPOLEN_SACK_PERBLOCK ; +if (likely (opts->num_sack_blocks)) + size +=TCPOLEN_SACK_BASE_ALIGNED + + opts->num_sack_blocks *TCPOLEN_SACK_PERBLOCK ; }return size;
Greg Kroah-Hartman
maintainerPATCH 180/199 tipc: fix ordering of tipc module init and exit routine
In reply to Greg Kroah-HartmanFrom: Taehee Yoo <[email protected]>
[ Upstream commit 9cf1cd8ee3ee09ef2859017df2058e2f53c5347f ]
In order to set/get/dump, the tipc uses the generic netlink infrastructure. So, when tipc module is inserted, init function calls genl_register_family().
After genl_register_family(), set/get/dump commands are immediately allowed and these callbacks internally use the net_generic. net_generic is allocated by register_pernet_device() but this is called after genl_register_family() in the __init function. So, these callbacks would use un-initialized net_generic.
Test commands:
#SHELL1
while :
do
modprobe tipc
modprobe -rv tipc
done
#SHELL2
while :
do
tipc link list
done
Splat looks like:
[ 59.616322][ T2788] kasan: CONFIG_KASAN_INLINE enabled [ 59.617234][ T2788] kasan: GPF could be caused by NULL-ptr deref or user memory access [ 59.618398][ T2788] general protection fault: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI [ 59.619389][ T2788] CPU: 3 PID: 2788 Comm: tipc Not tainted 5.4.0+ #194 [ 59.620231][ T2788] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 [ 59.621428][ T2788] RIP: 0010:tipc_bcast_get_broadcast_mode+0x131/0x310 [tipc] [ 59.622379][ T2788] Code: c7 c6 ef 8b 38 c0 65 ff 0d 84 83 c9 3f e8 d7 a5 f2 e3 48 8d bb 38 11 00 00 48 b8 00 00 00 00 [ 59.622550][ T2780] NET: Registered protocol family 30 [ 59.624627][ T2788] RSP: 0018:ffff88804b09f578 EFLAGS: 00010202 [ 59.624630][ T2788] RAX: dffffc0000000000 RBX: 0000000000000011 RCX: 000000008bc66907 [ 59.624631][ T2788] RDX: 0000000000000229 RSI: 000000004b3cf4cc RDI: 0000000000001149 [ 59.624633][ T2788] RBP: ffff88804b09f588 R08: 0000000000000003 R09: fffffbfff4fb3df1 [ 59.624635][ T2788] R10: fffffbfff50318f8 R11: ffff888066cadc18 R12: ffffffffa6cc2f40 [ 59.624637][ T2788] R13: 1ffff11009613eba R14: ffff8880662e9328 R15: ffff8880662e9328 [ 59.624639][ T2788] FS: 00007f57d8f7b740(0000) GS:ffff88806cc00000(0000) knlGS:0000000000000000 [ 59.624645][ T2788] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 59.625875][ T2780] tipc: Started in single node mode [ 59.626128][ T2788] CR2: 00007f57d887a8c0 CR3: 000000004b140002 CR4: 00000000000606e0 [ 59.633991][ T2788] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 59.635195][ T2788] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 59.636478][ T2788] Call Trace: [ 59.637025][ T2788] tipc_nl_add_bc_link+0x179/0x1470 [tipc] [ 59.638219][ T2788] ? lock_downgrade+0x6e0/0x6e0 [ 59.638923][ T2788] ? __tipc_nl_add_link+0xf90/0xf90 [tipc] [ 59.639533][ T2788] ? tipc_nl_node_dump_link+0x318/0xa50 [tipc] [ 59.640160][ T2788] ? mutex_lock_io_nested+0x1380/0x1380 [ 59.640746][ T2788] tipc_nl_node_dump_link+0x4fd/0xa50 [tipc] [ 59.641356][ T2788] ? tipc_nl_node_reset_link_stats+0x340/0x340 [tipc] [ 59.642088][ T2788] ? __skb_ext_del+0x270/0x270 [ 59.642594][ T2788] genl_lock_dumpit+0x85/0xb0 [ 59.643050][ T2788] netlink_dump+0x49c/0xed0 [ 59.643529][ T2788] ? __netlink_sendskb+0xc0/0xc0 [ 59.644044][ T2788] ? __netlink_dump_start+0x190/0x800 [ 59.644617][ T2788] ? __mutex_unlock_slowpath+0xd0/0x670 [ 59.645177][ T2788] __netlink_dump_start+0x5a0/0x800 [ 59.645692][ T2788] genl_rcv_msg+0xa75/0xe90 [ 59.646144][ T2788] ? __lock_acquire+0xdfe/0x3de0 [ 59.646692][ T2788] ? genl_family_rcv_msg_attrs_parse+0x320/0x320 [ 59.647340][ T2788] ? genl_lock_dumpit+0xb0/0xb0 [ 59.647821][ T2788] ? genl_unlock+0x20/0x20 [ 59.648290][ T2788] ? genl_parallel_done+0xe0/0xe0 [ 59.648787][ T2788] ? find_held_lock+0x39/0x1d0 [ 59.649276][ T2788] ? genl_rcv+0x15/0x40 [ 59.649722][ T2788] ? lock_contended+0xcd0/0xcd0 [ 59.650296][ T2788] netlink_rcv_skb+0x121/0x350 [ 59.650828][ T2788] ? genl_family_rcv_msg_attrs_parse+0x320/0x320 [ 59.651491][ T2788] ? netlink_ack+0x940/0x940 [ 59.651953][ T2788] ? lock_acquire+0x164/0x3b0 [ 59.652449][ T2788] genl_rcv+0x24/0x40 [ 59.652841][ T2788] netlink_unicast+0x421/0x600
[ ... ]
--- net/tipc/core.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
net/tipc/core.c +15 -14
@@ -116,14 +116,6 @@ static int __init tipc_init(void) sysctl_tipc_rmem[1 ] =RCVBUF_DEF ; sysctl_tipc_rmem[2 ] =RCVBUF_MAX ; - err =tipc_netlink_start (); -if (err) - goto out_netlink; - - err =tipc_netlink_compat_start (); -if (err) - goto out_netlink_compat; - err =tipc_register_sysctl ();if (err) goto out_sysctl;
@@ -144,8 +136,21 @@ static int __init tipc_init(void)if (err) goto out_bearer; + err =tipc_netlink_start (); +if (err) + goto out_netlink; + + err =tipc_netlink_compat_start (); +if (err) + goto out_netlink_compat; +pr_info ("Started in single node mode\n" );return 0 ; + +out_netlink_compat: +tipc_netlink_stop (); +out_netlink: +tipc_bearer_cleanup (); out_bearer:unregister_pernet_device (&tipc_topsrv_net_ops); out_pernet_topsrv:
@@ -155,22 +160,18 @@ out_socket: out_pernet:tipc_unregister_sysctl (); out_sysctl: -tipc_netlink_compat_stop (); -out_netlink_compat: -tipc_netlink_stop (); -out_netlink:pr_err ("Unable to start in single node mode\n" );return err; } static void __exit tipc_exit(void) { +tipc_netlink_compat_stop (); +tipc_netlink_stop ();tipc_bearer_cleanup ();unregister_pernet_device (&tipc_topsrv_net_ops);tipc_socket_stop ();unregister_pernet_device (&tipc_net_ops); -tipc_netlink_stop (); -tipc_netlink_compat_stop ();tipc_unregister_sysctl ();pr_info ("Deactivated\n" );
Greg Kroah-Hartman
maintainerPATCH 183/199 tcp: tighten acceptance of ACKs not matching a child socket
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit cb44a08f8647fd2e8db5cc9ac27cd8355fa392d8 ]
When no synflood occurs, the synflood timestamp isn't updated. Therefore it can be so old that time_after32() can consider it to be in the future.
That's a problem for tcp_synq_no_recent_overflow() as it may report that a recent overflow occurred while, in fact, it's just that jiffies has grown past 'last_overflow' + TCP_SYNCOOKIE_VALID + 2^31.
Spurious detection of recent overflows lead to extra syncookie verification in cookie_v[46]_check(). At that point, the verification should fail and the packet dropped. But we should have dropped the packet earlier as we didn't even send a syncookie.
Let's refine tcp_synq_no_recent_overflow() to report a recent overflow only if jiffies is within the
[last_overflow, last_overflow + TCP_SYNCOOKIE_VALID] interval. This way, no spurious recent overflow is reported when jiffies wraps and 'last_overflow' becomes in the future from the point of view of time_after32().
However, if jiffies wraps and enters the
[last_overflow, last_overflow + TCP_SYNCOOKIE_VALID] interval (with 'last_overflow' being a stale synflood timestamp), then tcp_synq_no_recent_overflow() still erroneously reports an overflow. In such cases, we have to rely on syncookie verification to drop the packet. We unfortunately have no way to differentiate between a fresh and a stale syncookie timestamp.
In practice, using last_overflow as lower bound is problematic. If the synflood timestamp is concurrently updated between the time we read jiffies and the moment we store the timestamp in 'last_overflow', then 'now' becomes smaller than 'last_overflow' and tcp_synq_no_recent_overflow() returns true, potentially dropping a valid syncookie.
Reading jiffies after loading the timestamp could fix the problem, but that'd require a memory barrier. Let's just accommodate for potential timestamp growth instead and extend the interval using 'last_overflow - HZ' as lower bound.
--- include/net/tcp.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
include/net/tcp.h +9 -1
@@ -506,7 +506,15 @@ static inline bool tcp_synq_no_recent_ov {unsigned long last_overflow =tcp_sk (sk)->rx_opt.ts_recent_stamp; -return time_after (jiffies, last_overflow +TCP_SYNCOOKIE_VALID ); +/* If last_overflow <= jiffies <= last_overflow + TCP_SYNCOOKIE_VALID, +* then we're under synflood. However, we have to use +* 'last_overflow - HZ' as lower bound. That's because a concurrent +* tcp_synq_overflow() could update .ts_recent_stamp after we read +* jiffies but before we store .ts_recent_stamp into last_overflow, +* which could lead to rejecting a valid syncookie. +*/ +return !time_between32 (jiffies, last_overflow -HZ , + last_overflow +TCP_SYNCOOKIE_VALID ); }static inline u32 tcp_cookie_time (void )
Greg Kroah-Hartman
maintainerPATCH 166/199 reiserfs: fix extended attributes on the root directory
In reply to Greg Kroah-HartmanFrom: Jeff Mahoney <[email protected]>
[ Upstream commit 60e4cf67a582d64f07713eda5fcc8ccdaf7833e6 ]
Since commit d0a5b995a308 (vfs: Add IOP_XATTR inode operations flag) extended attributes haven't worked on the root directory in reiserfs.
This is due to reiserfs conditionally setting the sb->s_xattrs handler array depending on whether it located or create the internal privroot directory. It necessarily does this after the root inode is already read in. The IOP_XATTR flag is set during inode initialization, so it never gets set on the root directory.
This commit unconditionally assigns sb->s_xattrs and clears IOP_XATTR on internal inodes. The old return values due to the conditional assignment are handled via open_xa_root, which now returns EOPNOTSUPP as the VFS would have done.
--- fs/reiserfs/inode.c | 12 ++++++++++-- fs/reiserfs/namei.c | 7 +++++-- fs/reiserfs/reiserfs.h | 2 ++ fs/reiserfs/super.c | 2 ++ fs/reiserfs/xattr.c | 19 ++++++++++++------- fs/reiserfs/xattr_acl.c | 4 +--- 6 files changed, 32 insertions(+), 14 deletions(-)
fs/reiserfs/inode.c +10 -2
@@ -2102,6 +2102,15 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, goto out_inserted_sd; } +/* +* Mark it private if we're creating the privroot +* or something under it. +*/ +if (IS_PRIVATE (dir) || dentry ==REISERFS_SB (sb)->priv_root) { + inode->i_flags |=S_PRIVATE ; + inode->i_opflags &= ~IOP_XATTR ; + } +if (reiserfs_posixacl (inode->i_sb)) {reiserfs_write_unlock (inode->i_sb); retval =reiserfs_inherit_default_acl (th, dir, dentry, inode);
@@ -2116,8 +2125,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,reiserfs_warning (inode->i_sb,"jdm-13090" ,"ACLs aren't enabled in the fs, " "but vfs thinks they are!" ); - }else if (IS_PRIVATE (dir)) - inode->i_flags |=S_PRIVATE ; + }if (security->name) {reiserfs_write_unlock (inode->i_sb);
fs/reiserfs/namei.c +5 -2
@@ -377,10 +377,13 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry,/* * Propagate the private flag so we know we're -* in the priv tree +* in the priv tree. Also clear IOP_XATTR +* since we don't have xattrs on xattr files. */ -if (IS_PRIVATE (dir)) +if (IS_PRIVATE (dir)) { inode->i_flags |=S_PRIVATE ; + inode->i_opflags &= ~IOP_XATTR ; + } }reiserfs_write_unlock (dir->i_sb);if (retval ==IO_ERROR ) {
fs/reiserfs/reiserfs.h +2 -0
@@ -1167,6 +1167,8 @@ static inline int bmap_would_wrap(unsigned bmap_nr)return bmap_nr > ((1LL <<16 ) -1 ); } +extern const struct xattr_handler *reiserfs_xattr_handlers[]; +/* * this says about version of key of all items (but stat data) the * object consists of
fs/reiserfs/super.c +2 -0
@@ -2026,6 +2026,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)if (replay_only (s)) goto error_unlocked; + s->s_xattr = reiserfs_xattr_handlers; +if (bdev_read_only (s->s_bdev) && !(s->s_flags &MS_RDONLY )) {SWARN (silent, s,"clm-7000" ,"Detected readonly device, marking FS readonly" );
fs/reiserfs/xattr.c +12 -7
@@ -121,13 +121,13 @@ static struct dentry *open_xa_root(struct super_block *sb, int flags)struct dentry *xaroot;if (d_really_is_negative (privroot)) -return ERR_PTR (-ENODATA ); +return ERR_PTR (-EOPNOTSUPP );inode_lock_nested (d_inode (privroot),I_MUTEX_XATTR ); xaroot =dget (REISERFS_SB (sb)->xattr_root);if (!xaroot) - xaroot =ERR_PTR (-ENODATA ); + xaroot =ERR_PTR (-EOPNOTSUPP );else if (d_really_is_negative (xaroot)) {int err = -ENODATA ;
@@ -609,6 +609,10 @@ int reiserfs_xattr_set(struct inode *inode, const char *name,int error, error2;size_t jbegin_count =reiserfs_xattr_nblocks (inode, buffer_size); +/* Check before we start a transaction and then do nothing. */ +if (!d_really_is_positive (REISERFS_SB (inode->i_sb)->priv_root)) +return -EOPNOTSUPP ; +if (!(flags &XATTR_REPLACE )) jbegin_count +=reiserfs_xattr_jcreate_nblocks (inode);
@@ -831,8 +835,7 @@ ssize_t reiserfs_listxattr(struct dentry * dentry, char *buffer, size_t size)if (d_really_is_negative (dentry))return -EINVAL ; -if (!dentry->d_sb->s_xattr || -get_inode_sd_version (d_inode (dentry)) ==STAT_DATA_V1 ) +if (get_inode_sd_version (d_inode (dentry)) ==STAT_DATA_V1 )return -EOPNOTSUPP ; dir =open_xa_dir (d_inode (dentry),XATTR_REPLACE );
@@ -872,6 +875,7 @@ static int create_privroot(struct dentry *dentry) }d_inode (dentry)->i_flags |=S_PRIVATE ; +d_inode (dentry)->i_opflags &= ~IOP_XATTR ;reiserfs_info (dentry->d_sb,"Created %s - reserved for xattr " "storage.\n" ,PRIVROOT_NAME );
@@ -885,7 +889,7 @@ static int create_privroot(struct dentry *dentry) { return 0; }#endif /* Actual operations that are exported to VFS-land */ -static const struct xattr_handler *reiserfs_xattr_handlers[] = { +const struct xattr_handler *reiserfs_xattr_handlers[] = { #ifdef CONFIG_REISERFS_FS_XATTR &reiserfs_xattr_user_handler, &reiserfs_xattr_trusted_handler,
@@ -956,8 +960,10 @@ int reiserfs_lookup_privroot(struct super_block *s)if (!IS_ERR (dentry)) {REISERFS_SB (s)->priv_root = dentry;d_set_d_op (dentry, &xattr_lookup_poison_ops); -if (d_really_is_positive (dentry)) +if (d_really_is_positive (dentry)) {d_inode (dentry)->i_flags |=S_PRIVATE ; +d_inode (dentry)->i_opflags &= ~IOP_XATTR ; + } }else err =PTR_ERR (dentry);inode_unlock (d_inode (s->s_root));
@@ -986,7 +992,6 @@ int reiserfs_xattr_init(struct super_block *s, int mount_flags) }if (d_really_is_positive (privroot)) { - s->s_xattr = reiserfs_xattr_handlers;inode_lock (d_inode (privroot));if (!REISERFS_SB (s)->xattr_root) {struct dentry *dentry;
fs/reiserfs/xattr_acl.c +1 -3
@@ -316,10 +316,8 @@ reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,* would be useless since permissions are ignored, and a pain because * it introduces locking cycles */ -if (IS_PRIVATE (dir)) { - inode->i_flags |=S_PRIVATE ; +if (IS_PRIVATE (inode)) goto apply_umask; - } err =posix_acl_create (dir, &inode->i_mode, &default_acl, &acl);if (err)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 184/199 tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE()
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit 721c8dafad26ccfa90ff659ee19755e3377b829d ]
Syncookies borrow the ->rx_opt.ts_recent_stamp field to store the timestamp of the last synflood. Protect them with READ_ONCE() and WRITE_ONCE() since reads and writes aren't serialised.
Use of .rx_opt.ts_recent_stamp for storing the synflood timestamp was introduced by a0f82f64e269 ("syncookies: remove last_synq_overflow from struct tcp_sock"). But unprotected accesses were already there when timestamp was stored in .last_synq_overflow.
--- include/net/tcp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/net/tcp.h +3 -3
@@ -494,17 +494,17 @@ struct sock *cookie_v4_check(struct sock*/ static inline void tcp_synq_overflow (const struct sock *sk) { -unsigned long last_overflow =tcp_sk (sk)->rx_opt.ts_recent_stamp; +unsigned long last_overflow =READ_ONCE (tcp_sk (sk)->rx_opt.ts_recent_stamp);unsigned long now = jiffies;if (!time_between32 (now, last_overflow, last_overflow +HZ )) -tcp_sk (sk)->rx_opt.ts_recent_stamp = now; +WRITE_ONCE (tcp_sk (sk)->rx_opt.ts_recent_stamp, now); }/* syncookies: no recent synqueue overflow on this listening socket? */ static inline bool tcp_synq_no_recent_overflow (const struct sock *sk) { -unsigned long last_overflow =tcp_sk (sk)->rx_opt.ts_recent_stamp; +unsigned long last_overflow =READ_ONCE (tcp_sk (sk)->rx_opt.ts_recent_stamp);/* If last_overflow <= jiffies <= last_overflow + TCP_SYNCOOKIE_VALID, * then we're under synflood. However, we have to use
Greg Kroah-Hartman
maintainerPATCH 186/199 PCI: Fix Intel ACS quirk UPDCR register address
In reply to Greg Kroah-HartmanFrom: Steffen Liebergeld <[email protected]>
commit d8558ac8c93d429d65d7490b512a3a67e559d0d4 upstream.
According to documentation [0] the correct offset for the Upstream Peer Decode Configuration Register (UPDCR) is 0x1014. It was previously defined as 0x1114.
d99321b63b1f ("PCI: Enable quirks for PCIe ACS on Intel PCH root ports") intended to enforce isolation between PCI devices allowing them to be put into separate IOMMU groups. Due to the wrong register offset the intended isolation was not fully enforced. This is fixed with this patch.
Please note that I did not test this patch because I have no hardware that implements this register.
[0] https://www.intel.com/content/dam/www/public/us/en/documents/datasheets/4th-gen-core-family-mobile-i-o-datasheet.pdf (page 325)
--- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/quirks.c +1 -1
@@ -4446,7 +4446,7 @@ int pci_dev_specific_acs_enabled(struct#define INTEL_BSPR_REG_BPPD (1 << 9)/* Upstream Peer Decode Configuration Register */ -#define INTEL_UPDCR_REG 0x1114 +#define INTEL_UPDCR_REG 0x1014/* 5:0 Peer Decode Enable bits */ #define INTEL_UPDCR_REG_MASK 0x3f
Greg Kroah-Hartman
maintainerPATCH 187/199 PCI/MSI: Fix incorrect MSI-X masking on resume
In reply to Greg Kroah-HartmanFrom: Jian-Hong Pan <[email protected]>
commit e045fa29e89383c717e308609edd19d2fd29e1be upstream.
When a driver enables MSI-X, msix_program_entries() reads the MSI-X Vector Control register for each vector and saves it in desc->masked. Each register is 32 bits and bit 0 is the actual Mask bit.
When we restored these registers during resume, we previously set the Mask bit if *any* bit in desc->masked was set instead of when the Mask bit itself was set:
pci_restore_state
pci_restore_msi_state
__pci_restore_msix_state
for_each_pci_msi_entry
msix_mask_irq(entry, entry->masked) <-- entire u32 word
__pci_msix_desc_mask_irq(desc, flag)
mask_bits = desc->masked & ~PCI_MSIX_ENTRY_CTRL_MASKBIT
if (flag) <-- testing entire u32, not just bit 0
mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT
writel(mask_bits, desc_addr + PCI_MSIX_ENTRY_VECTOR_CTRL)This means that after resume, MSI-X vectors were masked when they shouldn't be, which leads to timeouts like this:
nvme nvme0: I/O 978 QID 3 timeout, completion polled
On resume, set the Mask bit only when the saved Mask bit from suspend was set.
This should remove the need for 19ea025e1d28 ("nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T").
--- drivers/pci/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/msi.c +1 -1
@@ -230,7 +230,7 @@ u32 __pci_msix_desc_mask_irq(struct msi_return 0 ; mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT ; -if (flag) +if (flag &PCI_MSIX_ENTRY_CTRL_MASKBIT ) mask_bits |=PCI_MSIX_ENTRY_CTRL_MASKBIT ;writel (mask_bits,pci_msix_desc_addr (desc) +PCI_MSIX_ENTRY_VECTOR_CTRL );
Greg Kroah-Hartman
maintainerPATCH 188/199 xtensa: fix TLB sanity checker
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
commit 36de10c4788efc6efe6ff9aa10d38cb7eea4c818 upstream.
Virtual and translated addresses retrieved by the xtensa TLB sanity checker must be consistent, i.e. correspond to the same state of the checked TLB entry. KASAN shadow memory is mapped dynamically using auto-refill TLB entries and thus may change TLB state between the virtual and translated address retrieval, resulting in false TLB insanity report.
Move read_xtlb_translation close to read_xtlb_virtual to make sure that read values are consistent.
--- arch/xtensa/mm/tlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/xtensa/mm/tlb.c +2 -2
@@ -218,6 +218,8 @@ static int check_tlb_entry(unsigned w, uunsigned tlbidx = w | (e <<PAGE_SHIFT );unsigned r0 = dtlb ?read_dtlb_virtual (tlbidx) :read_itlb_virtual (tlbidx); +unsigned r1 = dtlb ? +read_dtlb_translation (tlbidx) :read_itlb_translation (tlbidx);unsigned vpn = (r0 &PAGE_MASK ) | (e <<PAGE_SHIFT );unsigned pte =get_pte_for_vaddr (vpn);unsigned mm_asid = (get_rasid_register () >>8 ) &ASID_MASK ;
@@ -233,8 +235,6 @@ static int check_tlb_entry(unsigned w, u }if (tlb_asid == mm_asid) { -unsigned r1 = dtlb ?read_dtlb_translation (tlbidx) : -read_itlb_translation (tlbidx);if ((pte ^ r1) &PAGE_MASK ) {pr_err ("%cTLB: way: %u, entry: %u, mapping: %08x->%08x, PTE: %08x\n" , dtlb ?'D' :'I' , w, e, r0, r1, pte);
Greg Kroah-Hartman
maintainerPATCH 190/199 ARM: dts: s3c64xx: Fix init order of clock providers
In reply to Greg Kroah-HartmanFrom: Lihua Yao <[email protected]>
commit d60d0cff4ab01255b25375425745c3cff69558ad upstream.
fin_pll is the parent of clock-controller@7e00f000, specify the dependency to ensure proper initialization order of clock providers.
without this patch:
[ 0.000000] S3C6410 clocks: apll = 0, mpll = 0 [ 0.000000] epll = 0, arm_clk = 0
with this patch:
[ 0.000000] S3C6410 clocks: apll = 532000000, mpll = 532000000 [ 0.000000] epll = 24000000, arm_clk = 532000000
--- arch/arm/boot/dts/s3c6410-mini6410.dts | 4 ++++ arch/arm/boot/dts/s3c6410-smdk6410.dts | 4 ++++ 2 files changed, 8 insertions(+)
arch/arm/boot/dts/s3c6410-mini6410.dts +4 -0
@@ -167,6 +167,10 @@ }; }; +&clocks { + clocks = <&fin_pll>; +}; + &sdhci0 { pinctrl-names = "default"; pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
arch/arm/boot/dts/s3c6410-smdk6410.dts +4 -0
@@ -71,6 +71,10 @@ }; }; +&clocks { + clocks = <&fin_pll>; +}; + &sdhci0 { pinctrl-names = "default"; pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
Greg Kroah-Hartman
maintainerPATCH 191/199 ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit d70f7d31a9e2088e8a507194354d41ea10062994 upstream.
There is an unfortunate typo in the code that results in writing to FLOW_CTLR_HALT instead of FLOW_CTLR_CSR.
--- arch/arm/mach-tegra/reset-handler.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-tegra/reset-handler.S +3 -3
@@ -56,16 +56,16 @@ ENTRY(tegra_resume) cmp r6, #TEGRA20 beq 1f @ Yes /* Clear the flow controller flags for this CPU. */ - cpu_to_csr_reg r1, r0 + cpu_to_csr_reg r3, r0 mov32 r2, TEGRA_FLOW_CTRL_BASE - ldr r1, [r2, r1] + ldr r1, [r2, r3] /* Clear event & intr flag */ orr r1, r1, \ #FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG movw r0, #0x3FFD @ enable, cluster_switch, immed, bitmaps @ & ext flags for CPU power mgnt bic r1, r1, r0 - str r1, [r2] + str r1, [r2, r3] 1: mov32 r9, 0xc09
Greg Kroah-Hartman
maintainerPATCH 192/199 vfio/pci: call irq_bypass_unregister_producer() before freeing irq
In reply to Greg Kroah-HartmanFrom: Jiang Yi <[email protected]>
commit d567fb8819162099035e546b11a736e29c2af0ea upstream.
Since irq_bypass_register_producer() is called after request_irq(), we should do tear-down in reverse order: irq_bypass_unregister_producer() then free_irq().
Specifically free_irq() may release resources required by the irqbypass del_producer() callback. Notably an example provided by Marc Zyngier on arm64 with GICv4 that he indicates has the potential to wedge the hardware:
free_irq(irq)
__free_irq(irq)
irq_domain_deactivate_irq(irq)
its_irq_domain_deactivate()
[unmap the VLPI from the ITS]
kvm_arch_irq_bypass_del_producer(cons, prod)
kvm_vgic_v4_unset_forwarding(kvm, irq, ...)
its_unmap_vlpi(irq)
[Unmap the VLPI from the ITS (again), remap the original LPI]
--- drivers/vfio/pci/vfio_pci_intrs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/pci/vfio_pci_intrs.c +1 -1
@@ -297,8 +297,8 @@ static int vfio_msi_set_vector_signal(st irq =pci_irq_vector (pdev, vector);if (vdev->ctx[vector].trigger) { -free_irq (irq, vdev->ctx[vector].trigger);irq_bypass_unregister_producer (&vdev->ctx[vector].producer); +free_irq (irq, vdev->ctx[vector].trigger);kfree (vdev->ctx[vector].name);eventfd_ctx_put (vdev->ctx[vector].trigger); vdev->ctx[vector].trigger =NULL ;
Greg Kroah-Hartman
maintainerPATCH 193/199 dma-buf: Fix memory leak in sync_file_merge()
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
commit 6645d42d79d33e8a9fe262660a75d5f4556bbea9 upstream.
In the implementation of sync_file_merge() the allocated sync_file is leaked if number of fences overflows. Release sync_file by goto err.
--- drivers/dma-buf/sync_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma-buf/sync_file.c +1 -1
@@ -204,7 +204,7 @@ static struct sync_file *sync_file_merge a_fences =get_fences (a, &a_num_fences); b_fences =get_fences (b, &b_num_fences);if (a_num_fences >INT_MAX - b_num_fences) -return NULL ; + goto err; num_fences = a_num_fences + b_num_fences;
Greg Kroah-Hartman
maintainerPATCH 167/199 firmware: qcom: scm: Ensure a0 status code is treated as signed
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit ff34f3cce278a0982a7b66b1afaed6295141b1fc upstream.
The 'a0' member of 'struct arm_smccc_res' is declared as 'unsigned long', however the Qualcomm SCM firmware interface driver expects to receive negative error codes via this field, so ensure that it's cast to 'long' before comparing to see if it is less than 0.
--- drivers/firmware/qcom_scm-64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/qcom_scm-64.c +1 -1
@@ -158,7 +158,7 @@ static int qcom_scm_call(struct device *kfree (args_virt); } -if (res->a0 <0 ) +if ((long )res->a0 <0 )return qcom_scm_remap_error (res->a0);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 194/199 dm btree: increase rebalance threshold in __rebalance2()
In reply to Greg Kroah-HartmanFrom: Hou Tao <[email protected]>
commit 474e559567fa631dea8fb8407ab1b6090c903755 upstream.
We got the following warnings from thin_check during thin-pool setup:
$ thin_check /dev/vdb
examining superblock
examining devices tree
missing devices: [1, 84]
too few entries in btree_node: 41, expected at least 42 (block 138, max_entries = 126)
examining mapping treeThe phenomenon is the number of entries in one node of details_info tree is less than (max_entries / 3). And it can be easily reproduced by the following procedures:
$ new a thin pool
$ presume the max entries of details_info tree is 126
$ new 127 thin devices (e.g. 1~127) to make the root node being full
and then split
$ remove the first 43 (e.g. 1~43) thin devices to make the children
reblance repeatedly
$ stop the thin pool
$ thin_checkThe root cause is that the B-tree removal procedure in __rebalance2() doesn't guarantee the invariance: the minimal number of entries in non-root node should be >= (max_entries / 3).
Simply fix the problem by increasing the rebalance threshold to make sure the number of entries in each child will be greater than or equal to (max_entries / 3 + 1), so no matter which child is used for removal, the number will still be valid.
--- drivers/md/persistent-data/dm-btree-remove.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/md/persistent-data/dm-btree-remove.c +7 -1
@@ -203,7 +203,13 @@ static void __rebalance2(struct dm_btreestruct btree_node *right = r->n;uint32_t nr_left =le32_to_cpu (left->header.nr_entries);uint32_t nr_right =le32_to_cpu (right->header.nr_entries); -unsigned threshold =2 *merge_threshold (left) +1 ; +/* +* Ensure the number of entries in each child will be greater +* than or equal to (max_entries / 3 + 1), so no matter which +* child is used for removal, the number will still be not +* less than (max_entries / 3). +*/ +unsigned int threshold =2 * (merge_threshold (left) +1 );if (nr_left + nr_right < threshold) {/*
Greg Kroah-Hartman
maintainerPATCH 195/199 scsi: iscsi: Fix a potential deadlock in the timeout handler
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
commit 5480e299b5ae57956af01d4839c9fc88a465eeab upstream.
Some time ago the block layer was modified such that timeout handlers are called from thread context instead of interrupt context. Make it safe to run the iSCSI timeout handler in thread context. This patch fixes the following lockdep complaint:
================================
WARNING: inconsistent lock state
5.5.1-dbg+ #11 Not tainted
--------------------------------
inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage.
kworker/7:1H/206 [HC0[0]:SC0[0]:HE1:SE1] takes:ffff88802d9827e8 (&(&session->frwd_lock)->rlock){+.?.}, at: iscsi_eh_cmd_timed_out+0xa6/0x6d0 [libiscsi] {IN-SOFTIRQ-W} state was registered at:
lock_acquire+0x106/0x240 _raw_spin_lock+0x38/0x50 iscsi_check_transport_timeouts+0x3e/0x210 [libiscsi] call_timer_fn+0x132/0x470 __run_timers.part.0+0x39f/0x5b0 run_timer_softirq+0x63/0xc0 __do_softirq+0x12d/0x5fd irq_exit+0xb3/0x110 smp_apic_timer_interrupt+0x131/0x3d0 apic_timer_interrupt+0xf/0x20 default_idle+0x31/0x230 arch_cpu_idle+0x13/0x20 default_idle_call+0x53/0x60 do_idle+0x38a/0x3f0 cpu_startup_entry+0x24/0x30 start_secondary+0x222/0x290 secondary_startup_64+0xa4/0xb0 irq event stamp: 1383705 hardirqs last enabled at (1383705): [<ffffffff81aace5c>] _raw_spin_unlock_irq+0x2c/0x50 hardirqs last disabled at (1383704): [<ffffffff81aacb98>] _raw_spin_lock_irq+0x18/0x50 softirqs last enabled at (1383690): [<ffffffffa0e2efea>] iscsi_queuecommand+0x76a/0xa20 [libiscsi] softirqs last disabled at (1383682): [<ffffffffa0e2e998>] iscsi_queuecommand+0x118/0xa20 [libiscsi]
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(&(&session->frwd_lock)->rlock);
<Interrupt>
lock(&(&session->frwd_lock)->rlock);*** DEADLOCK ***
2 locks held by kworker/7:1H/206:
#0: ffff8880d57bf928 ((wq_completion)kblockd){+.+.}, at: process_one_work+0x472/0xab0 #1: ffff88802b9c7de8 ((work_completion)(&q->timeout_work)){+.+.}, at: process_one_work+0x476/0xab0
stack backtrace: CPU: 7 PID: 206 Comm: kworker/7:1H Not tainted 5.5.1-dbg+ #11 Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 Workqueue: kblockd blk_mq_timeout_work Call Trace: dump_stack+0xa5/0xe6 print_usage_bug.cold+0x232/0x23b mark_lock+0x8dc/0xa70 __lock_acquire+0xcea/0x2af0 lock_acquire+0x106/0x240 _raw_spin_lock+0x38/0x50 iscsi_eh_cmd_timed_out+0xa6/0x6d0 [libiscsi] scsi_times_out+0xf4/0x440 [scsi_mod] scsi_timeout+0x1d/0x20 [scsi_mod] blk_mq_check_expired+0x365/0x3a0 bt_iter+0xd6/0xf0 blk_mq_queue_tag_busy_iter+0x3de/0x650 blk_mq_timeout_work+0x1af/0x380 process_one_work+0x56d/0xab0 worker_thread+0x7a/0x5d0 kthread+0x1bc/0x210 ret_from_fork+0x24/0x30
--- drivers/scsi/libiscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/libiscsi.c +2 -2
@@ -1982,7 +1982,7 @@ static enum blk_eh_timer_return iscsi_ehISCSI_DBG_EH (session,"scsi cmd %p timedout\n" , sc); -spin_lock (&session->frwd_lock); +spin_lock_bh (&session->frwd_lock); task = (struct iscsi_task *)sc->SCp.ptr;if (!task) {/*
@@ -2109,7 +2109,7 @@ static enum blk_eh_timer_return iscsi_eh done:if (task) task->last_timeout = jiffies; -spin_unlock (&session->frwd_lock); +spin_unlock_bh (&session->frwd_lock);ISCSI_DBG_EH (session,"return %s\n" , rc ==BLK_EH_RESET_TIMER ?"timer reset" :"shutdown or nh" );return rc;
Greg Kroah-Hartman
maintainerPATCH 197/199 xhci: fix USB3 device initiated resume race with roothub autosuspend
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 057d476fff778f1d3b9f861fdb5437ea1a3cfc99 upstream.
A race in xhci USB3 remote wake handling may force device back to suspend after it initiated resume siganaling, causing a missed resume event or warm reset of device.
When a USB3 link completes resume signaling and goes to enabled (UO) state a interrupt is issued and the interrupt handler will clear the bus_state->port_remote_wakeup resume flag, allowing bus suspend.
If the USB3 roothub thread just finished reading port status before the interrupt, finding ports still in suspended (U3) state, but hasn't yet started suspending the hub, then the xhci interrupt handler will clear the flag that prevented roothub suspend and allow bus to suspend, forcing all port links back to suspended (U3) state.
Example case:usb_runtime_suspend() # because all ports still show suspended U3
usb_suspend_both()
hub_suspend(); # successful as hub->wakeup_bits not set yet
==> INTERRUPT
xhci_irq()
handle_port_status()
clear bus_state->port_remote_wakeup
usb_wakeup_notification()
sets hub->wakeup_bits;
kick_hub_wq()<== END INTERRUPT
hcd_bus_suspend()
xhci_bus_suspend() # success as port_remote_wakeup bits cleared
Fix this by increasing roothub usage count during port resume to prevent roothub autosuspend, and by making sure bus_state->port_remote_wakeup flag is only cleared after resume completion is visible, i.e. after xhci roothub returned U0 or other non-U3 link state link on a get port status request.
Issue rootcaused by Chiasheng Lee
--- drivers/usb/host/xhci-hub.c | 8 ++++++++ drivers/usb/host/xhci-ring.c | 6 +----- drivers/usb/host/xhci.h | 1 + 3 files changed, 10 insertions(+), 5 deletions(-)
drivers/usb/host/xhci-hub.c +8 -0
@@ -760,6 +760,14 @@ static u32 xhci_get_port_status(struct u status |=USB_PORT_STAT_C_BH_RESET <<16 ;if ((raw_port_status &PORT_CEC )) status |=USB_PORT_STAT_C_CONFIG_ERROR <<16 ; + +/* USB3 remote wake resume signaling completed */ +if (bus_state->port_remote_wakeup & (1 << wIndex) && + (raw_port_status &PORT_PLS_MASK ) !=XDEV_RESUME && + (raw_port_status &PORT_PLS_MASK ) !=XDEV_RECOVERY ) { + bus_state->port_remote_wakeup &= ~(1 << wIndex); +usb_hcd_end_port_resume (&hcd->self, wIndex); + } }if (hcd->speed <HCD_USB3 ) {
drivers/usb/host/xhci-ring.c +1 -5
@@ -1609,9 +1609,6 @@ static void handle_port_status(struct xhusb_hcd_resume_root_hub (hcd); } -if (hcd->speed >=HCD_USB3 && (temp &PORT_PLS_MASK ) ==XDEV_INACTIVE ) - bus_state->port_remote_wakeup &= ~(1 << faked_port_index); -if ((temp &PORT_PLC ) && (temp &PORT_PLS_MASK ) ==XDEV_RESUME ) {xhci_dbg (xhci,"port resume event for port %d\n" , port_id);
@@ -1630,6 +1627,7 @@ static void handle_port_status(struct xh bus_state->port_remote_wakeup |=1 << faked_port_index;xhci_test_and_clear_bit (xhci, port_array, faked_port_index,PORT_PLC ); +usb_hcd_start_port_resume (&hcd->self, faked_port_index);xhci_set_link_state (xhci, port_array, faked_port_index,XDEV_U0 );/* Need to wait until the next link state change
@@ -1667,8 +1665,6 @@ static void handle_port_status(struct xhif (slot_id && xhci->devs[slot_id])xhci_ring_device (xhci, slot_id);if (bus_state->port_remote_wakeup & (1 << faked_port_index)) { - bus_state->port_remote_wakeup &= - ~(1 << faked_port_index);xhci_test_and_clear_bit (xhci, port_array, faked_port_index,PORT_PLC ); usb_wakeup_notification(hcd->self.root_hub,
drivers/usb/host/xhci.h +1 -0
@@ -316,6 +316,7 @@ struct xhci_op_regs {#define XDEV_U3 (0x3 << 5)#define XDEV_INACTIVE (0x6 << 5)#define XDEV_POLLING (0x7 << 5) +#define XDEV_RECOVERY (0x8 << 5)#define XDEV_COMP_MODE (0xa << 5)#define XDEV_RESUME (0xf << 5)/* true: port has power (see HCC_PPC) */
Greg Kroah-Hartman
maintainerPATCH 196/199 drm/radeon: fix r1xx/r2xx register checker for POT textures
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit 008037d4d972c9c47b273e40e52ae34f9d9e33e7 upstream.
Shift and mask were reversed. Noticed by chance.
--- drivers/gpu/drm/radeon/r100.c | 4 ++-- drivers/gpu/drm/radeon/r200.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/r100.c +2 -2
@@ -1824,8 +1824,8 @@ static int r100_packet0_check(struct rad track->textures[i].use_pitch =1 ; }else { track->textures[i].use_pitch =0 ; - track->textures[i].width =1 << ((idx_value >>RADEON_TXFORMAT_WIDTH_SHIFT ) &RADEON_TXFORMAT_WIDTH_MASK ); - track->textures[i].height =1 << ((idx_value >>RADEON_TXFORMAT_HEIGHT_SHIFT ) &RADEON_TXFORMAT_HEIGHT_MASK ); + track->textures[i].width =1 << ((idx_value &RADEON_TXFORMAT_WIDTH_MASK ) >>RADEON_TXFORMAT_WIDTH_SHIFT ); + track->textures[i].height =1 << ((idx_value &RADEON_TXFORMAT_HEIGHT_MASK ) >>RADEON_TXFORMAT_HEIGHT_SHIFT ); }if (idx_value &RADEON_TXFORMAT_CUBIC_MAP_ENABLE ) track->textures[i].tex_coord_type =2 ;
drivers/gpu/drm/radeon/r200.c +2 -2
@@ -476,8 +476,8 @@ int r200_packet0_check(struct radeon_cs_ track->textures[i].use_pitch =1 ; }else { track->textures[i].use_pitch =0 ; - track->textures[i].width =1 << ((idx_value >>RADEON_TXFORMAT_WIDTH_SHIFT ) &RADEON_TXFORMAT_WIDTH_MASK ); - track->textures[i].height =1 << ((idx_value >>RADEON_TXFORMAT_HEIGHT_SHIFT ) &RADEON_TXFORMAT_HEIGHT_MASK ); + track->textures[i].width =1 << ((idx_value &RADEON_TXFORMAT_WIDTH_MASK ) >>RADEON_TXFORMAT_WIDTH_SHIFT ); + track->textures[i].height =1 << ((idx_value &RADEON_TXFORMAT_HEIGHT_MASK ) >>RADEON_TXFORMAT_HEIGHT_SHIFT ); }if (idx_value &R200_TXFORMAT_LOOKUP_DISABLE ) track->textures[i].lookup_disable = true;
Greg Kroah-Hartman
maintainerPATCH 198/199 net: stmmac: use correct DMA buffer size in the RX descriptor
In reply to Greg Kroah-HartmanFrom: Aaro Koskinen <[email protected]>
commit 583e6361414903c5206258a30e5bd88cb03c0254 upstream.
We always program the maximum DMA buffer size into the receive descriptor, although the allocated size may be less. E.g. with the default MTU size we allocate only 1536 bytes. If somebody sends us a bigger frame, then memory may get corrupted.
Fix by using exact buffer sizes.
[acj: backport to v4.9 -stable :
- adjust context
- skipped the section modifying non-existent functions in dwxgmac2_descs.c and hwif.h ]
--- drivers/net/ethernet/stmicro/stmmac/common.h | 2 - drivers/net/ethernet/stmicro/stmmac/descs_com.h | 23 +++++++++++++-------- drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 - drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 10 ++++++--- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 10 ++++++--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 ++--- 6 files changed, 34 insertions(+), 19 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +1 -1
@@ -354,7 +354,7 @@ struct dma_features {struct stmmac_desc_ops {/* DMA RX descriptor ring initialization */ void (*init_rx_desc) (struct dma_desc *p,int disable_rx_ic,int mode, -int end); +int end,int bfsize);/* DMA TX descriptor ring initialization */ void (*init_tx_desc) (struct dma_desc *p,int mode,int end);
drivers/net/ethernet/stmicro/stmmac/descs_com.h +15 -8
@@ -33,11 +33,14 @@/* Specific functions used for Ring mode */ /* Enhanced descriptors */ -static inline void ehn_desc_rx_set_on_ring (struct dma_desc *p,int end) +static inline void ehn_desc_rx_set_on_ring (struct dma_desc *p,int end, +int bfsize) { - p->des1 |=cpu_to_le32 (((BUF_SIZE_8KiB -1 ) - <<ERDES1_BUFFER2_SIZE_SHIFT ) - &ERDES1_BUFFER2_SIZE_MASK ); +if (bfsize == BUF_SIZE_16KiB) + p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB + <<ERDES1_BUFFER2_SIZE_SHIFT ) + &ERDES1_BUFFER2_SIZE_MASK ); +if (end) p->des1 |=cpu_to_le32 (ERDES1_END_RING );
@@ -63,11 +66,15 @@ static inline void enh_set_tx_desc_len_o }/* Normal descriptors */ -static inline void ndesc_rx_set_on_ring (struct dma_desc *p,int end) +static inline void ndesc_rx_set_on_ring (struct dma_desc *p,int end,int bfsize) { - p->des1 |=cpu_to_le32 (((BUF_SIZE_2KiB -1 ) - <<RDES1_BUFFER2_SIZE_SHIFT ) - &RDES1_BUFFER2_SIZE_MASK ); +if (bfsize >= BUF_SIZE_2KiB) { +int bfsize2; + + bfsize2 =min (bfsize - BUF_SIZE_2KiB +1 , BUF_SIZE_2KiB -1 ); + p->des1 |=cpu_to_le32 ((bfsize2 <<RDES1_BUFFER2_SIZE_SHIFT ) + &RDES1_BUFFER2_SIZE_MASK ); + }if (end) p->des1 |=cpu_to_le32 (RDES1_END_RING );
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +1 -1
@@ -289,7 +289,7 @@ exit: }static void dwmac4_rd_init_rx_desc (struct dma_desc *p,int disable_rx_ic, -int mode,int end) +int mode,int end,int bfsize) { p->des3 =cpu_to_le32 (RDES3_OWN |RDES3_BUFFER1_VALID_ADDR );
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +7 -3
@@ -269,15 +269,19 @@ static int enh_desc_get_rx_status(void * }static void enh_desc_init_rx_desc (struct dma_desc *p,int disable_rx_ic, -int mode,int end) +int mode,int end,int bfsize) { +int bfsize1; + p->des0 |=cpu_to_le32 (RDES0_OWN ); - p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB -1 ) &ERDES1_BUFFER1_SIZE_MASK ); + + bfsize1 =min (bfsize, BUF_SIZE_8KiB); + p->des1 |=cpu_to_le32 (bfsize1 &ERDES1_BUFFER1_SIZE_MASK );if (mode ==STMMAC_CHAIN_MODE )ehn_desc_rx_set_on_chain (p);else -ehn_desc_rx_set_on_ring (p, end); +ehn_desc_rx_set_on_ring (p, end, bfsize);if (disable_rx_ic) p->des1 |=cpu_to_le32 (ERDES1_DISABLE_IC );
drivers/net/ethernet/stmicro/stmmac/norm_desc.c +7 -3
@@ -137,15 +137,19 @@ static int ndesc_get_rx_status(void *dat }static void ndesc_init_rx_desc (struct dma_desc *p,int disable_rx_ic,int mode, -int end) +int end,int bfsize) { +int bfsize1; + p->des0 |=cpu_to_le32 (RDES0_OWN ); - p->des1 |=cpu_to_le32 ((BUF_SIZE_2KiB -1 ) &RDES1_BUFFER1_SIZE_MASK ); + + bfsize1 =min (bfsize, BUF_SIZE_2KiB -1 ); + p->des1 |=cpu_to_le32 (bfsize1 &RDES1_BUFFER1_SIZE_MASK );if (mode ==STMMAC_CHAIN_MODE )ndesc_rx_set_on_chain (p, end);else -ndesc_rx_set_on_ring (p, end); +ndesc_rx_set_on_ring (p, end, bfsize);if (disable_rx_ic) p->des1 |=cpu_to_le32 (RDES1_DISABLE_IC );
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -3
@@ -956,11 +956,11 @@ static void stmmac_clear_descriptors(strif (priv->extend_desc) priv->hw->desc->init_rx_desc (&priv->dma_erx[i].basic, priv->use_riwt, priv->mode, - (i ==DMA_RX_SIZE -1 )); + (i ==DMA_RX_SIZE -1 ), priv->dma_buf_sz);else priv->hw->desc->init_rx_desc (&priv->dma_rx[i], priv->use_riwt, priv->mode, - (i ==DMA_RX_SIZE -1 )); + (i ==DMA_RX_SIZE -1 ), priv->dma_buf_sz);for (i =0 ; i <DMA_TX_SIZE ; i++)if (priv->extend_desc) priv->hw->desc->init_tx_desc(&priv->dma_etx[i].basic,
@@ -2479,7 +2479,7 @@ static inline void stmmac_rx_refill(struwmb ();if (unlikely (priv->synopsys_id >=DWMAC_CORE_4_00 )) - priv->hw->desc->init_rx_desc (p, priv->use_riwt,0 ,0 ); + priv->hw->desc->init_rx_desc (p, priv->use_riwt,0 ,0 , priv->dma_buf_sz);else priv->hw->desc->set_rx_owner (p);
Greg Kroah-Hartman
maintainerPATCH 168/199 mm/shmem.c: cast the type of unmap_start to u64
In reply to Greg Kroah-HartmanFrom: Chen Jun <[email protected]>
commit aa71ecd8d86500da6081a72da6b0b524007e0627 upstream.
In 64bit system. sb->s_maxbytes of shmem filesystem is MAX_LFS_FILESIZE, which equal LLONG_MAX.
If offset > LLONG_MAX - PAGE_SIZE, offset + len < LLONG_MAX in shmem_fallocate, which will pass the checking in vfs_fallocate.
/* Check for wrap through zero too */ if (((offset + len) > inode->i_sb->s_maxbytes) || ((offset + len) < 0)) return -EFBIG;
loff_t unmap_start = round_up(offset, PAGE_SIZE) in shmem_fallocate causes a overflow.
Syzkaller reports a overflow problem in mm/shmem:
UBSAN: Undefined behaviour in mm/shmem.c:2014:10
signed integer overflow: '9223372036854775807 + 1' cannot be represented in type 'long long int'
CPU: 0 PID:17076 Comm: syz-executor0 Not tainted 4.1.46+ #1
Hardware name: linux, dummy-virt (DT)
Call trace:
dump_backtrace+0x0/0x2c8 arch/arm64/kernel/traps.c:100
show_stack+0x20/0x30 arch/arm64/kernel/traps.c:238
__dump_stack lib/dump_stack.c:15 [inline]
ubsan_epilogue+0x18/0x70 lib/ubsan.c:164
handle_overflow+0x158/0x1b0 lib/ubsan.c:195
shmem_fallocate+0x6d0/0x820 mm/shmem.c:2104
vfs_fallocate+0x238/0x428 fs/open.c:312
SYSC_fallocate fs/open.c:335 [inline]
SyS_fallocate+0x54/0xc8 fs/open.c:239The highest bit of unmap_start will be appended with sign bit 1 (overflow) when calculate shmem_falloc.start:
shmem_falloc.start = unmap_start >> PAGE_SHIFT.
Fix it by casting the type of unmap_start to u64, when right shifted.
This bug is found in LTS Linux 4.1. It also seems to exist in mainline.
--- mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/shmem.c +1 -1
@@ -2695,7 +2695,7 @@ static long shmem_fallocate(struct file } shmem_falloc.waitq = &shmem_falloc_waitq; - shmem_falloc.start = unmap_start >>PAGE_SHIFT ; + shmem_falloc.start = (u64 )unmap_start >>PAGE_SHIFT ; shmem_falloc.next = (unmap_end +1 ) >>PAGE_SHIFT ;spin_lock (&inode->i_lock); inode->i_private = &shmem_falloc;
Greg Kroah-Hartman
maintainerPATCH 169/199 ext4: fix a bug in ext4_wait_for_tail_page_commit
In reply to Greg Kroah-HartmanFrom: yangerkun <[email protected]>
commit 565333a1554d704789e74205989305c811fd9c7a upstream.
No need to wait for any commit once the page is fully truncated. Besides, it may confuse e.g. concurrent ext4_writepage() with the page still be dirty (will be cleared by truncate_pagecache() in ext4_setattr()) but buffers has been freed; and then trigger a bug show as below:
[ 26.057508] ------------[ cut here ]------------ [ 26.058531] kernel BUG at fs/ext4/inode.c:2134! ... [ 26.088130] Call trace: [ 26.088695] ext4_writepage+0x914/0xb28 [ 26.089541] writeout.isra.4+0x1b4/0x2b8 [ 26.090409] move_to_new_page+0x3b0/0x568 [ 26.091338] __unmap_and_move+0x648/0x988 [ 26.092241] unmap_and_move+0x48c/0xbb8 [ 26.093096] migrate_pages+0x220/0xb28 [ 26.093945] kernel_mbind+0x828/0xa18 [ 26.094791] __arm64_sys_mbind+0xc8/0x138 [ 26.095716] el0_svc_common+0x190/0x490 [ 26.096571] el0_svc_handler+0x60/0xd0 [ 26.097423] el0_svc+0x8/0xc
Run the procedure (generate by syzkaller) parallel with ext3.
void main()
{
int fd, fd1, ret;
void *addr;
size_t length = 4096;
int flags;
off_t offset = 0;
char *str = "12345";
fd = open("a", O_RDWR | O_CREAT);
assert(fd >= 0);
/* Truncate to 4k */
ret = ftruncate(fd, length);
assert(ret == 0);
/* Journal data mode */
flags = 0xc00f;
ret = ioctl(fd, _IOW('f', 2, long), &flags);
assert(ret == 0);
/* Truncate to 0 */
fd1 = open("a", O_TRUNC | O_NOATIME);
assert(fd1 >= 0);
addr = mmap(NULL, length, PROT_WRITE | PROT_READ,
MAP_SHARED, fd, offset);
assert(addr != (void *)-1);
memcpy(addr, str, 5);
mbind(addr, length, 0, 0, 0, MPOL_MF_MOVE);
}And the bug will be triggered once we seen the below order.
reproduce1 reproduce2
... | ...
truncate to 4k |
change to journal data mode |
| memcpy(set page dirty)
truncate to 0: |
ext4_setattr: |
... |
ext4_wait_for_tail_page_commit |
| mbind(trigger bug)
truncate_pagecache(clean dirty)| ...
... |mbind will call ext4_writepage() since the page still be dirty, and then report the bug since the buffers has been free. Fix it by return directly once offset equals to 0 which means the page has been fully truncated.
--- fs/ext4/inode.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/ext4/inode.c +8 -4
@@ -5080,11 +5080,15 @@ static void ext4_wait_for_tail_page_comm offset = inode->i_size & (PAGE_SIZE -1 );/* -* All buffers in the last page remain valid? Then there's nothing to -* do. We do the check mainly to optimize the common PAGE_SIZE == -* blocksize case +* If the page is fully truncated, we don't need to wait for any commit +* (and we even should not as __ext4_journalled_invalidatepage() may +* strip all buffers from the page but keep the page dirty which can then +* confuse e.g. concurrent ext4_writepage() seeing dirty page without +* buffers). Also we don't need to wait for any commit if all buffers in +* the page remain valid. This is most beneficial for the common case of +* blocksize == PAGESIZE. */ -if (offset >PAGE_SIZE -i_blocksize (inode)) +if (!offset || offset > (PAGE_SIZE -i_blocksize (inode)))return ;while (1 ) { page = find_lock_page(inode->i_mapping,
Greg Kroah-Hartman
maintainerPATCH 171/199 workqueue: Fix missing kfree(rescuer) in destroy_workqueue()
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit 8efe1223d73c218ce7e8b2e0e9aadb974b582d7f upstream.
--- kernel/workqueue.c | 1 + 1 file changed, 1 insertion(+)
kernel/workqueue.c +1 -0
@@ -4057,6 +4057,7 @@ void destroy_workqueue(struct workqueue_/* rescuer will empty maydays list before exiting */ kthread_stop (rescuer->task); +kfree (rescuer); }/* sanity checks */
Greg Kroah-Hartman
maintainerPATCH 172/199 sunrpc: fix crash when cache_head become valid before update
In reply to Greg Kroah-HartmanFrom: Pavel Tikhomirov <[email protected]>
[ Upstream commit 5fcaf6982d1167f1cd9b264704f6d1ef4c505d54 ]
I was investigating a crash in our Virtuozzo7 kernel which happened in in svcauth_unix_set_client. I found out that we access m_client field in ip_map structure, which was received from sunrpc_cache_lookup (we have a bit older kernel, now the code is in sunrpc_cache_add_entry), and these field looks uninitialized (m_client == 0x74 don't look like a pointer) but in the cache_head in flags we see 0x1 which is CACHE_VALID.
It looks like the problem appeared from our previous fix to sunrpc (1):
commit 4ecd55ea0742 ("sunrpc: fix cache_head leak due to queued request")
And we've also found a patch already fixing our patch (2):
commit d58431eacb22 ("sunrpc: don't mark uninitialised items as VALID.")
Though the crash is eliminated, I think the core of the problem is not completely fixed:
Neil in the patch (2) makes cache_head CACHE_NEGATIVE, before cache_fresh_locked which was added in (1) to fix crash. These way cache_is_valid won't say the cache is valid anymore and in svcauth_unix_set_client the function cache_check will return error instead of 0, and we don't count entry as initialized.
But it looks like we need to remove cache_fresh_locked completely in sunrpc_cache_lookup:
In (1) we've only wanted to make cache_fresh_unlocked->cache_dequeue so that cache_requests with no readers also release corresponding cache_head, to fix their leak. We with Vasily were not sure if cache_fresh_locked and cache_fresh_unlocked should be used in pair or not, so we've guessed to use them in pair.
Now we see that we don't want the CACHE_VALID bit set here by cache_fresh_locked, as "valid" means "initialized" and there is no initialization in sunrpc_cache_add_entry. Both expiry_time and last_refresh are not used in cache_fresh_unlocked code-path and also not required for the initial fix.
So to conclude cache_fresh_locked was called by mistake, and we can just safely remove it instead of crutching it with CACHE_NEGATIVE. It looks ideologically better for me. Hope I don't miss something here.
Here is our crash backtrace:
[13108726.326291] BUG: unable to handle kernel NULL pointer dereference at 0000000000000074 [13108726.326365] IP: [<ffffffffc01f79eb>] svcauth_unix_set_client+0x2ab/0x520 [sunrpc] [13108726.326448] PGD 0 [13108726.326468] Oops: 0002 [#1] SMP [13108726.326497] Modules linked in: nbd isofs xfs loop kpatch_cumulative_81_0_r1(O) xt_physdev nfnetlink_queue bluetooth rfkill ip6table_nat nf_nat_ipv6 ip_vs_wrr ip_vs_wlc ip_vs_sh nf_conntrack_netlink ip_vs_sed ip_vs_pe_sip nf_conntrack_sip ip_vs_nq ip_vs_lc ip_vs_lblcr ip_vs_lblc ip_vs_ftp ip_vs_dh nf_nat_ftp nf_conntrack_ftp iptable_raw xt_recent nf_log_ipv6 xt_hl ip6t_rt nf_log_ipv4 nf_log_common xt_LOG xt_limit xt_TCPMSS xt_tcpmss vxlan ip6_udp_tunnel udp_tunnel xt_statistic xt_NFLOG nfnetlink_log dummy xt_mark xt_REDIRECT nf_nat_redirect raw_diag udp_diag tcp_diag inet_diag netlink_diag af_packet_diag unix_diag rpcsec_gss_krb5 xt_addrtype ip6t_rpfilter ipt_REJECT nf_reject_ipv4 ip6t_REJECT nf_reject_ipv6 ebtable_nat ebtable_broute nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_mangle ip6table_raw nfsv4 [13108726.327173] dns_resolver cls_u32 binfmt_misc arptable_filter arp_tables ip6table_filter ip6_tables devlink fuse_kio_pcs ipt_MASQUERADE nf_nat_masquerade_ipv4 xt_nat iptable_nat nf_nat_ipv4 xt_comment nf_conntrack_ipv4 nf_defrag_ipv4 xt_wdog_tmo xt_multiport bonding xt_set xt_conntrack iptable_filter iptable_mangle kpatch(O) ebtable_filter ebt_among ebtables ip_set_hash_ip ip_set nfnetlink vfat fat skx_edac intel_powerclamp coretemp intel_rapl iosf_mbi kvm_intel kvm irqbypass fuse pcspkr ses enclosure joydev sg mei_me hpwdt hpilo lpc_ich mei ipmi_si shpchp ipmi_devintf ipmi_msghandler xt_ipvs acpi_power_meter ip_vs_rr nfsv3 nfsd auth_rpcgss nfs_acl nfs lockd grace fscache nf_nat cls_fw sch_htb sch_cbq sch_sfq ip_vs em_u32 nf_conntrack tun br_netfilter veth overlay ip6_vzprivnet ip6_vznetstat ip_vznetstat [13108726.327817] ip_vzprivnet vziolimit vzevent vzlist vzstat vznetstat vznetdev vzmon vzdev bridge pio_kaio pio_nfs pio_direct pfmt_raw pfmt_ploop1 ploop ip_tables ext4 mbcache jbd2 sd_mod crc_t10dif crct10dif_generic mgag200 i2c_algo_bit drm_kms_helper scsi_transport_iscsi 8021q syscopyarea sysfillrect garp sysimgblt fb_sys_fops mrp stp ttm llc bnx2x crct10dif_pclmul crct10dif_common crc32_pclmul crc32c_intel drm dm_multipath ghash_clmulni_intel uas aesni_intel lrw gf128mul glue_helper ablk_helper cryptd tg3 smartpqi scsi_transport_sas mdio libcrc32c i2c_core usb_storage ptp pps_core wmi sunrpc dm_mirror dm_region_hash dm_log dm_mod [last unloaded: kpatch_cumulative_82_0_r1] [13108726.328403] CPU: 35 PID: 63742 Comm: nfsd ve: 51332 Kdump: loaded Tainted: G W O ------------ 3.10.0-862.20.2.vz7.73.29 #1 73.29 [13108726.328491] Hardware name: HPE ProLiant DL360 Gen10/ProLiant DL360 Gen10, BIOS U32 10/02/2018 [13108726.328554] task: ffffa0a6a41b1160 ti: ffffa0c2a74bc000 task.ti: ffffa0c2a74bc000 [13108726.328610] RIP: 0010:[<ffffffffc01f79eb>] [<ffffffffc01f79eb>] svcauth_unix_set_client+0x2ab/0x520 [sunrpc] [13108726.328706] RSP: 0018:ffffa0c2a74bfd80 EFLAGS: 00010246 [13108726.328750] RAX: 0000000000000001 RBX: ffffa0a6183ae000 RCX: 0000000000000000 [13108726.328811] RDX: 0000000000000074 RSI: 0000000000000286 RDI: ffffa0c2a74bfcf0 [13108726.328864] RBP: ffffa0c2a74bfe00 R08: ffffa0bab8c22960 R09: 0000000000000001 [13108726.328916] R10: 0000000000000001 R11: 0000000000000001 R12: ffffa0a32aa7f000 [13108726.328969] R13: ffffa0a6183afac0 R14: ffffa0c233d88d00 R15: ffffa0c2a74bfdb4 [13108726.329022] FS: 0000000000000000(0000) GS:ffffa0e17f9c0000(0000) knlGS:0000000000000000 [13108726.329081] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [13108726.332311] CR2: 0000000000000074 CR3: 00000026a1b28000 CR4: 00000000007607e0 [13108726.334606] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [13108726.336754] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [13108726.338908] PKRU: 00000000 [13108726.341047] Call Trace: [13108726.343074] [<ffffffff8a2c78b4>] ? groups_alloc+0x34/0x110 [13108726.344837] [<ffffffffc01f5eb4>] svc_set_client+0x24/0x30 [sunrpc] [13108726.346631] [<ffffffffc01f2ac1>] svc_process_common+0x241/0x710 [sunrpc] [13108726.348332] [<ffffffffc01f3093>] svc_process+0x103/0x190 [sunrpc] [13108726.350016] [<ffffffffc07d605f>] nfsd+0xdf/0x150 [nfsd] [13108726.351735] [<ffffffffc07d5f80>] ? nfsd_destroy+0x80/0x80 [nfsd] [13108726.353459] [<ffffffff8a2bf741>] kthread+0xd1/0xe0 [13108726.355195] [<ffffffff8a2bf670>] ? create_kthread+0x60/0x60 [13108726.356896] [<ffffffff8a9556dd>] ret_from_fork_nospec_begin+0x7/0x21 [13108726.358577] [<ffffffff8a2bf670>] ? create_kthread+0x60/0x60 [13108726.360240] Code: 4c 8b 45 98 0f 8e 2e 01 00 00 83 f8 fe 0f 84 76 fe ff ff 85 c0 0f 85 2b 01 00 00 49 8b 50 40 b8 01 00 00 00 48 89 93 d0 1a 00 00 <f0> 0f c1 02 83 c0 01 83 f8 01 0f 8e 53 02 00 00 49 8b 44 24 38 [13108726.363769] RIP [<ffffffffc01f79eb>] svcauth_unix_set_client+0x2ab/0x520 [sunrpc] [13108726.365530] RSP <ffffa0c2a74bfd80> [13108726.367179] CR2: 0000000000000074
--- net/sunrpc/cache.c | 6 ------ 1 file changed, 6 deletions(-)
net/sunrpc/cache.c +0 -6
@@ -54,9 +54,6 @@ static void cache_init(struct cache_head *h, struct cache_detail *detail) h->last_refresh = now; } -static inline int cache_is_valid (struct cache_head *h); -static void cache_fresh_locked (struct cache_head *head,time_t expiry, -struct cache_detail *detail);static void cache_fresh_unlocked (struct cache_head *head,struct cache_detail *detail);
@@ -101,9 +98,6 @@ struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,if (cache_is_expired (detail, tmp)) {hlist_del_init (&tmp->cache_list); detail->entries --; -if (cache_is_valid (tmp) == -EAGAIN ) -set_bit (CACHE_NEGATIVE , &tmp->flags); -cache_fresh_locked (tmp,0 , detail); freeme = tmp;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 173/199 net/mlx5e: Fix SFF 8472 eeprom length
In reply to Greg Kroah-HartmanFrom: Eran Ben Elisha <[email protected]>
[ Upstream commit c431f8597863a91eea6024926e0c1b179cfa4852 ]
SFF 8472 eeprom length is 512 bytes. Fix module info return value to support 512 bytes read.
--- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +1 -1
@@ -1368,7 +1368,7 @@ static int mlx5e_get_module_info(struct net_device *netdev,break ;case MLX5_MODULE_ID_SFP : modinfo->type =ETH_MODULE_SFF_8472 ; - modinfo->eeprom_len =MLX5_EEPROM_PAGE_LENGTH ; + modinfo->eeprom_len =ETH_MODULE_SFF_8472_LEN ;break ;default : netdev_err(priv->netdev, "%s: cable type not recognized:0x%x\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/199 scsi: qla2xxx: Always check the qla2x00_wait_for_hba_online() return value
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit e6803efae5acd109fad9f2f07dab674563441a53 ]
This patch fixes several Coverity complaints about not always checking the qla2x00_wait_for_hba_online() return value.
--- drivers/scsi/qla2xxx/qla_attr.c | 3 ++- drivers/scsi/qla2xxx/qla_target.c | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +2 -1
@@ -682,7 +682,8 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,break ; }else {/* Make sure FC side is not in reset */ -qla2x00_wait_for_hba_online (vha); +WARN_ON_ONCE (qla2x00_wait_for_hba_online (vha) != +QLA_SUCCESS );/* Issue MPI reset */ scsi_block_requests (vha->host);
drivers/scsi/qla2xxx/qla_target.c +5 -2
@@ -6341,7 +6341,8 @@ qlt_enable_vha(struct scsi_qla_host *vha)set_bit (ISP_ABORT_NEEDED , &base_vha->dpc_flags);qla2xxx_wake_dpc (base_vha); -qla2x00_wait_for_hba_online (base_vha); +WARN_ON_ONCE (qla2x00_wait_for_hba_online (base_vha) != +QLA_SUCCESS ); } }EXPORT_SYMBOL (qlt_enable_vha);
@@ -6371,7 +6372,9 @@ static void qlt_disable_vha(struct scsi_qla_host *vha)set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);qla2xxx_wake_dpc (vha); -qla2x00_wait_for_hba_online (vha); +if (qla2x00_wait_for_hba_online (vha) !=QLA_SUCCESS ) +ql_dbg (ql_dbg_tgt, vha,0xe081 , +"qla2x00_wait_for_hba_online() failed\n" ); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 170/199 blk-mq: make sure that line break can be printed
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
commit d2c9be89f8ebe7ebcc97676ac40f8dec1cf9b43a upstream.
8962842ca5ab ("blk-mq: avoid sysfs buffer overflow with too many CPU cores") avoids sysfs buffer overflow, and reserves one character for line break. However, the last snprintf() doesn't get correct 'size' parameter passed in, so fixed it.
--- block/blk-mq-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-mq-sysfs.c +1 -1
@@ -260,7 +260,7 @@ static ssize_t blk_mq_hw_sysfs_cpus_show pos += ret; } - ret =snprintf (pos + page, size - pos,"\n" ); + ret =snprintf (pos + page, size +1 - pos,"\n" );return pos + ret; }
Greg Kroah-Hartman
maintainerPATCH 199/199 net: stmmac: dont stop NAPI processing when dropping a packet
In reply to Greg Kroah-HartmanFrom: Aaro Koskinen <[email protected]>
commit 07b3975352374c3f5ebb4a42ef0b253fe370542d upstream.
Currently, if we drop a packet, we exit from NAPI loop before the budget is consumed. In some situations this will make the RX processing stall e.g. when flood pinging the system with oversized packets, as the errorneous packets are not dropped efficiently.
If we drop a packet, we should just continue to the next one as long as the budget allows.
[acj: backport v4.9 -stable
-adjust context]
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +7 -7
@@ -2499,8 +2499,7 @@ static inline void stmmac_rx_refill(stru*/ static int stmmac_rx (struct stmmac_priv *priv,int limit) { -unsigned int entry = priv->cur_rx; -unsigned int next_entry; +unsigned int next_entry = priv->cur_rx;unsigned int count =0 ;int coe = priv->hw->rx_csum;
@@ -2516,10 +2515,12 @@ static int stmmac_rx(struct stmmac_priv priv->hw->desc->display_ring (rx_head,DMA_RX_SIZE , true); }while (count < limit) { -int status; +int entry, status;struct dma_desc *p;struct dma_desc *np; + entry = next_entry; +if (priv->extend_desc) p = (struct dma_desc *)(priv->dma_erx + entry);else
@@ -2584,7 +2585,7 @@ static int stmmac_rx(struct stmmac_priv priv->dev->name, frame_len, priv->dma_buf_sz); priv->dev->stats.rx_length_errors++; -break ; +continue ; }/* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
@@ -2615,7 +2616,7 @@ static int stmmac_rx(struct stmmac_privdev_warn (priv->device,"packet dropped\n" ); priv->dev->stats.rx_dropped++; -break ; +continue ; } dma_sync_single_for_cpu(priv->device,
@@ -2638,7 +2639,7 @@ static int stmmac_rx(struct stmmac_privpr_err ("%s: Inconsistent Rx chain\n" , priv->dev->name); priv->dev->stats.rx_dropped++; -break ; +continue ; }prefetch (skb->data -NET_IP_ALIGN ); priv->rx_skbuff[entry] =NULL ;
@@ -2672,7 +2673,6 @@ static int stmmac_rx(struct stmmac_priv priv->dev->stats.rx_packets++; priv->dev->stats.rx_bytes += frame_len; } - entry = next_entry; }stmmac_rx_refill (priv);
Greg Kroah-Hartman
maintainerPATCH 189/199 CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
In reply to Greg Kroah-HartmanFrom: Pavel Shilovsky <[email protected]>
commit 44805b0e62f15e90d233485420e1847133716bdc upstream.
Currently the client translates O_SYNC and O_DIRECT flags into corresponding SMB create options when openning a file. The problem is that on reconnect when the file is being re-opened the client doesn't set those flags and it causes a server to reject re-open requests because create options don't match. The latter means that any subsequent system call against that open file fail until a share is re-mounted.
Fix this by properly setting SMB create options when re-openning files after reconnects.
--- fs/cifs/file.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/cifs/file.c +7 -0
@@ -722,6 +722,13 @@ cifs_reopen_file(struct cifsFileInfo *cfif (backup_cred (cifs_sb)) create_options |=CREATE_OPEN_BACKUP_INTENT ; +/* O_SYNC also has bit for O_DSYNC so following check picks up either */ +if (cfile->f_flags &O_SYNC ) + create_options |=CREATE_WRITE_THROUGH ; + +if (cfile->f_flags &O_DIRECT ) + create_options |=CREATE_NO_BUFFER ; +if (server->ops->get_lease_key) server->ops->get_lease_key (inode, &cfile->fid);
Greg Kroah-Hartman
maintainerPATCH 185/199 Revert "regulator: Defer init completion for a while after late_initcall"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
This reverts commit 8b8c8d69b1a31004517d4c71a490f47bdf3405a2 which is commit 55576cf1853798e86f620766e23b604c9224c19c upstream.
It's causing "odd" interactions with older kernels, so it probably isn't a good idea to cause timing changes there. This has been reported to cause oopses on Pixel devices.
--- drivers/regulator/core.c | 42 +++++++++++------------------------------- 1 file changed, 11 insertions(+), 31 deletions(-)
drivers/regulator/core.c +11 -31
@@ -4452,7 +4452,7 @@ static int __init regulator_init(void)/* init early to allow our consumers to complete system booting */ core_initcall (regulator_init); -static int regulator_late_cleanup (struct device *dev,void *data) +static int __init regulator_late_cleanup (struct device *dev,void *data) {struct regulator_dev *rdev =dev_to_rdev (dev);const struct regulator_ops *ops = rdev->desc->ops;
@@ -4501,9 +4501,18 @@ unlock:return 0 ; } -static void regulator_init_complete_work_function (struct work_struct *work) +static int __init regulator_init_complete (void ) {/* +* Since DT doesn't provide an idiomatic mechanism for +* enabling full constraints and since it's much more natural +* with DT to provide them just assume that a DT enabled +* system has full constraints. +*/ +if (of_have_populated_dt ()) + has_full_constraints = true; + +/* * Regulators may had failed to resolve their input supplies * when were registered, either because the input supply was * not registered yet or because its parent device was not
@@ -4520,35 +4529,6 @@ static void regulator_init_complete_work*/ class_for_each_device (®ulator_class,NULL ,NULL , regulator_late_cleanup); -} - -static DECLARE_DELAYED_WORK(regulator_init_complete_work, - regulator_init_complete_work_function); - -static int __init regulator_init_complete (void ) -{ -/* -* Since DT doesn't provide an idiomatic mechanism for -* enabling full constraints and since it's much more natural -* with DT to provide them just assume that a DT enabled -* system has full constraints. -*/ -if (of_have_populated_dt ()) - has_full_constraints = true; - -/* -* We punt completion for an arbitrary amount of time since -* systems like distros will load many drivers from userspace -* so consumers might not always be ready yet, this is -* particularly an issue with laptops where this might bounce -* the display off then on. Ideally we'd get a notification -* from userspace when this happens but we don't so just wait -* a bit and hope we waited long enough. It'd be better if -* we'd only do this on systems that need it, and a kernel -* command line option might be useful. -*/ -schedule_delayed_work (®ulator_init_complete_work, -msecs_to_jiffies (30000 ));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 181/199 inet: protect against too small mtu values.
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 501a90c945103e8627406763dac418f20f3837b2 ]
syzbot was once again able to crash a host by setting a very small mtu on loopback device.
Let's make inetdev_valid_mtu() available in include/net/ip.h, and use it in ip_setup_cork(), so that we protect both ip_append_page() and __ip_append_data()
Also add a READ_ONCE() when the device mtu is read.
Pairs this lockless read with one WRITE_ONCE() in __dev_set_mtu(), even if other code paths might write over this field.
Add a big comment in include/linux/netdevice.h about dev->mtu needing READ_ONCE()/WRITE_ONCE() annotations.
Hopefully we will add the missing ones in followup patches.
[1]
refcount_t: saturated; leaking memory.
WARNING: CPU: 0 PID: 9464 at lib/refcount.c:22 refcount_warn_saturate+0x138/0x1f0 lib/refcount.c:22 Kernel panic - not syncing: panic_on_warn set ... CPU: 0 PID: 9464 Comm: syz-executor850 Not tainted 5.4.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x197/0x210 lib/dump_stack.c:118 panic+0x2e3/0x75c kernel/panic.c:221 __warn.cold+0x2f/0x3e kernel/panic.c:582 report_bug+0x289/0x300 lib/bug.c:195 fixup_bug arch/x86/kernel/traps.c:174 [inline] fixup_bug arch/x86/kernel/traps.c:169 [inline] do_error_trap+0x11b/0x200 arch/x86/kernel/traps.c:267 do_invalid_op+0x37/0x50 arch/x86/kernel/traps.c:286 invalid_op+0x23/0x30 arch/x86/entry/entry_64.S:1027 RIP: 0010:refcount_warn_saturate+0x138/0x1f0 lib/refcount.c:22 Code: 06 31 ff 89 de e8 c8 f5 e6 fd 84 db 0f 85 6f ff ff ff e8 7b f4 e6 fd 48 c7 c7 e0 71 4f 88 c6 05 56 a6 a4 06 01 e8 c7 a8 b7 fd <0f> 0b e9 50 ff ff ff e8 5c f4 e6 fd 0f b6 1d 3d a6 a4 06 31 ff 89 RSP: 0018:ffff88809689f550 EFLAGS: 00010286 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffffffff815e4336 RDI: ffffed1012d13e9c RBP: ffff88809689f560 R08: ffff88809c50a3c0 R09: fffffbfff15d31b1 R10: fffffbfff15d31b0 R11: ffffffff8ae98d87 R12: 0000000000000001 R13: 0000000000040100 R14: ffff888099041104 R15: ffff888218d96e40 refcount_add include/linux/refcount.h:193 [inline] skb_set_owner_w+0x2b6/0x410 net/core/sock.c:1999 sock_wmalloc+0xf1/0x120 net/core/sock.c:2096 ip_append_page+0x7ef/0x1190 net/ipv4/ip_output.c:1383 udp_sendpage+0x1c7/0x480 net/ipv4/udp.c:1276 inet_sendpage+0xdb/0x150 net/ipv4/af_inet.c:821 kernel_sendpage+0x92/0xf0 net/socket.c:3794 sock_sendpage+0x8b/0xc0 net/socket.c:936 pipe_to_sendpage+0x2da/0x3c0 fs/splice.c:458 splice_from_pipe_feed fs/splice.c:512 [inline] __splice_from_pipe+0x3ee/0x7c0 fs/splice.c:636 splice_from_pipe+0x108/0x170 fs/splice.c:671 generic_splice_sendpage+0x3c/0x50 fs/splice.c:842 do_splice_from fs/splice.c:861 [inline] direct_splice_actor+0x123/0x190 fs/splice.c:1035 splice_direct_to_actor+0x3b4/0xa30 fs/splice.c:990 do_splice_direct+0x1da/0x2a0 fs/splice.c:1078 do_sendfile+0x597/0xd00 fs/read_write.c:1464 __do_sys_sendfile64 fs/read_write.c:1525 [inline] __se_sys_sendfile64 fs/read_write.c:1511 [inline] __x64_sys_sendfile64+0x1dd/0x220 fs/read_write.c:1511 do_syscall_64+0xfa/0x790 arch/x86/entry/common.c:294 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x441409 Code: e8 ac e8 ff ff 48 83 c4 18 c3 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 eb 08 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fffb64c4f78 EFLAGS: 00000246 ORIG_RAX: 0000000000000028 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 0000000000441409 RDX: 0000000000000000 RSI: 0000000000000006 RDI: 0000000000000005 RBP: 0000000000073b8a R08: 0000000000000010 R09: 0000000000000010 R10: 0000000000010001 R11: 0000000000000246 R12: 0000000000402180 R13: 0000000000402210 R14: 0000000000000000 R15: 0000000000000000
Kernel Offset: disabled
Rebooting in 86400 seconds..
--- include/linux/netdevice.h | 5 +++++ include/net/ip.h | 5 +++++ net/core/dev.c | 3 ++- net/ipv4/devinet.c | 5 ----- net/ipv4/ip_output.c | 14 +++++++++----- 5 files changed, 21 insertions(+), 11 deletions(-)
include/linux/netdevice.h +5 -0
@@ -1730,6 +1730,11 @@ struct net_device {unsigned char if_port;unsigned char dma; +/* Note : dev->mtu is often read without holding a lock. +* Writers usually hold RTNL. +* It is recommended to use READ_ONCE() to annotate the reads, +* and to use WRITE_ONCE() to annotate the writes. +*/ unsigned int mtu;unsigned short type;unsigned short hard_header_len;
include/net/ip.h +5 -0
@@ -620,4 +620,9 @@ extern int sysctl_icmp_msgs_burst;int ip_misc_proc_init (void );#endif +static inline bool inetdev_valid_mtu (unsigned int mtu) +{ +return likely (mtu >=IPV4_MIN_MTU ); +} +#endif /* _IP_H */
net/core/dev.c +2 -1
@@ -6584,7 +6584,8 @@ static int __dev_set_mtu(struct net_deviif (ops->ndo_change_mtu)return ops->ndo_change_mtu (dev, new_mtu); - dev->mtu = new_mtu; +/* Pairs with all the lockless reads of dev->mtu in the stack */ +WRITE_ONCE (dev->mtu, new_mtu);return 0 ; }
net/ipv4/devinet.c +0 -5
@@ -1386,11 +1386,6 @@ skip: } } -static bool inetdev_valid_mtu (unsigned int mtu) -{ -return mtu >=IPV4_MIN_MTU ; -} -static void inetdev_send_gratuitous_arp (struct net_device *dev,struct in_device *in_dev)
net/ipv4/ip_output.c +9 -5
@@ -1159,13 +1159,17 @@ static int ip_setup_cork(struct sock *sk rt = *rtp;if (unlikely (!rt))return -EFAULT ; -/* -* We steal reference to this route, caller should not release it -*/ - *rtp =NULL ; + cork->fragsize =ip_sk_use_pmtu (sk) ? -dst_mtu (&rt->dst) : rt->dst.dev->mtu; +dst_mtu (&rt->dst) :READ_ONCE (rt->dst.dev->mtu); + +if (!inetdev_valid_mtu (cork->fragsize)) +return -ENETUNREACH ; + cork->dst = &rt->dst; +/* We stole this route, caller should not release it. */ + *rtp =NULL ; + cork->length =0 ; cork->ttl = ipc->ttl; cork->tos = ipc->tos;
Greg Kroah-Hartman
maintainerPATCH 182/199 tcp: fix rejected syncookies due to stale timestamps
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit 04d26e7b159a396372646a480f4caa166d1b6720 ]
If no synflood happens for a long enough period of time, then the synflood timestamp isn't refreshed and jiffies can advance so much that time_after32() can't accurately compare them any more.
Therefore, we can end up in a situation where time_after32(now, last_overflow + HZ) returns false, just because these two values are too far apart. In that case, the synflood timestamp isn't updated as it should be, which can trick tcp_synq_no_recent_overflow() into rejecting valid syncookies.
For example, let's consider the following scenario on a system with HZ=1000:
* The synflood timestamp is 0, either because that's the timestamp of the last synflood or, more commonly, because we're working with a freshly created socket.
* We receive a new SYN, which triggers synflood protection. Let's say
that this happens when jiffies == 2147484649 (that is,
'synflood timestamp' + HZ + 2^31 + 1). * Then tcp_synq_overflow() doesn't update the synflood timestamp, because time_after32(2147484649, 1000) returns false. With:
- 2147484649: the value of jiffies, aka. 'now'.
- 1000: the value of 'last_overflow' + HZ.
* A bit later, we receive the ACK completing the 3WHS. But cookie_v[46]_check() rejects it because tcp_synq_no_recent_overflow() says that we're not under synflood. That's because time_after32(2147484649, 120000) returns false.
With:
- 2147484649: the value of jiffies, aka. 'now'.
- 120000: the value of 'last_overflow' + TCP_SYNCOOKIE_VALID.
Of course, in reality jiffies would have increased a bit, but this condition will last for the next 119 seconds, which is far enough to accommodate for jiffie's growth.
Fix this by updating the overflow timestamp whenever jiffies isn't within the [last_overflow, last_overflow + HZ] range. That shouldn't have any performance impact since the update still happens at most once per second.
Now we're guaranteed to have fresh timestamps while under synflood, so tcp_synq_no_recent_overflow() can safely use it with time_after32() in such situations.
Stale timestamps can still make tcp_synq_no_recent_overflow() return the wrong verdict when not under synflood. This will be handled in the next patch.
For 64 bits architectures, the problem was introduced with the conversion of ->tw_ts_recent_stamp to 32 bits integer by commit cca9bab1b72c ("tcp: use monotonic timestamps for PAWS"). The problem has always been there on 32 bits architectures.
--- include/linux/time.h | 12 ++++++++++++ include/net/tcp.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-)
include/linux/time.h +12 -0
@@ -275,4 +275,16 @@ static __always_inline void timespec_add a->tv_nsec = ns; } +/** +* time_between32 - check if a 32-bit timestamp is within a given time range +* @t: the time which may be within [l,h] +* @l: the lower bound of the range +* @h: the higher bound of the range +* +* time_before32(t, l, h) returns true if @l <= @t <= @h. All operands are +* treated as 32-bit integers. +* +* Equivalent to !(time_before32(@t, @l) || time_after32(@t, @h)). +*/ +#define time_between32 (t, l, h) ((u32)(h) - (u32)(l) >= (u32)(t) - (u32)(l))#endif
include/net/tcp.h +1 -1
@@ -497,7 +497,7 @@ static inline void tcp_synq_overflow(conunsigned long last_overflow =tcp_sk (sk)->rx_opt.ts_recent_stamp;unsigned long now = jiffies; -if (time_after (now, last_overflow +HZ )) +if (!time_between32 (now, last_overflow, last_overflow +HZ ))tcp_sk (sk)->rx_opt.ts_recent_stamp = now; }
Greg Kroah-Hartman
maintainerPATCH 176/199 net: bridge: deny dev_set_mac_address() when unregistering
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
[ Upstream commit c4b4c421857dc7b1cf0dccbd738472360ff2cd70 ]
We have an interesting memory leak in the bridge when it is being unregistered and is a slave to a master device which would change the mac of its slaves on unregister (e.g. bond, team). This is a very unusual setup but we do end up leaking 1 fdb entry because dev_set_mac_address() would cause the bridge to insert the new mac address into its table after all fdbs are flushed, i.e. after dellink() on the bridge has finished and we call NETDEV_UNREGISTER the bond/team would release it and will call dev_set_mac_address() to restore its original address and that in turn will add an fdb in the bridge.
One fix is to check for the bridge dev's reg_state in its ndo_set_mac_address callback and return an error if the bridge is not in NETREG_REGISTERED.
Easy steps to reproduce:
1. add bond in mode != A/B
2. add any slave to the bond
3. add bridge dev as a slave to the bond
4. destroy the bridge device
Trace:
unreferenced object 0xffff888035c4d080 (size 128):
comm "ip", pid 4068, jiffies 4296209429 (age 1413.753s) hex dump (first 32 bytes):
41 1d c9 36 80 88 ff ff 00 00 00 00 00 00 00 00 A..6............
d2 19 c9 5e 3f d7 00 00 00 00 00 00 00 00 00 00 ...^?...........
backtrace:
[<00000000ddb525dc>] kmem_cache_alloc+0x155/0x26f
[<00000000633ff1e0>] fdb_create+0x21/0x486 [bridge]
[<0000000092b17e9c>] fdb_insert+0x91/0xdc [bridge]
[<00000000f2a0f0ff>] br_fdb_change_mac_address+0xb3/0x175 [bridge]
[<000000001de02dbd>] br_stp_change_bridge_id+0xf/0xff [bridge]
[<00000000ac0e32b1>] br_set_mac_address+0x76/0x99 [bridge]
[<000000006846a77f>] dev_set_mac_address+0x63/0x9b
[<00000000d30738fc>] __bond_release_one+0x3f6/0x455 [bonding]
[<00000000fc7ec01d>] bond_netdev_event+0x2f2/0x400 [bonding]
[<00000000305d7795>] notifier_call_chain+0x38/0x56
[<0000000028885d4a>] call_netdevice_notifiers+0x1e/0x23
[<000000008279477b>] rollback_registered_many+0x353/0x6a4
[<0000000018ef753a>] unregister_netdevice_many+0x17/0x6f
[<00000000ba854b7a>] rtnl_delete_link+0x3c/0x43
[<00000000adf8618d>] rtnl_dellink+0x1dc/0x20a
[<000000009b6395fd>] rtnetlink_rcv_msg+0x23d/0x268--- net/bridge/br_device.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/bridge/br_device.c +6 -0
@@ -210,6 +210,12 @@ static int br_set_mac_address(struct netif (!is_valid_ether_addr (addr->sa_data))return -EADDRNOTAVAIL ; +/* dev_set_mac_addr() can be called by a master device on bridge's +* NETDEV_UNREGISTER, but since it's being destroyed do nothing +*/ +if (dev->reg_state !=NETREG_REGISTERED ) +return -EBUSY ; +spin_lock_bh (&br->lock);if (!ether_addr_equal (dev->dev_addr, addr->sa_data)) {/* Mac address will be changed in br_stp_change_bridge_id(). */
Greg Kroah-Hartman
maintainerPATCH 174/199 kernel/module.c: wakeup processes in module_wq on module unload
In reply to Greg Kroah-HartmanFrom: Konstantin Khorenko <[email protected]>
[ Upstream commit 5d603311615f612320bb77bd2a82553ef1ced5b7 ]
Fix the race between load and unload a kernel module.
sys_delete_module()
try_stop_module()
mod->state = _GOING
add_unformed_module()
old = find_module_all() (old->state == _GOING =>
wait_event_interruptible())
During pre-condition finished_loading() rets 0 schedule() (never gets waken up later)
free_module()
mod->state = _UNFORMED
list_del_rcu(&mod->list)
(dels mod from "modules" list)
return
The race above leads to modprobe hanging forever on loading a module.
Error paths on loading module call wake_up_all(&module_wq) after freeing module, so let's do the same on straight module unload.
--- kernel/module.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/module.c +2 -0
@@ -995,6 +995,8 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,strlcpy (last_unloaded_module, mod->name,sizeof (last_unloaded_module));free_module (mod); +/* someone could wait for the module in add_unformed_module() */ +wake_up_all (&module_wq);return 0 ; out:mutex_unlock (&module_mutex);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/199 scsi: qla2xxx: Fix session lookup in qlt_abort_work()
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit ac452b8e79320c9e90c78edf32ba2d42431e4daf ]
Pass the correct session ID to find_sess_by_s_id() instead of passing an uninitialized variable.
--- drivers/scsi/qla2xxx/qla_target.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +1 -3
@@ -5893,7 +5893,6 @@ static void qlt_abort_work(struct qla_tgt *tgt,struct qla_hw_data *ha = vha->hw;struct qla_tgt_sess *sess =NULL ;unsigned long flags =0 , flags2 =0 ; -uint32_t be_s_id;uint8_t s_id[3 ];int rc;
@@ -5906,8 +5905,7 @@ static void qlt_abort_work(struct qla_tgt *tgt, s_id[1 ] = prm->abts.fcp_hdr_le.s_id[1 ]; s_id[2 ] = prm->abts.fcp_hdr_le.s_id[0 ]; - sess = ha->tgt.tgt_ops->find_sess_by_s_id (vha, - (unsigned char *)&be_s_id); + sess = ha->tgt.tgt_ops->find_sess_by_s_id (vha, s_id);if (!sess) {spin_unlock_irqrestore (&ha->tgt.sess_lock, flags2);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/199 scsi: qla2xxx: Fix DMA unmap leak
In reply to Greg Kroah-HartmanFrom: Himanshu Madhani <[email protected]>
[ Upstream commit 5d328de64d89400dcf9911125844d8adc0db697f ]
With debug kernel we see following wanings indicating memory leak.
[28809.523959] WARNING: CPU: 3 PID: 6790 at lib/dma-debug.c:978 dma_debug_device_change+0x166/0x1d0 [28809.523964] pci 0000:0c:00.6: DMA-API: device driver has pending DMA allocations while released from device [count=5] [28809.523964] One of leaked entries details: [device
address=0x00000002aefe4000] [size=8208 bytes] [mapped with DMA_BIDIRECTIONAL] [mapped as coherent]
Fix this by unmapping DMA memory.
--- drivers/scsi/qla2xxx/qla_bsg.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/qla2xxx/qla_bsg.c +4 -0
@@ -336,6 +336,8 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)dma_map_sg (&ha->pdev->dev, bsg_job->request_payload.sg_list, bsg_job->request_payload.sg_cnt,DMA_TO_DEVICE );if (!req_sg_cnt) { +dma_unmap_sg (&ha->pdev->dev, bsg_job->request_payload.sg_list, + bsg_job->request_payload.sg_cnt,DMA_TO_DEVICE ); rval = -ENOMEM ; goto done_free_fcport; }
@@ -343,6 +345,8 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job) rsp_sg_cnt =dma_map_sg (&ha->pdev->dev, bsg_job->reply_payload.sg_list, bsg_job->reply_payload.sg_cnt,DMA_FROM_DEVICE );if (!rsp_sg_cnt) { +dma_unmap_sg (&ha->pdev->dev, bsg_job->reply_payload.sg_list, + bsg_job->reply_payload.sg_cnt,DMA_FROM_DEVICE ); rval = -ENOMEM ; goto done_free_fcport; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/199 workqueue: Fix spurious sanity check failures in destroy_workqueue()
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit def98c84b6cdf2eeea19ec5736e90e316df5206b upstream.
Before actually destrying a workqueue, destroy_workqueue() checks whether it's actually idle. If it isn't, it prints out a bunch of warning messages and leaves the workqueue dangling. It unfortunately has a couple issues.
* Mayday list queueing increments pwq's refcnts which gets detected as busy and fails the sanity checks. However, because mayday list queueing is asynchronous, this condition can happen without any actual work items left in the workqueue.
* Sanity check failure leaves the sysfs interface behind too which can lead to init failure of newer instances of the workqueue.
This patch fixes the above two by
* If a workqueue has a rescuer, disable and kill the rescuer before sanity checks. Disabling and killing is guaranteed to flush the existing mayday list.
* Remove sysfs interface before sanity checks.
--- kernel/workqueue.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
kernel/workqueue.c +19 -5
@@ -4031,9 +4031,28 @@ void destroy_workqueue(struct workqueue_struct pool_workqueue *pwq;int node; +/* +* Remove it from sysfs first so that sanity check failure doesn't +* lead to sysfs name conflicts. +*/ +workqueue_sysfs_unregister (wq); +/* drain it before proceeding with destruction */ drain_workqueue (wq); +/* kill rescuer, if sanity checks fail, leave it w/o rescuer */ +if (wq->rescuer) { +struct worker *rescuer = wq->rescuer; + +/* this prevents new queueing */ +spin_lock_irq (&wq_mayday_lock); + wq->rescuer =NULL ; +spin_unlock_irq (&wq_mayday_lock); + +/* rescuer will empty maydays list before exiting */ +kthread_stop (rescuer->task); + } +/* sanity checks */ mutex_lock (&wq->mutex);for_each_pwq (pwq, wq) {
@@ -4063,11 +4082,6 @@ void destroy_workqueue(struct workqueue_list_del_rcu (&wq->list);mutex_unlock (&wq_pool_mutex); -workqueue_sysfs_unregister (wq); - -if (wq->rescuer) -kthread_stop (wq->rescuer->task); -if (!(wq->flags &WQ_UNBOUND )) {/* * The base ref is never dropped on per-cpu pwqs. Directly
Greg Kroah-Hartman
maintainerPATCH 160/199 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 7f028caadf6c37580d0f59c6c094ed09afc04062 ]
In s3c64xx_eint_eint0_init() the for_each_child_of_node() loop is used with a break to find a matching child node. Although each iteration of for_each_child_of_node puts the previous node, but early exit from loop misses it. This leads to leak of device node.
--- drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pinctrl/samsung/pinctrl-s3c64xx.c +3 -0
@@ -713,6 +713,7 @@ static int s3c64xx_eint_eint0_init(struct samsung_pinctrl_drv_data *d) data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data) {dev_err (dev,"could not allocate memory for wkup eint data\n" ); +of_node_put (eint0_np);return -ENOMEM ; } data->drvdata = d;
@@ -723,6 +724,7 @@ static int s3c64xx_eint_eint0_init(struct samsung_pinctrl_drv_data *d) irq =irq_of_parse_and_map (eint0_np, i);if (!irq) {dev_err (dev,"failed to get wakeup EINT IRQ %d\n" , i); +of_node_put (eint0_np);return -ENXIO ; }
@@ -730,6 +732,7 @@ static int s3c64xx_eint_eint0_init(struct samsung_pinctrl_drv_data *d) s3c64xx_eint0_handlers[i], data); } +of_node_put (eint0_np); bank = d->pin_banks;for (i =0 ; i < d->nr_banks; ++i, ++bank) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/199 x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models
In reply to Greg Kroah-HartmanFrom: Shirish S <[email protected]>
[ Upstream commit c95b323dcd3598dd7ef5005d6723c1ba3b801093 ]
MC4_MISC thresholding is not supported on all family 0x15 processors, hence skip the x86_model check when applying the quirk.
[ bp: massage commit message. ]
--- arch/x86/kernel/cpu/mcheck/mce.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +2 -3
@@ -1649,11 +1649,10 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) mce_flags.overflow_recov =1 ;/* -* Turn off MC4_MISC thresholding banks on those models since +* Turn off MC4_MISC thresholding banks on all models since * they're not supported there. */ -if (c->x86 ==0x15 && - (c->x86_model >=0x10 && c->x86_model <=0x1f )) { +if (c->x86 ==0x15 ) {int i;u64 hwcr;bool need_toggle;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/199 x86/MCE/AMD: Carve out the MC4_MISC thresholding quirk
In reply to Greg Kroah-HartmanFrom: Shirish S <[email protected]>
[ Upstream commit 30aa3d26edb0f3d7992757287eec0ca588a5c259 ]
The MC4_MISC thresholding quirk needs to be applied during S5 -> S0 and S3 -> S0 state transitions, which follow different code paths. Carve it out into a separate function and call it mce_amd_feature_init() where the two code paths of the state transitions converge.
[ bp: massage commit message and the carved out function. ]
--- arch/x86/kernel/cpu/mcheck/mce.c | 29 ---------------------- arch/x86/kernel/cpu/mcheck/mce_amd.c | 36 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 29 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +0 -29
@@ -1648,35 +1648,6 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)if (c->x86 ==0x15 && c->x86_model <=0xf ) mce_flags.overflow_recov =1 ; -/* -* Turn off MC4_MISC thresholding banks on all models since -* they're not supported there. -*/ -if (c->x86 ==0x15 ) { -int i; -u64 hwcr; -bool need_toggle; -u32 msrs[] = { -0x00000413 ,/* MC4_MISC0 */ -0xc0000408 ,/* MC4_MISC1 */ - }; - -rdmsrl (MSR_K7_HWCR , hwcr); - -/* McStatusWrEn has to be set */ - need_toggle = !(hwcr &BIT (18 )); - -if (need_toggle) -wrmsrl (MSR_K7_HWCR , hwcr |BIT (18 )); - -/* Clear CntP bit safely */ -for (i =0 ; i <ARRAY_SIZE (msrs); i++) -msr_clear_bit (msrs[i],62 ); - -/* restore old settings */ -if (need_toggle) -wrmsrl (MSR_K7_HWCR , hwcr); - } }if (c->x86_vendor ==X86_VENDOR_INTEL ) {
arch/x86/kernel/cpu/mcheck/mce_amd.c +36 -0
@@ -499,6 +499,40 @@ out:return offset; } +/* +* Turn off MC4_MISC thresholding banks on all family 0x15 models since +* they're not supported there. +*/ +void disable_err_thresholding (struct cpuinfo_x86 *c) +{ +int i; +u64 hwcr; +bool need_toggle; +u32 msrs[] = { +0x00000413 ,/* MC4_MISC0 */ +0xc0000408 ,/* MC4_MISC1 */ + }; + +if (c->x86 !=0x15 ) +return ; + +rdmsrl (MSR_K7_HWCR , hwcr); + +/* McStatusWrEn has to be set */ + need_toggle = !(hwcr &BIT (18 )); + +if (need_toggle) +wrmsrl (MSR_K7_HWCR , hwcr |BIT (18 )); + +/* Clear CntP bit safely */ +for (i =0 ; i <ARRAY_SIZE (msrs); i++) +msr_clear_bit (msrs[i],62 ); + +/* restore old settings */ +if (need_toggle) +wrmsrl (MSR_K7_HWCR , hwcr); +} +/* cpu init entry point, called from mce.c with preempt off */ void mce_amd_feature_init (struct cpuinfo_x86 *c) {
@@ -506,6 +540,8 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)unsigned int bank, block, cpu =smp_processor_id ();int offset =-1 ; +disable_err_thresholding (c); +for (bank =0 ; bank < mca_cfg.banks; ++bank) {if (mce_flags.smca)get_smca_bank_info (bank);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/199 quota: fix livelock in dquot_writeback_dquots
In reply to Greg Kroah-HartmanFrom: Dmitry Monakhov <[email protected]>
commit 6ff33d99fc5c96797103b48b7b0902c296f09c05 upstream.
Write only quotas which are dirty at entry.
XFSTEST: https://github.com/dmonakhov/xfstests/commit/b10ad23566a5bf75832a6f500e1236084083cddc
--- fs/quota/dquot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
fs/quota/dquot.c +5 -4
@@ -611,7 +611,7 @@ EXPORT_SYMBOL(dquot_scan_active);/* Write all dquot structures to quota files */ int dquot_writeback_dquots (struct super_block *sb,int type) { -struct list_head *dirty; +struct list_head dirty;struct dquot *dquot;struct quota_info *dqopt =sb_dqopt (sb);int cnt;
@@ -624,9 +624,10 @@ int dquot_writeback_dquots(struct super_if (!sb_has_quota_active (sb, cnt))continue ;spin_lock (&dq_list_lock); - dirty = &dqopt->info[cnt].dqi_dirty_list; -while (!list_empty (dirty)) { - dquot = list_first_entry(dirty, struct dquot, +/* Move list away to avoid livelock. */ +list_replace_init (&dqopt->info[cnt].dqi_dirty_list, &dirty); +while (!list_empty (&dirty)) { + dquot = list_first_entry(&dirty, struct dquot, dq_dirty);/* Dirty and inactive can be only bad dquot... */ if (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) {
Greg Kroah-Hartman
maintainerPATCH 148/199 usb: xhci: only set D3hot for pci device
In reply to Greg Kroah-HartmanFrom: Henry Lin <[email protected]>
[ Upstream commit f2c710f7dca8457e88b4ac9de2060f011254f9dd ]
Xhci driver cannot call pci_set_power_state() on non-pci xhci host controllers. For example, NVIDIA Tegra XHCI host controller which acts as platform device with XHCI_SPURIOUS_WAKEUP quirk set in some platform hits this issue during shutdown.
--- drivers/usb/host/xhci-pci.c | 13 +++++++++++++ drivers/usb/host/xhci.c | 5 +---- drivers/usb/host/xhci.h | 1 + 3 files changed, 15 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-pci.c +13 -0
@@ -470,6 +470,18 @@ static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated) }#endif /* CONFIG_PM */ +static void xhci_pci_shutdown (struct usb_hcd *hcd) +{ +struct xhci_hcd *xhci =hcd_to_xhci (hcd); +struct pci_dev *pdev =to_pci_dev (hcd->self.controller); + +xhci_shutdown (hcd); + +/* Yet another workaround for spurious wakeups at shutdown with HSW */ +if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) +pci_set_power_state (pdev, PCI_D3hot); +} +/*-------------------------------------------------------------------------*/ /* PCI driver selection metadata; PCI hotplugging uses this */
@@ -505,6 +517,7 @@ static int __init xhci_pci_init(void)#ifdef CONFIG_PM xhci_pci_hc_driver.pci_suspend = xhci_pci_suspend; xhci_pci_hc_driver.pci_resume = xhci_pci_resume; + xhci_pci_hc_driver.shutdown = xhci_pci_shutdown;#endif return pci_register_driver (&xhci_pci_driver); }
drivers/usb/host/xhci.c +1 -4
@@ -758,11 +758,8 @@ void xhci_shutdown(struct usb_hcd *hcd)xhci_dbg_trace (xhci, trace_xhci_dbg_init,"xhci_shutdown completed - status = %x" ,readl (&xhci->op_regs->status)); - -/* Yet another workaround for spurious wakeups at shutdown with HSW */ -if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) -pci_set_power_state (to_pci_dev (hcd->self.controller), PCI_D3hot); } +EXPORT_SYMBOL_GPL (xhci_shutdown);#ifdef CONFIG_PM static void xhci_save_registers (struct xhci_hcd *xhci)
drivers/usb/host/xhci.h +1 -0
@@ -1865,6 +1865,7 @@ int xhci_run(struct usb_hcd *hcd);void xhci_stop (struct usb_hcd *hcd);void xhci_shutdown (struct usb_hcd *hcd);int xhci_gen_setup (struct usb_hcd *hcd,xhci_get_quirks_t get_quirks); +void xhci_shutdown (struct usb_hcd *hcd);void xhci_init_driver (struct hc_driver *drv,const struct xhci_driver_overrides *over);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/199 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB
In reply to Greg Kroah-HartmanFrom: Alastair D'Silva <[email protected]>
commit f9ec11165301982585e5e5f606739b5bae5331f3 upstream.
When calling __kernel_sync_dicache with a size >4GB, we were masking off the upper 32 bits, so we would incorrectly flush a range smaller than intended.
This patch replaces the 32 bit shifts with 64 bit ones, so that the full size is accounted for.
--- arch/powerpc/kernel/vdso64/cacheflush.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/vdso64/cacheflush.S +2 -2
@@ -39,7 +39,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ lwz r9,CFG_DCACHE_LOGBLOCKSZ(r10) - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ crclr cr0*4+so beqlr /* nothing to do? */ mtctr r8
@@ -56,7 +56,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) subf r8,r6,r4 /* compute length */ add r8,r8,r5 lwz r9,CFG_ICACHE_LOGBLOCKSZ(r10) - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ crclr cr0*4+so beqlr /* nothing to do? */ mtctr r8
Greg Kroah-Hartman
maintainerPATCH 122/199 rtlwifi: rtl8192de: Fix missing enable interrupt flag
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit 330bb7117101099c687e9c7f13d48068670b9c62 upstream.
In commit 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers"), the flag that indicates that interrupts are enabled was never set.
In addition, there are several places when enable/disable interrupts were commented out are restored. A sychronize_interrupts() call is removed.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c +5 -4
@@ -1209,6 +1209,7 @@ void rtl92de_enable_interrupt(struct ieertl_write_dword (rtlpriv,REG_HIMR , rtlpci->irq_mask[0 ] &0xFFFFFFFF );rtl_write_dword (rtlpriv,REG_HIMRE , rtlpci->irq_mask[1 ] &0xFFFFFFFF ); + rtlpci->irq_enabled = true; }void rtl92de_disable_interrupt (struct ieee80211_hw *hw)
@@ -1218,7 +1219,7 @@ void rtl92de_disable_interrupt(struct iertl_write_dword (rtlpriv,REG_HIMR ,IMR8190_DISABLED );rtl_write_dword (rtlpriv,REG_HIMRE ,IMR8190_DISABLED ); -synchronize_irq (rtlpci->pdev->irq); + rtlpci->irq_enabled = false; }static void _rtl92de_poweroff_adapter (struct ieee80211_hw *hw)
@@ -1389,7 +1390,7 @@ void rtl92de_set_beacon_related_register bcn_interval = mac->beacon_interval; atim_window =2 ; -/*rtl92de_disable_interrupt(hw); */ +rtl92de_disable_interrupt (hw);rtl_write_word (rtlpriv,REG_ATIMWND , atim_window);rtl_write_word (rtlpriv,REG_BCN_INTERVAL , bcn_interval);rtl_write_word (rtlpriv,REG_BCNTCFG ,0x660f );
@@ -1409,9 +1410,9 @@ void rtl92de_set_beacon_interval(structRT_TRACE (rtlpriv,COMP_BEACON ,DBG_DMESG ,"beacon_interval:%d\n" , bcn_interval); -/* rtl92de_disable_interrupt(hw); */ +rtl92de_disable_interrupt (hw);rtl_write_word (rtlpriv,REG_BCN_INTERVAL , bcn_interval); -/* rtl92de_enable_interrupt(hw); */ +rtl92de_enable_interrupt (hw); } void rtl92de_update_interrupt_mask(struct ieee80211_hw *hw,
Greg Kroah-Hartman
maintainerPATCH 138/199 pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 6fbbcb050802d6ea109f387e961b1dbcc3a80c96 upstream.
In s3c24xx_eint_init() the for_each_child_of_node() loop is used with a break to find a matching child node. Although each iteration of for_each_child_of_node puts the previous node, but early exit from loop misses it. This leads to leak of device node.
--- drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pinctrl/samsung/pinctrl-s3c24xx.c +5 -1
@@ -495,8 +495,10 @@ static int s3c24xx_eint_init(struct samsreturn -ENODEV ; eint_data =devm_kzalloc (dev,sizeof (*eint_data),GFP_KERNEL ); -if (!eint_data) +if (!eint_data) { +of_node_put (eint_np);return -ENOMEM ; + } eint_data->drvdata = d;
@@ -508,12 +510,14 @@ static int s3c24xx_eint_init(struct sams irq =irq_of_parse_and_map (eint_np, i);if (!irq) {dev_err (dev,"failed to get wakeup EINT IRQ %d\n" , i); +of_node_put (eint_np);return -ENXIO ; } eint_data->parents[i] = irq;irq_set_chained_handler_and_data (irq, handlers[i], eint_data); } +of_node_put (eint_np); bank = d->pin_banks;for (i =0 ; i < d->nr_banks; ++i, ++bank) {
Greg Kroah-Hartman
maintainerPATCH 134/199 PM / devfreq: Lock devfreq in trans_stat_show
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
commit 2abb0d5268ae7b5ddf82099b1f8d5aa8414637d4 upstream.
There is no locking in this sysfs show function so stats printing can race with a devfreq_update_status called as part of freq switching or with initialization.
Also add an assert in devfreq_update_status to make it clear that lock must be held by caller.
--- drivers/devfreq/devfreq.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/devfreq/devfreq.c +9 -3
@@ -135,6 +135,7 @@ int devfreq_update_status(struct devfreqint lev, prev_lev, ret =0 ;unsigned long cur_time; +lockdep_assert_held (&devfreq->lock); cur_time = jiffies;/* Immediately exit if previous_freq is not initialized yet. */
@@ -1170,12 +1171,17 @@ static ssize_t trans_stat_show(struct deint i, j;unsigned int max_state = devfreq->profile->max_state; -if (!devfreq->stop_polling && -devfreq_update_status (devfreq, devfreq->previous_freq)) -return 0 ;if (max_state ==0 )return sprintf (buf,"Not Supported.\n" ); +mutex_lock (&devfreq->lock); +if (!devfreq->stop_polling && +devfreq_update_status (devfreq, devfreq->previous_freq)) { +mutex_unlock (&devfreq->lock); +return 0 ; + } +mutex_unlock (&devfreq->lock); + len =sprintf (buf," From : To\n" ); len +=sprintf (buf + len," :" );for (i =0 ; i < max_state; i++)
Greg Kroah-Hartman
maintainerPATCH 132/199 media: radio: wl1273: fix interrupt masking on release
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 1091eb830627625dcf79958d99353c2391f41708 upstream.
If a process is interrupted while accessing the radio device and the core lock is contended, release() could return early and fail to update the interrupt mask.
Note that the return value of the v4l2 release file operation is ignored.
--- drivers/media/radio/radio-wl1273.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/radio/radio-wl1273.c +1 -2
@@ -1149,8 +1149,7 @@ static int wl1273_fm_fops_release(structif (radio->rds_users >0 ) { radio->rds_users--;if (radio->rds_users ==0 ) { -if (mutex_lock_interruptible (&core->lock)) -return -EINTR ; +mutex_lock (&core->lock); radio->irq_flags &= ~WL1273_RDS_EVENT ;
Greg Kroah-Hartman
maintainerPATCH 131/199 media: bdisp: fix memleak on release
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 11609a7e21f8cea42630350aa57662928fa4dc63 upstream.
If a process is interrupted while accessing the video device and the device lock is contended, release() could return early and fail to free related resources.
Note that the return value of the v4l2 release file operation is ignored.
--- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/platform/sti/bdisp/bdisp-v4l2.c +1 -2
@@ -651,8 +651,7 @@ static int bdisp_release(struct file *fidev_dbg (bdisp->dev,"%s\n" , __func__); -if (mutex_lock_interruptible (&bdisp->lock)) -return -ERESTARTSYS ; +mutex_lock (&bdisp->lock);v4l2_m2m_ctx_release (ctx->fh.m2m_ctx);