4.14.172-stable review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 124/237 arm64: fix alternatives with LLVMs integrated assembler
In reply to Greg Kroah-HartmanFrom: Sami Tolvanen <[email protected]>
[ Upstream commit c54f90c2627cc316d365e3073614731e17dbc631 ]
LLVM's integrated assembler fails with the following error when building KVM:
<inline asm>:12:6: error: expected absolute expression
.if kvm_update_va_mask == 0
^
<inline asm>:21:6: error: expected absolute expression
.if kvm_update_va_mask == 0
^
<inline asm>:24:2: error: unrecognized instruction mnemonic
NOT_AN_INSTRUCTION
^LLVM ERROR: Error parsing inline asm
These errors come from ALTERNATIVE_CB and __ALTERNATIVE_CFG, which test for the existence of the callback parameter in inline assembly using the following expression:
" .if " __stringify(cb) " == 0\n"
This works with GNU as, but isn't supported by LLVM. This change splits __ALTERNATIVE_CFG and ALTINSTR_ENTRY into separate macros to fix the LLVM build.
--- arch/arm64/include/asm/alternative.h | 32 ++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-)
arch/arm64/include/asm/alternative.h +21 -11
@@ -30,13 +30,16 @@ typedef void (*alternative_cb_t)(struct alt_instr *alt,void __init apply_alternatives_all (void );void apply_alternatives (void *start,size_t length); -#define ALTINSTR_ENTRY (feature,cb) \ +#define ALTINSTR_ENTRY (feature) \ " .word 661b - .\n"/* label */ \ - " .if " __stringify(cb) " == 0\n" \" .word 663f - .\n" /* new instruction */ \ -" .else\n" \ + " .hword " __stringify(feature) "\n" /* feature bit */ \ +" .byte 662b-661b\n" /* source len */ \ + " .byte 664f-663f\n" /* replacement len */ + +#define ALTINSTR_ENTRY_CB (feature, cb) \ + " .word 661b - .\n"/* label */ \ " .word " __stringify(cb) "- .\n" /* callback */ \ -" .endif\n" \ " .hword " __stringify(feature) "\n" /* feature bit */ \" .byte 662b-661b\n" /* source len */ \" .byte 664f-663f\n" /* replacement len */
@@ -57,15 +60,14 @@ void apply_alternatives(void *start, size_t length);* * Alternatives with callbacks do not generate replacement instructions. */ -#define __ALTERNATIVE_CFG (oldinstr, newinstr, feature, cfg_enabled, cb) \ +#define __ALTERNATIVE_CFG (oldinstr, newinstr, feature, cfg_enabled) \ ".if "__stringify(cfg_enabled)" == 1\n" \ "661:\n\t" \ oldinstr "\n" \ "662:\n" \ ".pushsection .altinstructions,\"a\"\n" \ - ALTINSTR_ENTRY(feature,cb) \ + ALTINSTR_ENTRY(feature) \ ".popsection\n" \ - " .if " __stringify(cb) " == 0\n" \ ".pushsection .altinstr_replacement, \"a\"\n" \ "663:\n\t" \ newinstr "\n" \
@@ -73,17 +75,25 @@ void apply_alternatives(void *start, size_t length);".popsection\n\t" \".org . - (664b-663b) + (662b-661b)\n\t" \".org . - (662b-661b) + (664b-663b)\n" \ -".else\n\t" \ + ".endif\n" + +#define __ALTERNATIVE_CFG_CB (oldinstr, feature, cfg_enabled, cb) \ + ".if "__stringify(cfg_enabled)" == 1\n" \ + "661:\n\t" \ + oldinstr "\n" \ + "662:\n" \ + ".pushsection .altinstructions,\"a\"\n" \ + ALTINSTR_ENTRY_CB(feature, cb) \ + ".popsection\n" \ "663:\n\t" \ "664:\n\t" \ -".endif\n" \ ".endif\n"#define _ALTERNATIVE_CFG (oldinstr, newinstr, feature, cfg, ...) \ - __ALTERNATIVE_CFG(oldinstr, newinstr, feature, IS_ENABLED(cfg), 0) + __ALTERNATIVE_CFG(oldinstr, newinstr, feature, IS_ENABLED(cfg))#define ALTERNATIVE_CB (oldinstr, cb) \ - __ALTERNATIVE_CFG(oldinstr, "NOT_AN_INSTRUCTION", ARM64_CB_PATCH, 1, cb) + __ALTERNATIVE_CFG_CB(oldinstr, ARM64_CB_PATCH, 1, cb)#else #include <asm/assembler.h>
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/237 watchdog/softlockup: Enforce that timestamp is valid on boot
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 11e31f608b499f044f24b20be73f1dcab3e43f8a ]
Robert reported that during boot the watchdog timestamp is set to 0 for one second which is the indicator for a watchdog reset.
The reason for this is that the timestamp is in seconds and the time is taken from sched clock and divided by ~1e9. sched clock starts at 0 which means that for the first second during boot the watchdog timestamp is 0, i.e. reset.
Use ULONG_MAX as the reset indicator value so the watchdog works correctly right from the start. ULONG_MAX would only conflict with a real timestamp if the system reaches an uptime of 136 years on 32bit and almost eternity on 64bit.
--- kernel/watchdog.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/watchdog.c +6 -4
@@ -164,6 +164,8 @@ static void lockup_detector_update_enable(void)#ifdef CONFIG_SOFTLOCKUP_DETECTOR +#define SOFTLOCKUP_RESET ULONG_MAX +/* Global variables, exported for sysctl */ unsigned int __read_mostly softlockup_panic =CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE ;
@@ -271,7 +273,7 @@ notrace void touch_softlockup_watchdog_sched(void)* Preemption can be enabled. It doesn't matter which CPU's timestamp * gets zeroed here, so use the raw_ operation. */ -raw_cpu_write (watchdog_touch_ts,0 ); +raw_cpu_write (watchdog_touch_ts,SOFTLOCKUP_RESET ); } notrace void touch_softlockup_watchdog(void)
@@ -295,14 +297,14 @@ void touch_all_softlockup_watchdogs(void)* the softlockup check. */ for_each_cpu (cpu, &watchdog_allowed_mask) -per_cpu (watchdog_touch_ts, cpu) =0 ; +per_cpu (watchdog_touch_ts, cpu) =SOFTLOCKUP_RESET ;wq_watchdog_touch (-1 ); }void touch_softlockup_watchdog_sync (void ) {__this_cpu_write (softlockup_touch_sync, true); -__this_cpu_write (watchdog_touch_ts,0 ); +__this_cpu_write (watchdog_touch_ts,SOFTLOCKUP_RESET ); }static int is_softlockup (unsigned long touch_ts)
@@ -354,7 +356,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)/* .. and repeat */ hrtimer_forward_now (hrtimer,ns_to_ktime (sample_period)); -if (touch_ts ==0 ) { +if (touch_ts ==SOFTLOCKUP_RESET ) {if (unlikely (__this_cpu_read (softlockup_touch_sync))) {/* * If the time stamp was touched atomically
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/237 f2fs: fix memleak of kobject
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit fe396ad8e7526f059f7b8c7290d33a1b84adacab ]
If kobject_init_and_add() failed, caller needs to invoke kobject_put() to release kobject explicitly.
--- fs/f2fs/sysfs.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
fs/f2fs/sysfs.c +8 -3
@@ -507,10 +507,12 @@ int __init f2fs_init_sysfs(void) ret =kobject_init_and_add (&f2fs_feat, &f2fs_feat_ktype,NULL ,"features" ); -if (ret) +if (ret) { +kobject_put (&f2fs_feat);kset_unregister (&f2fs_kset); -else + }else { f2fs_proc_root =proc_mkdir ("fs/f2fs" ,NULL ); + }return ret; }
@@ -531,8 +533,11 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi)init_completion (&sbi->s_kobj_unregister); err =kobject_init_and_add (&sbi->s_kobj, &f2fs_sb_ktype,NULL ,"%s" , sb->s_id); -if (err) +if (err) { +kobject_put (&sbi->s_kobj); +wait_for_completion (&sbi->s_kobj_unregister);return err; + }if (f2fs_proc_root) sbi->s_proc =proc_mkdir (sb->s_id, f2fs_proc_root);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/237 x86/mm: Fix NX bit clearing issue in kernel_map_pages_in_pgd
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 75fbef0a8b6b4bb19b9a91b5214f846c2dc5139e ]
The following commit:
15f003d20782 ("x86/mm/pat: Don't implicitly allow _PAGE_RW in kernel_map_pages_in_pgd()")
modified kernel_map_pages_in_pgd() to manage writable permissions of memory mappings in the EFI page table in a different way, but in the process, it removed the ability to clear NX attributes from read-only mappings, by clobbering the clear mask if _PAGE_RW is not being requested.
Failure to remove the NX attribute from read-only mappings is unlikely to be a security issue, but it does prevent us from tightening the permissions in the EFI page tables going forward, so let's fix it now.
--- arch/x86/mm/pageattr.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
arch/x86/mm/pageattr.c +1 -7
@@ -2077,19 +2077,13 @@ int kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn, unsigned long address, .pgd = pgd, .numpages = numpages, .mask_set = __pgprot(0), - .mask_clr = __pgprot(0), + .mask_clr = __pgprot(~page_flags & (_PAGE_NX|_PAGE_RW)), .flags = 0, };if (!(__supported_pte_mask & _PAGE_NX)) goto out; -if (!(page_flags & _PAGE_NX)) - cpa.mask_clr =__pgprot (_PAGE_NX); - -if (!(page_flags & _PAGE_RW)) - cpa.mask_clr =__pgprot (_PAGE_RW); -if (!(page_flags & _PAGE_ENC)) cpa.mask_clr =pgprot_encrypted (cpa.mask_clr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/237 pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 43efdc8f0e6d7088ec61bd55a73bf853f002d043 ]
In the old code (e.g.) mutex_destroy() was called before pwmchip_remove(). Between these two calls it is possible that a PWM callback is used which tries to grab the mutex.
--- drivers/pwm/pwm-omap-dmtimer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/pwm/pwm-omap-dmtimer.c +6 -1
@@ -337,6 +337,11 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)static int pwm_omap_dmtimer_remove (struct platform_device *pdev) {struct pwm_omap_dmtimer_chip *omap =platform_get_drvdata (pdev); +int ret; + + ret =pwmchip_remove (&omap->chip); +if (ret) +return ret;if (pm_runtime_active (&omap->dm_timer_pdev->dev)) omap->pdata->stop (omap->dm_timer);
@@ -345,7 +350,7 @@ static int pwm_omap_dmtimer_remove(struct platform_device *pdev)mutex_destroy (&omap->mutex); -return pwmchip_remove (&omap->chip); +return 0 ; }static const struct of_device_id pwm_omap_dmtimer_of_match[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/237 cmd64x: potential buffer overflow in cmd64x_program_timings()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 117fcc3053606d8db5cef8821dca15022ae578bb ]
The "drive->dn" value is a u8 and it is controlled by root only, but it could be out of bounds here so let's check.
--- drivers/ide/cmd64x.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ide/cmd64x.c +3 -0
@@ -65,6 +65,9 @@ static void cmd64x_program_timings(ide_drive_t *drive, u8 mode)struct ide_timing t;u8 arttim =0 ; +if (drive->dn >=ARRAY_SIZE (drwtim_regs)) +return ; +ide_timing_compute (drive, mode, &t,T ,0 );/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/237 ide: serverworks: potential overflow in svwks_set_pio_mode()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit ce1f31b4c0b9551dd51874dd5364654ed4ca13ae ]
The "drive->dn" variable is a u8 controlled by root.
--- drivers/ide/serverworks.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/ide/serverworks.c +6 -0
@@ -114,6 +114,9 @@ static void svwks_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)struct pci_dev *dev =to_pci_dev (hwif->dev);const u8 pio = drive->pio_mode -XFER_PIO_0 ; +if (drive->dn >=ARRAY_SIZE (drive_pci)) +return ; +pci_write_config_byte (dev, drive_pci[drive->dn], pio_modes[pio]);if (svwks_csb_check (dev)) {
@@ -140,6 +143,9 @@ static void svwks_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)u8 ultra_enable =0 , ultra_timing =0 , dma_timing =0 ; +if (drive->dn >=ARRAY_SIZE (drive_pci2)) +return ; +pci_read_config_byte (dev, (0x56 |hwif->channel), &ultra_timing);pci_read_config_byte (dev,0x54 , &ultra_enable);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/237 pwm: Remove set but not set variable pwm
In reply to Greg Kroah-HartmanFrom: yu kuai <[email protected]>
[ Upstream commit 9871abffc81048e20f02e15d6aa4558a44ad53ea ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/pwm/pwm-pca9685.c: In function ‘pca9685_pwm_gpio_free’: drivers/pwm/pwm-pca9685.c:162:21: warning: variable ‘pwm’ set but not used [-Wunused-but-set-variable]
It is never used, and so can be removed. In that case, hold and release the lock 'pca->lock' can be removed since nothing will be done between them.
--- drivers/pwm/pwm-pca9685.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/pwm/pwm-pca9685.c +0 -4
@@ -170,13 +170,9 @@ static void pca9685_pwm_gpio_set(struct gpio_chip *gpio, unsigned int offset,static void pca9685_pwm_gpio_free (struct gpio_chip *gpio,unsigned int offset) {struct pca9685 *pca =gpiochip_get_data (gpio); -struct pwm_device *pwm;pca9685_pwm_gpio_set (gpio, offset,0 );pm_runtime_put (pca->chip.dev); -mutex_lock (&pca->lock); - pwm = &pca->chip.pwms[offset]; -mutex_unlock (&pca->lock); } static int pca9685_pwm_gpio_get_direction(struct gpio_chip *chip,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 132/237 btrfs: fix possible NULL-pointer dereference in integrity checks
In reply to Greg Kroah-HartmanFrom: Johannes Thumshirn <[email protected]>
[ Upstream commit 3dbd351df42109902fbcebf27104149226a4fcd9 ]
A user reports a possible NULL-pointer dereference in btrfsic_process_superblock(). We are assigning state->fs_info to a local fs_info variable and afterwards checking for the presence of state.
While we would BUG_ON() a NULL state anyways, we can also just remove the local fs_info copy, as fs_info is only used once as the first argument for btrfs_num_copies(). There we can just pass in state->fs_info as well.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=205003
--- fs/btrfs/check-integrity.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/btrfs/check-integrity.c +1 -2
@@ -642,7 +642,6 @@ static struct btrfsic_dev_state *btrfsic_dev_state_hashtable_lookup(dev_t dev,static int btrfsic_process_superblock (struct btrfsic_state *state,struct btrfs_fs_devices *fs_devices) { -struct btrfs_fs_info *fs_info = state->fs_info;struct btrfs_super_block *selected_super;struct list_head *dev_head = &fs_devices->devices;struct btrfs_device *device;
@@ -713,7 +712,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,break ; } - num_copies =btrfs_num_copies (fs_info, next_bytenr, + num_copies =btrfs_num_copies (state->fs_info, next_bytenr, state->metablock_size);if (state->print_mask &BTRFSIC_PRINT_MASK_NUM_COPIES ) pr_info("num_copies(log_bytenr=%llu) = %d\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/237 btrfs: safely advance counter when looking up bio csums
In reply to Greg Kroah-HartmanFrom: David Sterba <[email protected]>
[ Upstream commit 4babad10198fa73fe73239d02c2e99e3333f5f5c ]
Dan's smatch tool reports
fs/btrfs/file-item.c:295 btrfs_lookup_bio_sums()
warn: should this be 'count == -1'
which points to the while (count--) loop. With count == 0 the check itself could decrement it to -1. There's a WARN_ON a few lines below that has never been seen in practice though.
It turns out that the value of page_bytes_left matches the count (by sectorsize multiples). The loop never reaches the state where count would go to -1, because page_bytes_left == 0 is found first and this breaks out.
For clarity, use only plain check on count (and only for positive value), decrement safely inside the loop. Any other discrepancy after the whole bio list processing should be reported by the exising WARN_ON_ONCE as well.
--- fs/btrfs/file-item.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/file-item.c +2 -1
@@ -288,7 +288,8 @@ found: csum += count * csum_size; nblocks -= count; next: -while (count--) { +while (count >0 ) { + count--; disk_bytenr += fs_info->sectorsize; offset += fs_info->sectorsize; page_bytes_left -= fs_info->sectorsize;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/237 btrfs: device stats, log when stats are zeroed
In reply to Greg Kroah-HartmanFrom: Anand Jain <[email protected]>
[ Upstream commit a69976bc69308aa475d0ba3b8b3efd1d013c0460 ]
We had a report indicating that some read errors aren't reported by the device stats in the userland. It is important to have the errors reported in the device stat as user land scripts might depend on it to take the reasonable corrective actions. But to debug these issue we need to be really sure that request to reset the device stat did not come from the userland itself. So log an info message when device error reset happens.
For example:
BTRFS info (device sdc): device stats zeroed by btrfs(9223)
--- fs/btrfs/volumes.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/volumes.c +2 -0
@@ -7227,6 +7227,8 @@ int btrfs_get_dev_stats(struct btrfs_fs_info *fs_info,else btrfs_dev_stat_reset (dev, i); } +btrfs_info (fs_info,"device stats zeroed by %s (%d)" , + current->comm,task_pid_nr (current)); }else {for (i =0 ; i <BTRFS_DEV_STAT_VALUES_MAX ; i++)if (stats->nr_items > i)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/237 remoteproc: Initialize rproc_class before use
In reply to Greg Kroah-HartmanFrom: Brandon Maier <[email protected]>
[ Upstream commit a8f40111d184098cd2b3dc0c7170c42250a5fa09 ]
The remoteproc_core and remoteproc drivers all initialize with module_init(). However remoteproc drivers need the rproc_class during their probe. If one of the remoteproc drivers runs init and gets through probe before remoteproc_init() runs, a NULL pointer access of rproc_class's glue_dirs spinlock occurs.
Quoted 16 lines
Unable to handle kernel NULL pointer dereference at virtual address 000000dc pgd = c0004000 [000000dc] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper Tainted: G W 4.14.106-rt56 #1 Hardware name: Generic OMAP36xx (Flattened Device Tree) task: c6050000 task.stack: c604a000 PC is at rt_spin_lock+0x40/0x6c LR is at rt_spin_lock+0x28/0x6c pc : [<c0523c90>] lr : [<c0523c78>] psr: 60000013sp :
c604bdc0ip : 00000000 fp : 00000000
r10: 00000000 r9 :c61c7c10r8 :c6269c20
r7 :c0905888r6 :c6269c20r5 : 00000000 r4 :000000d4r3 :000000dcr2 :c6050000r1 : 00000002 r0 :000000d4
Flags: nZCv IRQs on FIQs on ModeSVC_32ISA ARM Segment none
...
Quoted 14 lines
[<
c0523c90>] (rt_spin_lock) from [<c03b65a4>] (get_device_parent+0x54/0x17c) [<c03b65a4>] (get_device_parent) from [<c03b6bec>] (device_add+0xe0/0x5b4) [<c03b6bec>] (device_add) from [<c042adf4>] (rproc_add+0x18/0xd8) [<c042adf4>] (rproc_add) from [<c01110e4>] (my_rproc_probe+0x158/0x204) [<c01110e4>] (my_rproc_probe) from [<c03bb6b8>] (platform_drv_probe+0x34/0x70) [<c03bb6b8>] (platform_drv_probe) from [<c03b9dd4>] (driver_probe_device+0x2c8/0x420) [<c03b9dd4>] (driver_probe_device) from [<c03ba02c>] (__driver_attach+0x100/0x11c) [<c03ba02c>] (__driver_attach) from [<c03b7d08>] (bus_for_each_dev+0x7c/0xc0) [<c03b7d08>] (bus_for_each_dev) from [<c03b910c>] (bus_add_driver+0x1cc/0x264) [<c03b910c>] (bus_add_driver) from [<c03ba714>] (driver_register+0x78/0xf8) [<c03ba714>] (driver_register) from [<c010181c>] (do_one_initcall+0x100/0x190) [<c010181c>] (do_one_initcall) from [<c0800de8>] (kernel_init_freeable+0x130/0x1d0) [<c0800de8>] (kernel_init_freeable) from [<c051eee8>] (kernel_init+0x8/0x114) [<c051eee8>] (kernel_init) from [<c01175b0>] (ret_from_fork+0x14/0x24)
Quoted 2 lines
Code: e2843008 e3c2203f f5d3f000 e5922010 (e193cf9f) ---[ end trace 0000000000000002 ]---
--- drivers/remoteproc/remoteproc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/remoteproc/remoteproc_core.c +1 -1
@@ -1620,7 +1620,7 @@ static int __init remoteproc_init(void)return 0 ; } -module_init (remoteproc_init); +subsys_initcall (remoteproc_init); static void __exit remoteproc_exit(void) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/237 irqchip/mbigen: Set driver .suppress_bind_attrs to avoid remove problems
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
[ Upstream commit d6152e6ec9e2171280436f7b31a571509b9287e1 ]
The following crash can be seen for setting CONFIG_DEBUG_TEST_DRIVER_REMOVE=y for DT FW (which some people still use):
Hisilicon MBIGEN-V2 60080000.interrupt-controller: Failed to create mbi-gen irqdomain Hisilicon MBIGEN-V2: probe of 60080000.interrupt-controller failed with error -12
[...]
Unable to handle kernel paging request at virtual address 0000000000005008 Mem abort info: ESR = 0x96000004 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 Data abort info: ISV = 0, ISS = 0x00000004 CM = 0, WnR = 0 user pgtable: 4k pages, 48-bit VAs, pgdp=0000041fb9990000 [0000000000005008] pgd=0000000000000000 Internal error: Oops: 96000004 [#1] PREEMPT SMP Modules linked in: CPU: 7 PID: 1 Comm: swapper/0 Not tainted 5.5.0-rc6-00002-g3fc42638a506-dirty #1622 Hardware name: Huawei Taishan 2280 /D05, BIOS Hisilicon D05 IT21 Nemo 2.0 RC0 04/18/2018 pstate: 40000085 (nZcv daIf -PAN -UAO) pc : mbigen_set_type+0x38/0x60 lr : __irq_set_trigger+0x6c/0x188 sp : ffff800014b4b400 x29: ffff800014b4b400 x28: 0000000000000007 x27: 0000000000000000 x26: 0000000000000000 x25: ffff041fd83bd0d4 x24: ffff041fd83bd188 x23: 0000000000000000 x22: ffff80001193ce00 x21: 0000000000000004 x20: 0000000000000000 x19: ffff041fd83bd000 x18: ffffffffffffffff x17: 0000000000000000 x16: 0000000000000000 x15: ffff8000119098c8 x14: ffff041fb94ec91c x13: ffff041fb94ec1a1 x12: 0000000000000030 x11: 0101010101010101 x10: 0000000000000040 x9 : 0000000000000000 x8 : ffff041fb98c6680 x7 : ffff800014b4b380 x6 : ffff041fd81636c8 x5 : 0000000000000000 x4 : 000000000000025f x3 : 0000000000005000 x2 : 0000000000005008 x1 : 0000000000000004 x0 : 0000000080000000 Call trace: mbigen_set_type+0x38/0x60 __setup_irq+0x744/0x900 request_threaded_irq+0xe0/0x198 pcie_pme_probe+0x98/0x118 pcie_port_probe_service+0x38/0x78 really_probe+0xa0/0x3e0 driver_probe_device+0x58/0x100 __device_attach_driver+0x90/0xb0 bus_for_each_drv+0x64/0xc8 __device_attach+0xd8/0x138 device_initial_probe+0x10/0x18 bus_probe_device+0x90/0x98 device_add+0x4c4/0x770 device_register+0x1c/0x28 pcie_port_device_register+0x1e4/0x4f0 pcie_portdrv_probe+0x34/0xd8 local_pci_probe+0x3c/0xa0 pci_device_probe+0x128/0x1c0 really_probe+0xa0/0x3e0 driver_probe_device+0x58/0x100 __device_attach_driver+0x90/0xb0 bus_for_each_drv+0x64/0xc8 __device_attach+0xd8/0x138 device_attach+0x10/0x18 pci_bus_add_device+0x4c/0xb8 pci_bus_add_devices+0x38/0x88 pci_host_probe+0x3c/0xc0 pci_host_common_probe+0xf0/0x208 hisi_pcie_almost_ecam_probe+0x24/0x30 platform_drv_probe+0x50/0xa0 really_probe+0xa0/0x3e0 driver_probe_device+0x58/0x100 device_driver_attach+0x6c/0x90 __driver_attach+0x84/0xc8 bus_for_each_dev+0x74/0xc8 driver_attach+0x20/0x28 bus_add_driver+0x148/0x1f0 driver_register+0x60/0x110 __platform_driver_register+0x40/0x48 hisi_pcie_almost_ecam_driver_init+0x1c/0x24
The specific problem here is that the mbigen driver real probe has failed as the mbigen_of_create_domain()->of_platform_device_create() call fails, the reason for that being that we never destroyed the platform device created during the remove test dry run and there is some conflict.
Since we generally would never want to unbind this driver, and to save adding a driver tear down path for that, just set the driver .suppress_bind_attrs member to avoid this possibility.
--- drivers/irqchip/irq-mbigen.c | 1 + 1 file changed, 1 insertion(+)
drivers/irqchip/irq-mbigen.c +1 -0
@@ -381,6 +381,7 @@ static struct platform_driver mbigen_platform_driver = { .name = "Hisilicon MBIGEN-V2", .of_match_table = mbigen_of_match, .acpi_match_table = ACPI_PTR(mbigen_acpi_match), + .suppress_bind_attrs = true, }, .probe = mbigen_device_probe, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/237 ALSA: hda/hdmi - add retry logic to parse_intel_hdmi()
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit 2928fa0a97ebb9549cb877fdc99aed9b95438c3a ]
The initial snd_hda_get_sub_node() can fail on certain devices (e.g. some Chromebook models using Intel GLK). The failure rate is very low, but as this is is part of the probe process, end-user impact is high.
In observed cases, related hardware status registers have expected values, but the node query still fails. Retrying the node query does seem to help, so fix the problem by adding retry logic to the query. This does not impact non-Intel platforms.
--- sound/pci/hda/patch_hdmi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/pci/hda/patch_hdmi.c +5 -2
@@ -2574,9 +2574,12 @@ static int alloc_intel_hdmi(struct hda_codec *codec)/* parse and post-process for Intel codecs */ static int parse_intel_hdmi (struct hda_codec *codec) { -int err; +int err, retries =3 ; + +do { + err =hdmi_parse_codec (codec); + }while (err <0 && retries--); - err =hdmi_parse_codec (codec);if (err <0 ) {generic_spec_free (codec);return err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/237 x86/decoder: Add TEST opcode to Group3-2
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 8b7e20a7ba54836076ff35a28349dabea4cec48f ]
Add TEST opcode to Group3-2 reg=001b as same as Group3-1 does.
Commit
12a78d43de76 ("x86/decoder: Add new TEST instruction pattern")
added a TEST opcode assignment to f6 XX/001/XXX (Group 3-1), but did not add f7 XX/001/XXX (Group 3-2).
Actually, this TEST opcode variant (ModRM.reg /1) is not described in the Intel SDM Vol2 but in AMD64 Architecture Programmer's Manual Vol.3, Appendix A.2 Table A-6. ModRM.reg Extensions for the Primary Opcode Map.
Without this fix, Randy found a warning by insn_decoder_test related to this issue as below.
HOSTCC arch/x86/tools/insn_decoder_test
HOSTCC arch/x86/tools/insn_sanity
TEST posttest arch/x86/tools/insn_decoder_test: warning: Found an x86 instruction decoder bug, please report this.
arch/x86/tools/insn_decoder_test: warning: ffffffff81000bf1: f7 0b 00 01 08 00 testl $0x80100,(%rbx)
arch/x86/tools/insn_decoder_test: warning: objdump says 6 bytes, but insn_get_length() says 2 arch/x86/tools/insn_decoder_test: warning: Decoded and checked 11913894 instructions with 1 failures
TEST posttest
arch/x86/tools/insn_sanity: Success: decoded and checked 1000000 random instructions with 0 errors (seed:0x871ce29c)
To fix this error, add the TEST opcode according to AMD64 APM Vol.3.
[ bp: Massage commit message. ]
--- arch/x86/lib/x86-opcode-map.txt | 2 +- tools/objtool/arch/x86/lib/x86-opcode-map.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/lib/x86-opcode-map.txt +1 -1
@@ -909,7 +909,7 @@ EndTable GrpTable: Grp3_2 0: TEST Ev,Iz -1: +1: TEST Ev,Iz 2: NOT Ev 3: NEG Ev 4: MUL rAX,Ev
tools/objtool/arch/x86/lib/x86-opcode-map.txt +1 -1
@@ -909,7 +909,7 @@ EndTable GrpTable: Grp3_2 0: TEST Ev,Iz -1: +1: TEST Ev,Iz 2: NOT Ev 3: NEG Ev 4: MUL rAX,Ev
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/237 s390/ftrace: generate traced function stack frame
In reply to Greg Kroah-HartmanFrom: Vasily Gorbik <[email protected]>
[ Upstream commit 45f7a0da600d3c409b5ad8d5ddddacd98ddc8840 ]
Currently backtrace from ftraced function does not contain ftraced function itself. e.g. for "path_openat":
arch_stack_walk+0x15c/0x2d8 stack_trace_save+0x50/0x68 stack_trace_call+0x15e/0x3d8 ftrace_graph_caller+0x0/0x1c <-- ftrace code do_filp_open+0x7c/0xe8 <-- ftraced function caller do_open_execat+0x76/0x1b8 open_exec+0x52/0x78 load_elf_binary+0x180/0x1160 search_binary_handler+0x8e/0x288 load_script+0x2a8/0x2b8 search_binary_handler+0x8e/0x288 __do_execve_file.isra.39+0x6fa/0xb40 __s390x_sys_execve+0x56/0x68 system_call+0xdc/0x2d8
Ftraced function is expected in the backtrace by ftrace kselftests, which are now failing. It would also be nice to have it for clarity reasons.
"ftrace_caller" itself is called without stack frame allocated for it and does not store its caller (ftraced function). Instead it simply allocates a stack frame for "ftrace_trace_function" and sets backchain to point to ftraced function stack frame (which contains ftraced function caller in saved r14).
To fix this issue make "ftrace_caller" allocate a stack frame for itself just to store ftraced function for the stack unwinder. As a result backtrace looks like the following:
arch_stack_walk+0x15c/0x2d8 stack_trace_save+0x50/0x68 stack_trace_call+0x15e/0x3d8 ftrace_graph_caller+0x0/0x1c <-- ftrace code path_openat+0x6/0xd60 <-- ftraced function do_filp_open+0x7c/0xe8 <-- ftraced function caller do_open_execat+0x76/0x1b8 open_exec+0x52/0x78 load_elf_binary+0x180/0x1160 search_binary_handler+0x8e/0x288 load_script+0x2a8/0x2b8 search_binary_handler+0x8e/0x288 __do_execve_file.isra.39+0x6fa/0xb40 __s390x_sys_execve+0x56/0x68 system_call+0xdc/0x2d8
--- arch/s390/kernel/mcount.S | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
arch/s390/kernel/mcount.S +14 -1
@@ -25,6 +25,12 @@ ENTRY(ftrace_stub) #define STACK_PTREGS (STACK_FRAME_OVERHEAD) #define STACK_PTREGS_GPRS (STACK_PTREGS + __PT_GPRS) #define STACK_PTREGS_PSW (STACK_PTREGS + __PT_PSW) +#ifdef __PACK_STACK +/* allocate just enough for r14, r15 and backchain */ +#define TRACED_FUNC_FRAME_SIZE 24 +#else +#define TRACED_FUNC_FRAME_SIZE STACK_FRAME_OVERHEAD +#endif ENTRY(_mcount) BR_EX %r14
@@ -38,9 +44,16 @@ ENTRY(ftrace_caller) #ifndef CC_USING_HOTPATCH aghi %r0,MCOUNT_RETURN_FIXUP #endif - aghi %r15,-STACK_FRAME_SIZE + # allocate stack frame for ftrace_caller to contain traced function + aghi %r15,-TRACED_FUNC_FRAME_SIZE stg %r1,__SF_BACKCHAIN(%r15) + stg %r0,(__SF_GPRS+8*8)(%r15) + stg %r15,(__SF_GPRS+9*8)(%r15) + # allocate pt_regs and stack frame for ftrace_trace_function + aghi %r15,-STACK_FRAME_SIZE stg %r1,(STACK_PTREGS_GPRS+15*8)(%r15) + aghi %r1,-TRACED_FUNC_FRAME_SIZE + stg %r1,__SF_BACKCHAIN(%r15) stg %r0,(STACK_PTREGS_PSW+8)(%r15) stmg %r2,%r14,(STACK_PTREGS_GPRS+2*8)(%r15) #ifdef CONFIG_HAVE_MARCH_Z196_FEATURES
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/237 driver core: platform: fix u32 greater or equal to zero comparison
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 0707cfa5c3ef58effb143db9db6d6e20503f9dec ]
Currently the check that a u32 variable i is >= 0 is always true because the unsigned variable will never be negative, causing the loop to run forever. Fix this by changing the pre-decrement check to a zero check on i followed by a decrement of i.
Addresses-Coverity: ("Unsigned compared against 0")
--- drivers/base/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/platform.c +1 -1
@@ -428,7 +428,7 @@ int platform_device_add(struct platform_device *pdev) pdev->id =PLATFORM_DEVID_AUTO ; } -while (--i >=0 ) { +while (i--) {struct resource *r = &pdev->resource[i];if (r->parent)release_resource (r);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/237 ALSA: hda - Add docking station support for Lenovo Thinkpad T420s
In reply to Greg Kroah-HartmanFrom: Peter Große <[email protected]>
[ Upstream commit ef7d84caa5928b40b1c93a26dbe5a3f12737c6ab ]
Lenovo Thinkpad T420s uses the same codec as T420, so apply the same quirk to enable audio output on a docking station.
--- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_conexant.c +1 -0
@@ -969,6 +969,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {SND_PCI_QUIRK (0x17aa ,0x215f ,"Lenovo T510" ,CXT_PINCFG_LENOVO_TP410 ),SND_PCI_QUIRK (0x17aa ,0x21ce ,"Lenovo T420" ,CXT_PINCFG_LENOVO_TP410 ),SND_PCI_QUIRK (0x17aa ,0x21cf ,"Lenovo T520" ,CXT_PINCFG_LENOVO_TP410 ), +SND_PCI_QUIRK (0x17aa ,0x21d2 ,"Lenovo T420s" ,CXT_PINCFG_LENOVO_TP410 ),SND_PCI_QUIRK (0x17aa ,0x21da ,"Lenovo X220" ,CXT_PINCFG_LENOVO_TP410 ),SND_PCI_QUIRK (0x17aa ,0x21db ,"Lenovo X220-tablet" ,CXT_PINCFG_LENOVO_TP410 ), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo IdeaPad Z560", CXT_FIXUP_MUTE_LED_EAPD),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/237 powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV
In reply to Greg Kroah-HartmanFrom: Oliver O'Halloran <[email protected]>
[ Upstream commit 1fb4124ca9d456656a324f1ee29b7bf942f59ac8 ]
When disabling virtual functions on an SR-IOV adapter we currently do not correctly remove the EEH state for the now-dead virtual functions. When removing the pci_dn that was created for the VF when SR-IOV was enabled we free the corresponding eeh_dev without removing it from the child device list of the eeh_pe that contained it. This can result in crashes due to the use-after-free.
--- arch/powerpc/kernel/pci_dn.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
arch/powerpc/kernel/pci_dn.c +14 -1
@@ -261,9 +261,22 @@ void remove_dev_pci_data(struct pci_dev *pdev)continue ;#ifdef CONFIG_EEH -/* Release EEH device for the VF */ +/* +* Release EEH state for this VF. The PCI core +* has already torn down the pci_dev for this VF, but +* we're responsible to removing the eeh_dev since it +* has the same lifetime as the pci_dn that spawned it. +*/ edev =pdn_to_eeh_dev (pdn);if (edev) { +/* +* We allocate pci_dn's for the totalvfs count, +* but only only the vfs that were activated +* have a configured PE. +*/ +if (edev->pe) +eeh_rmv_from_parent_pe (edev); + pdn->edev =NULL ;kfree (edev); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 143/237 jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record
In reply to Greg Kroah-HartmanFrom: zhangyi (F) <[email protected]>
[ Upstream commit d0a186e0d3e7ac05cc77da7c157dae5aa59f95d9 ]
We invoke jbd2_journal_abort() to abort the journal and record errno in the jbd2 superblock when committing journal transaction besides the failure on submitting the commit record. But there is no need for the case and we can also invoke jbd2_journal_abort() instead of __jbd2_journal_abort_hard().
--- fs/jbd2/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/jbd2/commit.c +2 -2
@@ -783,7 +783,7 @@ start_journal_io: err =journal_submit_commit_record (journal, commit_transaction, &cbh, crc32_sum);if (err) -__jbd2_journal_abort_hard (journal); +jbd2_journal_abort (journal, err); }blk_finish_plug (&plug);
@@ -876,7 +876,7 @@ start_journal_io: err =journal_submit_commit_record (journal, commit_transaction, &cbh, crc32_sum);if (err) -__jbd2_journal_abort_hard (journal); +jbd2_journal_abort (journal, err); }if (cbh) err =journal_wait_on_commit_record (journal, cbh);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/237 jbd2: make sure ESHUTDOWN to be recorded in the journal superblock
In reply to Greg Kroah-HartmanFrom: zhangyi (F) <[email protected]>
[ Upstream commit 0e98c084a21177ef136149c6a293b3d1eb33ff92 ]
Commit fb7c02445c49 ("ext4: pass -ESHUTDOWN code to jbd2 layer") want to allow jbd2 layer to distinguish shutdown journal abort from other error cases. So the ESHUTDOWN should be taken precedence over any other errno which has already been recoded after EXT4_FLAGS_SHUTDOWN is set, but it only update errno in the journal suoerblock now if the old errno is 0.
--- fs/jbd2/journal.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/jbd2/journal.c +1 -2
@@ -2119,8 +2119,7 @@ static void __journal_abort_soft (journal_t *journal, int errno)if (journal->j_flags &JBD2_ABORT ) {write_unlock (&journal->j_state_lock); -if (!old_errno && old_errno != -ESHUTDOWN && - errno == -ESHUTDOWN ) +if (old_errno != -ESHUTDOWN && errno == -ESHUTDOWN )jbd2_journal_update_sb_errno (journal);return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 145/237 ARM: 8951/1: Fix Kexec compilation issue.
In reply to Greg Kroah-HartmanFrom: Vincenzo Frascino <[email protected]>
[ Upstream commit 76950f7162cad51d2200ebd22c620c14af38f718 ]
To perform the reserve_crashkernel() operation kexec uses SECTION_SIZE to find a memblock in a range.SECTION_SIZE is not defined for nommu systems. Trying to compile kexec in these conditions results in a build error:
linux/arch/arm/kernel/setup.c: In function ‘reserve_crashkernel’:
linux/arch/arm/kernel/setup.c:1016:25: error: ‘SECTION_SIZE’ undeclared
(first use in this function); did you mean ‘SECTIONS_WIDTH’?
crash_size, SECTION_SIZE);
^~~~~~~~~~~~
SECTIONS_WIDTH linux/arch/arm/kernel/setup.c:1016:25: note: each undeclared identifier
is reported only once for each function it appears in
linux/scripts/Makefile.build:265: recipe for target 'arch/arm/kernel/setup.o'
failed
Make KEXEC depend on MMU to fix the compilation issue.
--- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +1 -1
@@ -2005,7 +2005,7 @@ config XIP_PHYS_ADDR config KEXEC bool "Kexec system call (EXPERIMENTAL)" depends on (!SMP || PM_SLEEP_SMP) - depends on !CPU_V7M + depends on MMU select KEXEC_CORE help kexec is a system call that implements the ability to shutdown your
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/237 hostap: Adjust indentation in prism2_hostapd_add_sta
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit b61156fba74f659d0bc2de8f2dbf5bad9f4b8faf ]
Clang warns:
../drivers/net/wireless/intersil/hostap/hostap_ap.c:2511:3: warning:
misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
if (sta->tx_supp_rates & WLAN_RATE_5M5)
^
../drivers/net/wireless/intersil/hostap/hostap_ap.c:2509:2: note:
previous statement is here
if (sta->tx_supp_rates & WLAN_RATE_2M)
^1 warning generated.
This warning occurs because there is a space before the tab on this line. Remove it so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.
--- drivers/net/wireless/intersil/hostap/hostap_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intersil/hostap/hostap_ap.c +1 -1
@@ -2568,7 +2568,7 @@ static int prism2_hostapd_add_sta(struct ap_data *ap, sta->supported_rates[0 ] =2 ;if (sta->tx_supp_rates &WLAN_RATE_2M ) sta->supported_rates[1 ] =4 ; -if (sta->tx_supp_rates &WLAN_RATE_5M5 ) +if (sta->tx_supp_rates &WLAN_RATE_5M5 ) sta->supported_rates[2 ] =11 ;if (sta->tx_supp_rates &WLAN_RATE_11M ) sta->supported_rates[3 ] =22 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/237 iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit c2f9a4e4a5abfc84c01b738496b3fd2d471e0b18 ]
The loop counter addr is a u16 where as the upper limit of the loop is an int. In the unlikely event that the il->cfg->eeprom_size is greater than 64K then we end up with an infinite loop since addr will wrap around an never reach upper loop limit. Fix this by making addr an int.
Addresses-Coverity: ("Infinite loop")
--- drivers/net/wireless/intel/iwlegacy/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlegacy/common.c +1 -1
@@ -717,7 +717,7 @@ il_eeprom_init(struct il_priv *il)u32 gp =_il_rd (il,CSR_EEPROM_GP );int sz;int ret; -u16 addr; +int addr;/* allocate eeprom */ sz = il->cfg->eeprom_size;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 148/237 cifs: fix NULL dereference in match_prepath
In reply to Greg Kroah-HartmanFrom: Ronnie Sahlberg <[email protected]>
[ Upstream commit fe1292686333d1dadaf84091f585ee903b9ddb84 ]
RHBZ: 1760879
Fix an oops in match_prepath() by making sure that the prepath string is not NULL before we pass it into strcmp().
This is similar to other checks we make for example in cifs_root_iget()
--- fs/cifs/connect.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/cifs/connect.c +4 -2
@@ -3047,8 +3047,10 @@ match_prepath(struct super_block *sb, struct cifs_mnt_data *mnt_data) {struct cifs_sb_info *old =CIFS_SB (sb);struct cifs_sb_info *new = mnt_data->cifs_sb; -bool old_set = old->mnt_cifs_flags &CIFS_MOUNT_USE_PREFIX_PATH ; -bool new_set = new->mnt_cifs_flags &CIFS_MOUNT_USE_PREFIX_PATH ; +bool old_set = (old->mnt_cifs_flags &CIFS_MOUNT_USE_PREFIX_PATH ) && + old->prepath; +bool new_set = (new->mnt_cifs_flags &CIFS_MOUNT_USE_PREFIX_PATH ) && + new->prepath;if (old_set && new_set && !strcmp (new->prepath, old->prepath))return 1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 149/237 ceph: check availability of mds cluster on mount after wait timeout
In reply to Greg Kroah-HartmanFrom: Xiubo Li <[email protected]>
[ Upstream commit 97820058fb2831a4b203981fa2566ceaaa396103 ]
If all the MDS daemons are down for some reason, then the first mount attempt will fail with EIO after the mount request times out. A mount attempt will also fail with EIO if all of the MDS's are laggy.
This patch changes the code to return -EHOSTUNREACH in these situations and adds a pr_info error message to help the admin determine the cause.
URL: https://tracker.ceph.com/issues/4386
--- fs/ceph/mds_client.c | 3 +-- fs/ceph/super.c | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-)
fs/ceph/mds_client.c +1 -2
@@ -2261,8 +2261,7 @@ static int __do_request(struct ceph_mds_client *mdsc,if (!(mdsc->fsc->mount_options->flags &CEPH_MOUNT_OPT_MOUNTWAIT ) && !ceph_mdsmap_is_cluster_available (mdsc->mdsmap)) { - err = -ENOENT ; -pr_info ("probably no mds server is up\n" ); + err = -EHOSTUNREACH ; goto finish; } }
fs/ceph/super.c +5 -0
@@ -1055,6 +1055,11 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type,return res; out_splat: +if (!ceph_mdsmap_is_cluster_available (fsc->mdsc->mdsmap)) { +pr_info ("No mds server is up or the cluster is laggy\n" ); + err = -EHOSTUNREACH ; + } +ceph_mdsc_close_sessions (fsc->mdsc);deactivate_locked_super (sb); goto out_final;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 150/237 irqchip/gic-v3: Only provision redistributors that are enabled in ACPI
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 926b5dfa6b8dc666ff398044af6906b156e1d949 ]
We currently allocate redistributor region structures for individual redistributors when ACPI doesn't present us with compact MMIO regions covering multiple redistributors.
It turns out that we allocate these structures even when the redistributor is flagged as disabled by ACPI. It works fine until someone actually tries to tarse one of these structures, and access the corresponding MMIO region.
Instead, track the number of enabled redistributors, and only allocate what is required. This makes sure that there is no invalid data to misuse.
--- drivers/irqchip/irq-gic-v3.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/irqchip/irq-gic-v3.c +7 -2
@@ -1253,6 +1253,7 @@ static structstruct redist_region *redist_regs;u32 nr_redist_regions;bool single_redist; +int enabled_rdists;u32 maint_irq;int maint_irq_mode;phys_addr_t vcpu_base;
@@ -1347,8 +1348,10 @@ static int __init gic_acpi_match_gicc(struct acpi_subtable_header *header,* If GICC is enabled and has valid gicr base address, then it means * GICR base is presented via GICC */ -if ((gicc->flags &ACPI_MADT_ENABLED ) && gicc->gicr_base_address) +if ((gicc->flags &ACPI_MADT_ENABLED ) && gicc->gicr_base_address) { + acpi_data.enabled_rdists++;return 0 ; + }/* * It's perfectly valid firmware can pass disabled GICC entry, driver
@@ -1378,8 +1381,10 @@ static int __init gic_acpi_count_gicr_regions(void) count =acpi_table_parse_madt (ACPI_MADT_TYPE_GENERIC_INTERRUPT , gic_acpi_match_gicc,0 ); -if (count >0 ) +if (count >0 ) { acpi_data.single_redist = true; + count = acpi_data.enabled_rdists; + }return count; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 151/237 drm/nouveau/disp/nv50-: prevent oops when no channel method map provided
In reply to Greg Kroah-HartmanFrom: Ben Skeggs <[email protected]>
[ Upstream commit 0e6176c6d286316e9431b4f695940cfac4ffe6c2 ]
The implementations for most channel types contains a map of methods to priv registers in order to provide debugging info when a disp exception has been raised.
This info is missing from the implementation of PIO channels as they're rather simplistic already, however, if an exception is raised by one of them, we'd end up triggering a NULL-pointer deref. Not ideal...
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=206299
--- drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c +2 -0
@@ -73,6 +73,8 @@ nv50_disp_chan_mthd(struct nv50_disp_chan *chan, int debug)if (debug > subdev->debug)return ; +if (!mthd) +return ;for (i =0 ; (list = mthd->data[i].mthd) !=NULL ; i++) {u32 base = chan->head * mthd->addr;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 152/237 ftrace: fpid_next() should increase position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
[ Upstream commit e4075e8bdffd93a9b6d6e1d52fabedceeca5a91b ]
if seq_file .next fuction does not change position index, read after some lseek can generate unexpected output.
Without patch:
# dd bs=4 skip=1 if=/sys/kernel/tracing/set_ftrace_pid dd: /sys/kernel/tracing/set_ftrace_pid: cannot skip to specified offset id no pid 2+1 records in 2+1 records out 10 bytes copied, 0.000213285 s, 46.9 kB/s
Notice the "id" followed by "no pid".
With the patch:
# dd bs=4 skip=1 if=/sys/kernel/tracing/set_ftrace_pid dd: /sys/kernel/tracing/set_ftrace_pid: cannot skip to specified offset id 0+1 records in 0+1 records out 3 bytes copied, 0.000202112 s, 14.8 kB/s
Notice that it only prints "id" and not the "no pid" afterward.
https://bugzilla.kernel.org/show_bug.cgi?id=206283
--- kernel/trace/ftrace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/trace/ftrace.c +3 -2
@@ -6317,9 +6317,10 @@ static void *fpid_next(struct seq_file *m, void *v, loff_t *pos)struct trace_array *tr = m->private;struct trace_pid_list *pid_list =rcu_dereference_sched (tr->function_pids); -if (v ==FTRACE_NO_PIDS ) +if (v ==FTRACE_NO_PIDS ) { + (*pos)++;return NULL ; - + }return trace_pid_next (pid_list, v, pos); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 153/237 trigger_next should increase position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
[ Upstream commit 6722b23e7a2ace078344064a9735fb73e554e9ef ]
if seq_file .next fuction does not change position index, read after some lseek can generate unexpected output.
Without patch:
# dd bs=30 skip=1 if=/sys/kernel/tracing/events/sched/sched_switch/trigger dd: /sys/kernel/tracing/events/sched/sched_switch/trigger: cannot skip to specified offset n traceoff snapshot stacktrace enable_event disable_event enable_hist disable_hist hist # Available triggers: # traceon traceoff snapshot stacktrace enable_event disable_event enable_hist disable_hist hist 6+1 records in 6+1 records out 206 bytes copied, 0.00027916 s, 738 kB/s
Notice the printing of "# Available triggers:..." after the line.
With the patch:
# dd bs=30 skip=1 if=/sys/kernel/tracing/events/sched/sched_switch/trigger dd: /sys/kernel/tracing/events/sched/sched_switch/trigger: cannot skip to specified offset n traceoff snapshot stacktrace enable_event disable_event enable_hist disable_hist hist 2+1 records in 2+1 records out 88 bytes copied, 0.000526867 s, 167 kB/s
It only prints the end of the file, and does not restart.
https://bugzilla.kernel.org/show_bug.cgi?id=206283
--- kernel/trace/trace_events_trigger.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/trace/trace_events_trigger.c +3 -2
@@ -127,9 +127,10 @@ static void *trigger_next(struct seq_file *m, void *t, loff_t *pos) {struct trace_event_file *event_file =event_file_data (m->private); -if (t ==SHOW_AVAILABLE_TRIGGERS ) +if (t ==SHOW_AVAILABLE_TRIGGERS ) { + (*pos)++;return NULL ; - + }return seq_list_next (t, &event_file->triggers, pos); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 154/237 radeon: insert 10ms sleep in dce5_crtc_load_lut
In reply to Greg Kroah-HartmanFrom: Daniel Vetter <[email protected]>
[ Upstream commit ec3d65082d7dabad6fa8f66a8ef166f2d522d6b2 ]
Per at least one tester this is enough magic to recover the regression introduced for some people (but not all) in
commit b8e2b0199cc377617dc238f5106352c06dcd3fa2
Author: Peter Rosin <[email protected]> Date: Tue Jul 4 12:36:57 2017 +0200
drm/fb-helper: factor out pseudo-palette
which for radeon had the side-effect of refactoring out a seemingly redudant writing of the color palette.
10ms in a fairly slow modeset path feels like an acceptable form of duct-tape, so maybe worth a shot and see what sticks.
--- drivers/gpu/drm/radeon/radeon_display.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/radeon/radeon_display.c +2 -0
@@ -119,6 +119,8 @@ static void dce5_crtc_load_lut(struct drm_crtc *crtc)DRM_DEBUG_KMS ("%d\n" , radeon_crtc->crtc_id); +msleep (10 ); +WREG32 (NI_INPUT_CSC_CONTROL + radeon_crtc->crtc_offset, (NI_INPUT_CSC_GRPH_MODE (NI_INPUT_CSC_BYPASS ) |NI_INPUT_CSC_OVL_MODE (NI_INPUT_CSC_BYPASS )));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 155/237 ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans()
In reply to Greg Kroah-HartmanFrom: wangyan <[email protected]>
[ Upstream commit 9f16ca48fc818a17de8be1f75d08e7f4addc4497 ]
I found a NULL pointer dereference in ocfs2_update_inode_fsync_trans(), handle->h_transaction may be NULL in this situation:
ocfs2_file_write_iter
->__generic_file_write_iter
->generic_perform_write
->ocfs2_write_begin
->ocfs2_write_begin_nolock
->ocfs2_write_cluster_by_desc
->ocfs2_write_cluster
->ocfs2_mark_extent_written
->ocfs2_change_extent_flag
->ocfs2_split_extent
->ocfs2_try_to_merge_extent
->ocfs2_extend_rotate_transaction
->ocfs2_extend_trans
->jbd2_journal_restart
->jbd2__journal_restart
// handle->h_transaction is NULL here
->handle->h_transaction = NULL;
->start_this_handle
/* journal aborted due to storage
network disconnection, return error */
->return -EROFS;
/* line 3806 in ocfs2_try_to_merge_extent (),
it will ignore ret error. */
->ret = 0;
->...
->ocfs2_write_end
->ocfs2_write_end_nolock
->ocfs2_update_inode_fsync_trans
// NULL pointer dereference
->oi->i_sync_tid = handle->h_transaction->t_tid;The information of NULL pointer dereference as follows:
JBD2: Detected IO errors while flushing file data on dm-11-45
Aborting journal on device dm-11-45.
JBD2: Error -5 detected when updating journal superblock for dm-11-45.
(dd,22081,3):ocfs2_extend_trans:474 ERROR: status = -30
(dd,22081,3):ocfs2_try_to_merge_extent:3877 ERROR: status = -30
Unable to handle kernel NULL pointer dereference at
virtual address 0000000000000008
Mem abort info:
ESR = 0x96000004
Exception class = DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
Data abort info:
ISV = 0, ISS = 0x00000004
CM = 0, WnR = 0
user pgtable: 4k pages, 48-bit VAs, pgdp = 00000000e74e1338
[0000000000000008] pgd=0000000000000000
Internal error: Oops: 96000004 [#1] SMP
Process dd (pid: 22081, stack limit = 0x00000000584f35a9)
CPU: 3 PID: 22081 Comm: dd Kdump: loaded
Hardware name: Huawei TaiShan 2280 V2/BC82AMDD, BIOS 0.98 08/25/2019
pstate: 60400009 (nZCv daif +PAN -UAO)
pc : ocfs2_write_end_nolock+0x2b8/0x550 [ocfs2]
lr : ocfs2_write_end_nolock+0x2a0/0x550 [ocfs2]
sp : ffff0000459fba70
x29: ffff0000459fba70 x28: 0000000000000000
x27: ffff807ccf7f1000 x26: 0000000000000001
x25: ffff807bdff57970 x24: ffff807caf1d4000
x23: ffff807cc79e9000 x22: 0000000000001000
x21: 000000006c6cd000 x20: ffff0000091d9000
x19: ffff807ccb239db0 x18: ffffffffffffffff
x17: 000000000000000e x16: 0000000000000007
x15: ffff807c5e15bd78 x14: 0000000000000000
x13: 0000000000000000 x12: 0000000000000000
x11: 0000000000000000 x10: 0000000000000001
x9 : 0000000000000228 x8 : 000000000000000c
x7 : 0000000000000fff x6 : ffff807a308ed6b0
x5 : ffff7e01f10967c0 x4 : 0000000000000018
x3 : d0bc661572445600 x2 : 0000000000000000
x1 : 000000001b2e0200 x0 : 0000000000000000
Call trace:
ocfs2_write_end_nolock+0x2b8/0x550 [ocfs2]
ocfs2_write_end+0x4c/0x80 [ocfs2]
generic_perform_write+0x108/0x1a8
__generic_file_write_iter+0x158/0x1c8
ocfs2_file_write_iter+0x668/0x950 [ocfs2]
__vfs_write+0x11c/0x190
vfs_write+0xac/0x1c0
ksys_write+0x6c/0xd8
__arm64_sys_write+0x24/0x30
el0_svc_common+0x78/0x130
el0_svc_handler+0x38/0x78
el0_svc+0x8/0xcTo prevent NULL pointer dereference in this situation, we use is_handle_aborted() before using handle->h_transaction->t_tid.
--- fs/ocfs2/journal.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/ocfs2/journal.h +5 -3
@@ -637,9 +637,11 @@ static inline void ocfs2_update_inode_fsync_trans(handle_t *handle, {struct ocfs2_inode_info *oi =OCFS2_I (inode); - oi->i_sync_tid = handle->h_transaction->t_tid; -if (datasync) - oi->i_datasync_tid = handle->h_transaction->t_tid; +if (!is_handle_aborted (handle)) { + oi->i_sync_tid = handle->h_transaction->t_tid; +if (datasync) + oi->i_datasync_tid = handle->h_transaction->t_tid; + } }#endif /* OCFS2_JOURNAL_H */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/237 lib/scatterlist.c: adjust indentation in __sg_alloc_table
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 4e456fee215677584cafa7f67298a76917e89c64 ]
Clang warns:
../lib/scatterlist.c:314:5: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
return -ENOMEM;
^
../lib/scatterlist.c:311:4: note: previous statement is here
if (prv)
^1 warning generated.
This warning occurs because there is a space before the tab on this line. Remove it so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.
--- lib/scatterlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/scatterlist.c +1 -1
@@ -317,7 +317,7 @@ int __sg_alloc_table(struct sg_table *table, unsigned int nents,if (prv) table->nents = ++table->orig_nents; -return -ENOMEM ; +return -ENOMEM ; }sg_init_table (sg, alloc_size);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/237 reiserfs: prevent NULL pointer dereference in reiserfs_insert_item()
In reply to Greg Kroah-HartmanFrom: Yunfeng Ye <[email protected]>
[ Upstream commit aacee5446a2a1aa35d0a49dab289552578657fb4 ]
The variable inode may be NULL in reiserfs_insert_item(), but there is no check before accessing the member of inode.
Fix this by adding NULL pointer check before calling reiserfs_debug().
--- fs/reiserfs/stree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/reiserfs/stree.c +2 -1
@@ -2250,7 +2250,8 @@ error_out:/* also releases the path */ unfix_nodes (&s_ins_balance);#ifdef REISERQUOTA_DEBUG -reiserfs_debug (th->t_super,REISERFS_DEBUG_CODE , +if (inode) +reiserfs_debug (th->t_super,REISERFS_DEBUG_CODE ,"reiserquota insert_item(): freeing %u id=%u type=%c" , quota_bytes, inode->i_uid,head2type (ih));#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 158/237 bcache: explicity type cast in bset_bkey_last()
In reply to Greg Kroah-HartmanFrom: Coly Li <[email protected]>
[ Upstream commit 7c02b0055f774ed9afb6e1c7724f33bf148ffdc0 ]
In bset.h, macro bset_bkey_last() is defined as,
bkey_idx((struct bkey *) (i)->d, (i)->keys)
Parameter i can be variable type of data structure, the macro always works once the type of struct i has member 'd' and 'keys'.
bset_bkey_last() is also used in macro csum_set() to calculate the checksum of a on-disk data structure. When csum_set() is used to calculate checksum of on-disk bcache super block, the parameter 'i' data type is struct cache_sb_disk. Inside struct cache_sb_disk (also in struct cache_sb) the member keys is __u16 type. But bkey_idx() expects unsigned int (a 32bit width), so there is problem when sending parameters via stack to call bkey_idx().
Sparse tool from Intel 0day kbuild system reports this incompatible problem. bkey_idx() is part of user space API, so the simplest fix is to cast the (i)->keys to unsigned int type in macro bset_bkey_last().
--- drivers/md/bcache/bset.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/bcache/bset.h +2 -1
@@ -381,7 +381,8 @@ void bch_btree_keys_stats(struct btree_keys *, struct bset_stats *);/* Bkey utility code */ -#define bset_bkey_last (i) bkey_idx((struct bkey *) (i)->d, (i)->keys) +#define bset_bkey_last (i) bkey_idx((struct bkey *) (i)->d, \ + (unsigned int)(i)->keys)static inline struct bkey *bset_bkey_idx (struct bset *i,unsigned idx) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/237 irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL
In reply to Greg Kroah-HartmanFrom: Zenghui Yu <[email protected]>
[ Upstream commit 107945227ac5d4c37911c7841b27c64b489ce9a9 ]
It looks like an obvious mistake to use its_mapc_cmd descriptor when building the INVALL command block. It so far worked by luck because both its_mapc_cmd.col and its_invall_cmd.col sit at the same offset of the ITS command descriptor, but we should not rely on it.
--- drivers/irqchip/irq-gic-v3-its.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-its.c +1 -1
@@ -527,7 +527,7 @@ static struct its_collection *its_build_invall_cmd(struct its_cmd_block *cmd, struct its_cmd_desc *desc) {its_encode_cmd (cmd,GITS_CMD_INVALL ); -its_encode_collection (cmd, desc->its_mapc_cmd.col->col_id); +its_encode_collection (cmd, desc->its_invall_cmd.col->col_id);its_fixup_cmd (cmd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 160/237 iwlwifi: mvm: Fix thermal zone registration
In reply to Greg Kroah-HartmanFrom: Andrei Otcheretianski <[email protected]>
[ Upstream commit baa6cf8450b72dcab11f37c47efce7c5b9b8ad0f ]
Use a unique name when registering a thermal zone. Otherwise, with multiple NICS, we hit the following warning during the unregistration.
WARNING: CPU: 2 PID: 3525 at fs/sysfs/group.c:255 RIP: 0010:sysfs_remove_group+0x80/0x90 Call Trace: dpm_sysfs_remove+0x57/0x60 device_del+0x5a/0x350 ? sscanf+0x4e/0x70 device_unregister+0x1a/0x60 hwmon_device_unregister+0x4a/0xa0 thermal_remove_hwmon_sysfs+0x175/0x1d0 thermal_zone_device_unregister+0x188/0x1e0 iwl_mvm_thermal_exit+0xe7/0x100 [iwlmvm] iwl_op_mode_mvm_stop+0x27/0x180 [iwlmvm] _iwl_op_mode_stop.isra.3+0x2b/0x50 [iwlwifi] iwl_opmode_deregister+0x90/0xa0 [iwlwifi] __exit_compat+0x10/0x2c7 [iwlmvm] __x64_sys_delete_module+0x13f/0x270 do_syscall_64+0x5a/0x110 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/tt.c +3 -1
@@ -739,7 +739,8 @@ static struct thermal_zone_device_ops tzone_ops = {static void iwl_mvm_thermal_zone_register (struct iwl_mvm *mvm) {int i; -char name[] ="iwlwifi" ; +char name[16 ]; +static atomic_t counter =ATOMIC_INIT (0 );if (!iwl_mvm_is_tt_in_fw (mvm)) { mvm->tz_device.tzone =NULL ;
@@ -749,6 +750,7 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)BUILD_BUG_ON (ARRAY_SIZE (name) >=THERMAL_NAME_LENGTH ); +sprintf (name,"iwlwifi_%u" ,atomic_inc_return (&counter) &0xFF ); mvm->tz_device.tzone = thermal_zone_device_register(name, IWL_MAX_DTS_TRIPS, IWL_WRITABLE_TRIPS_MSK,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/237 microblaze: Prevent the overflow of the start
In reply to Greg Kroah-HartmanFrom: Shubhrajyoti Datta <[email protected]>
[ Upstream commit 061d2c1d593076424c910cb1b64ecdb5c9a6923f ]
In case the start + cache size is more than the max int the start overflows.
Prevent the same.
--- arch/microblaze/kernel/cpu/cache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/microblaze/kernel/cpu/cache.c +2 -1
@@ -92,7 +92,8 @@ static inline void __disable_dcache_nomsr(void)#define CACHE_LOOP_LIMITS (start, end, cache_line_length, cache_size) \ do { \ int align = ~(cache_line_length - 1); \ - end = min(start + cache_size, end); \ + if (start < UINT_MAX - cache_size) \ + end = min(start + cache_size, end); \ start &= align; \ } while (0)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/237 brd: check and limit max_part par
In reply to Greg Kroah-HartmanFrom: Zhiqiang Liu <[email protected]>
[ Upstream commit c8ab422553c81a0eb070329c63725df1cd1425bc ]
In brd_init func, rd_nr num of brd_device are firstly allocated and add in brd_devices, then brd_devices are traversed to add each brd_device by calling add_disk func. When allocating brd_device, the disk->first_minor is set to i * max_part, if rd_nr * max_part is larger than MINORMASK, two different brd_device may have the same devt, then only one of them can be successfully added. when rmmod brd.ko, it will cause oops when calling brd_exit.
Follow those steps:
# modprobe brd rd_nr=3 rd_size=102400 max_part=1048576 # rmmod brd then, the oops will appear.
Oops log:
[ 726.613722] Call trace: [ 726.614175] kernfs_find_ns+0x24/0x130 [ 726.614852] kernfs_find_and_get_ns+0x44/0x68 [ 726.615749] sysfs_remove_group+0x38/0xb0 [ 726.616520] blk_trace_remove_sysfs+0x1c/0x28 [ 726.617320] blk_unregister_queue+0x98/0x100 [ 726.618105] del_gendisk+0x144/0x2b8 [ 726.618759] brd_exit+0x68/0x560 [brd] [ 726.619501] __arm64_sys_delete_module+0x19c/0x2a0 [ 726.620384] el0_svc_common+0x78/0x130 [ 726.621057] el0_svc_handler+0x38/0x78 [ 726.621738] el0_svc+0x8/0xc [ 726.622259] Code: aa0203f6 aa0103f7 aa1e03e0 d503201f (7940e260)
Here, we add brd_check_and_reset_par func to check and limit max_part par.
--V5->V6:
- remove useless code
V4->V5:(suggested by Ming Lei)
- make sure max_part is not larger than DISK_MAX_PARTS
V3->V4:(suggested by Ming Lei)
- remove useless change
- add one limit of max_part
V2->V3: (suggested by Ming Lei)
- clear .minors when running out of consecutive minor space in brd_alloc
- remove limit of rd_nr
V1->V2:
- add more checks in brd_check_par_valid as suggested by Ming Lei.
--- drivers/block/brd.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/block/brd.c +20 -2
@@ -529,6 +529,25 @@ static struct kobject *brd_probe(dev_t dev, int *part, void *data)return kobj; } +static inline void brd_check_and_reset_par (void ) +{ +if (unlikely (!max_part)) + max_part =1 ; + +/* +* make sure 'max_part' can be divided exactly by (1U << MINORBITS), +* otherwise, it is possiable to get same dev_t when adding partitions. +*/ +if ((1U <<MINORBITS ) % max_part !=0 ) + max_part =1UL <<fls (max_part); + +if (max_part >DISK_MAX_PARTS ) { +pr_info ("brd: max_part can't be larger than %d, reset max_part = %d.\n" , +DISK_MAX_PARTS ,DISK_MAX_PARTS ); + max_part =DISK_MAX_PARTS ; + } +} +static int __init brd_init (void ) {struct brd_device *brd, *next;
@@ -552,8 +571,7 @@ static int __init brd_init(void)if (register_blkdev (RAMDISK_MAJOR ,"ramdisk" ))return -EIO ; -if (unlikely (!max_part)) - max_part =1 ; +brd_check_and_reset_par ();for (i =0 ; i < rd_nr; i++) { brd =brd_alloc (i);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 163/237 help_next should increase position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
[ Upstream commit 9f198a2ac543eaaf47be275531ad5cbd50db3edf ]
if seq_file .next fuction does not change position index, read after some lseek can generate unexpected output.
https://bugzilla.kernel.org/show_bug.cgi?id=206283
--- fs/orangefs/orangefs-debugfs.c | 1 + 1 file changed, 1 insertion(+)
fs/orangefs/orangefs-debugfs.c +1 -0
@@ -305,6 +305,7 @@ static void *help_start(struct seq_file *m, loff_t *pos)static void *help_next (struct seq_file *m,void *v,loff_t *pos) { + (*pos)++;gossip_debug (GOSSIP_DEBUGFS_DEBUG ,"help_next: start\n" );return NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/237 virtio_balloon: prevent pfn array overflow
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit 6e9826e77249355c09db6ba41cd3f84e89f4b614 ]
Make sure, at build time, that pfn array is big enough to hold a single page. It happens to be true since the PAGE_SHIFT value at the moment is 20, which is 1M - exactly 256 4K balloon pages.
--- drivers/virtio/virtio_balloon.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/virtio/virtio_balloon.c +2 -0
@@ -132,6 +132,8 @@ static void set_page_pfns(struct virtio_balloon *vb, {unsigned int i; +BUILD_BUG_ON (VIRTIO_BALLOON_PAGES_PER_PAGE >VIRTIO_BALLOON_ARRAY_PFNS_MAX ); +/* * Set balloon pfns pointing at this page. * Note that the first pfn points at start of the page.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 165/237 mlxsw: spectrum_dpipe: Add missing error path
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 3a99cbb6fa7bca1995586ec2dc21b0368aad4937 ]
In case devlink_dpipe_entry_ctx_prepare() failed, release RTNL that was previously taken and free the memory allocated by mlxsw_sp_erif_entry_prepare().
--- drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c +2 -1
@@ -225,7 +225,7 @@ mlxsw_sp_dpipe_table_erif_entries_dump(void *priv, bool counters_enabled, start_again: err =devlink_dpipe_entry_ctx_prepare (dump_ctx);if (err) -return err; + goto err_ctx_prepare; j =0 ;for (; i < rif_count; i++) {struct mlxsw_sp_rif *rif =mlxsw_sp_rif_by_index (mlxsw_sp, i);
@@ -257,6 +257,7 @@ start_again:return 0 ; err_entry_append: err_entry_get: +err_ctx_prepare:rtnl_unlock ();devlink_dpipe_entry_clear (&entry);return err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 166/237 selinux: ensure we cleanup the internal AVC counters on error in avc_update()
In reply to Greg Kroah-HartmanFrom: Jaihind Yadav <[email protected]>
[ Upstream commit 030b995ad9ece9fa2d218af4429c1c78c2342096 ]
In AVC update we don't call avc_node_kill() when avc_xperms_populate() fails, resulting in the avc->avc_cache.active_nodes counter having a false value. In last patch this changes was missed , so correcting it.
--- security/selinux/avc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/avc.c +1 -1
@@ -863,7 +863,7 @@ static int avc_update_node(u32 event, u3if (orig->ae.xp_node) { rc =avc_xperms_populate (node, orig->ae.xp_node);if (rc) { -kmem_cache_free (avc_node_cachep, node); +avc_node_kill (node); goto out_unlock; } }
Greg Kroah-Hartman
maintainerPATCH 167/237 enic: prevent waking up stopped tx queues over watchdog reset
In reply to Greg Kroah-HartmanFrom: Firo Yang <[email protected]>
[ Upstream commit 0f90522591fd09dd201065c53ebefdfe3c6b55cb ]
Recent months, our customer reported several kernel crashes all preceding with following message:
NETDEV WATCHDOG: eth2 (enic): transmit queue 0 timed out Error message of one of those crashes:
BUG: unable to handle kernel paging request at ffffffffa007e090
After analyzing severl vmcores, I found that most of crashes are caused by memory corruption. And all the corrupted memory areas are overwritten by data of network packets. Moreover, I also found that the tx queues were enabled over watchdog reset.
After going through the source code, I found that in enic_stop(), the tx queues stopped by netif_tx_disable() could be woken up over a small time window between netif_tx_disable() and the napi_disable() by the following code path:
napi_poll->
enic_poll_msix_wq->
vnic_cq_service->
enic_wq_service->
netif_wake_subqueue(enic->netdev, q_number)->
test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &txq->state)In turn, upper netowrk stack could queue skb to ENIC NIC though enic_hard_start_xmit(). And this might introduce some race condition.
Our customer comfirmed that this kind of kernel crash doesn't occur over 90 days since they applied this patch.
--- drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/cisco/enic/enic_main.c +1 -1
@@ -1972,10 +1972,10 @@ static int enic_stop(struct net_device *napi_disable (&enic->napi[i]);netif_carrier_off (netdev); -netif_tx_disable (netdev);if (vnic_dev_get_intr_mode (enic->vdev) ==VNIC_DEV_INTR_MODE_MSIX )for (i =0 ; i < enic->wq_count; i++)napi_disable (&enic->napi[enic_cq_wq (enic, i)]); +netif_tx_disable (netdev);if (!enic_is_dynamic (enic) && !enic_is_sriov_vf (enic))enic_dev_del_station_addr (enic);
Greg Kroah-Hartman
maintainerPATCH 168/237 net: dsa: tag_qca: Make sure there is headroom for tag
In reply to Greg Kroah-HartmanFrom: Per Forlin <[email protected]>
[ Upstream commit 04fb91243a853dbde216d829c79d9632e52aa8d9 ]
Passing tag size to skb_cow_head will make sure there is enough headroom for the tag data.
This change does not introduce any overhead in case there is already available headroom for tag.
--- net/dsa/tag_qca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/dsa/tag_qca.c +1 -1
@@ -41,7 +41,7 @@ static struct sk_buff *qca_tag_xmit(strustruct dsa_slave_priv *p =netdev_priv (dev);u16 *phdr, hdr; -if (skb_cow_head (skb,0 ) <0 ) +if (skb_cow_head (skb,QCA_HDR_LEN ) <0 )return NULL ;skb_push (skb,QCA_HDR_LEN );
Greg Kroah-Hartman
maintainerPATCH 169/237 net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit 1afa3cc90f8fb745c777884d79eaa1001d6927a6 ]
unlike other classifiers that can be offloaded (i.e. users can set flags like 'skip_hw' and 'skip_sw'), 'cls_matchall' doesn't validate the size of netlink attribute 'TCA_MATCHALL_FLAGS' provided by user: add a proper entry to mall_policy.
--- net/sched/cls_matchall.c | 1 + 1 file changed, 1 insertion(+)
net/sched/cls_matchall.c +1 -0
@@ -136,6 +136,7 @@ static void *mall_get(struct tcf_proto *static const struct nla_policy mall_policy[TCA_MATCHALL_MAX +1 ] = { [TCA_MATCHALL_UNSPEC ] = { .type =NLA_UNSPEC }, [TCA_MATCHALL_CLASSID ] = { .type =NLA_U32 }, + [TCA_MATCHALL_FLAGS ] = { .type =NLA_U32 }, }; static int mall_set_parms(struct net *net, struct tcf_proto *tp,
Greg Kroah-Hartman
maintainerPATCH 170/237 net/sched: flower: add missing validation of TCA_FLOWER_FLAGS
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit e2debf0852c4d66ba1a8bde12869b196094c70a7 ]
unlike other classifiers that can be offloaded (i.e. users can set flags like 'skip_hw' and 'skip_sw'), 'cls_flower' doesn't validate the size of netlink attribute 'TCA_FLOWER_FLAGS' provided by user: add a proper entry to fl_policy.
--- net/sched/cls_flower.c | 1 + 1 file changed, 1 insertion(+)
net/sched/cls_flower.c +1 -0
@@ -445,6 +445,7 @@ static const struct nla_policy fl_policy [TCA_FLOWER_KEY_IP_TOS_MASK] = { .type = NLA_U8 }, [TCA_FLOWER_KEY_IP_TTL] = { .type = NLA_U8 }, [TCA_FLOWER_KEY_IP_TTL_MASK] = { .type = NLA_U8 }, + [TCA_FLOWER_FLAGS] = { .type = NLA_U32 }, }; static void fl_set_key_val(struct nlattr **tb,
Greg Kroah-Hartman
maintainerPATCH 171/237 net/smc: fix leak of kernel memory to user space
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 457fed775c97ac2c0cd1672aaf2ff2c8a6235e87 ]
As nlmsg_put() does not clear the memory that is reserved, it this the caller responsability to make sure all of this memory will be written, in order to not reveal prior content.
While we are at it, we can provide the socket cookie even if clsock is not set.
syzbot reported :
BUG: KMSAN: uninit-value in __arch_swab32 arch/x86/include/uapi/asm/swab.h:10 [inline] BUG: KMSAN: uninit-value in __fswab32 include/uapi/linux/swab.h:59 [inline] BUG: KMSAN: uninit-value in __swab32p include/uapi/linux/swab.h:179 [inline] BUG: KMSAN: uninit-value in __be32_to_cpup include/uapi/linux/byteorder/little_endian.h:82 [inline] BUG: KMSAN: uninit-value in get_unaligned_be32 include/linux/unaligned/access_ok.h:30 [inline] BUG: KMSAN: uninit-value in ____bpf_skb_load_helper_32 net/core/filter.c:240 [inline] BUG: KMSAN: uninit-value in ____bpf_skb_load_helper_32_no_cache net/core/filter.c:255 [inline] BUG: KMSAN: uninit-value in bpf_skb_load_helper_32_no_cache+0x14a/0x390 net/core/filter.c:252 CPU: 1 PID: 5262 Comm: syz-executor.5 Not tainted 5.5.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1c9/0x220 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 __arch_swab32 arch/x86/include/uapi/asm/swab.h:10 [inline] __fswab32 include/uapi/linux/swab.h:59 [inline] __swab32p include/uapi/linux/swab.h:179 [inline] __be32_to_cpup include/uapi/linux/byteorder/little_endian.h:82 [inline] get_unaligned_be32 include/linux/unaligned/access_ok.h:30 [inline] ____bpf_skb_load_helper_32 net/core/filter.c:240 [inline] ____bpf_skb_load_helper_32_no_cache net/core/filter.c:255 [inline] bpf_skb_load_helper_32_no_cache+0x14a/0x390 net/core/filter.c:252
Uninit was created at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:144 [inline] kmsan_internal_poison_shadow+0x66/0xd0 mm/kmsan/kmsan.c:127 kmsan_kmalloc_large+0x73/0xc0 mm/kmsan/kmsan_hooks.c:128 kmalloc_large_node_hook mm/slub.c:1406 [inline] kmalloc_large_node+0x282/0x2c0 mm/slub.c:3841 __kmalloc_node_track_caller+0x44b/0x1200 mm/slub.c:4368 __kmalloc_reserve net/core/skbuff.c:141 [inline] __alloc_skb+0x2fd/0xac0 net/core/skbuff.c:209 alloc_skb include/linux/skbuff.h:1049 [inline] netlink_dump+0x44b/0x1ab0 net/netlink/af_netlink.c:2224 __netlink_dump_start+0xbb2/0xcf0 net/netlink/af_netlink.c:2352 netlink_dump_start include/linux/netlink.h:233 [inline] smc_diag_handler_dump+0x2ba/0x300 net/smc/smc_diag.c:242 sock_diag_rcv_msg+0x211/0x610 net/core/sock_diag.c:256 netlink_rcv_skb+0x451/0x650 net/netlink/af_netlink.c:2477 sock_diag_rcv+0x63/0x80 net/core/sock_diag.c:275 netlink_unicast_kernel net/netlink/af_netlink.c:1302 [inline] netlink_unicast+0xf9e/0x1100 net/netlink/af_netlink.c:1328 netlink_sendmsg+0x1248/0x14d0 net/netlink/af_netlink.c:1917 sock_sendmsg_nosec net/socket.c:639 [inline] sock_sendmsg net/socket.c:659 [inline] kernel_sendmsg+0x433/0x440 net/socket.c:679 sock_no_sendpage+0x235/0x300 net/core/sock.c:2740 kernel_sendpage net/socket.c:3776 [inline] sock_sendpage+0x1e1/0x2c0 net/socket.c:937 pipe_to_sendpage+0x38c/0x4c0 fs/splice.c:458 splice_from_pipe_feed fs/splice.c:512 [inline] __splice_from_pipe+0x539/0xed0 fs/splice.c:636 splice_from_pipe fs/splice.c:671 [inline] generic_splice_sendpage+0x1d5/0x2d0 fs/splice.c:844 do_splice_from fs/splice.c:863 [inline] do_splice fs/splice.c:1170 [inline] __do_sys_splice fs/splice.c:1447 [inline] __se_sys_splice+0x2380/0x3350 fs/splice.c:1427 __x64_sys_splice+0x6e/0x90 fs/splice.c:1427 do_syscall_64+0xb8/0x160 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- net/smc/smc_diag.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/smc/smc_diag.c +2 -3
@@ -38,15 +38,14 @@ static void smc_diag_msg_common_fill(str {struct smc_sock *smc =smc_sk (sk); +memset (r,0 ,sizeof (*r)); r->diag_family = sk->sk_family; +sock_diag_save_cookie (sk, r->id.idiag_cookie);if (!smc->clcsock)return ; r->id.idiag_sport =htons (smc->clcsock->sk->sk_num); r->id.idiag_dport = smc->clcsock->sk->sk_dport; r->id.idiag_if = smc->clcsock->sk->sk_bound_dev_if; -sock_diag_save_cookie (sk, r->id.idiag_cookie); -memset (&r->id.idiag_src,0 ,sizeof (r->id.idiag_src)); -memset (&r->id.idiag_dst,0 ,sizeof (r->id.idiag_dst)); r->id.idiag_src[0 ] = smc->clcsock->sk->sk_rcv_saddr; r->id.idiag_dst[0 ] = smc->clcsock->sk->sk_daddr; }
Greg Kroah-Hartman
maintainerPATCH 172/237 thunderbolt: Prevent crash if non-active NVMem file is read
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
commit 03cd45d2e219301880cabc357e3cf478a500080f upstream.
The driver does not populate .reg_read callback for the non-active NVMem because the file is supposed to be write-only. However, it turns out NVMem subsystem does not yet support this and expects that the .reg_read callback is provided. If user reads the binary attribute it triggers NULL pointer dereference like this one:
BUG: kernel NULL pointer dereference, address: 0000000000000000 ... Call Trace: bin_attr_nvmem_read+0x64/0x80 kernfs_fop_read+0xa7/0x180 vfs_read+0xbd/0x170 ksys_read+0x5a/0xd0 do_syscall_64+0x43/0x150 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Fix this in the driver by providing .reg_read callback that always returns an error.
--- drivers/thunderbolt/switch.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/thunderbolt/switch.c +7 -0
@@ -240,6 +240,12 @@ static int tb_switch_nvm_read(void *privreturn dma_port_flash_read (sw->dma_port, offset, val, bytes); } +static int tb_switch_nvm_no_read (void *priv,unsigned int offset,void *val, +size_t bytes) +{ +return -EPERM ; +} +static int tb_switch_nvm_write (void *priv,unsigned int offset,void *val,size_t bytes) {
@@ -285,6 +291,7 @@ static struct nvmem_device *register_nvm config.read_only = true; }else { config.name ="nvm_non_active" ; + config.reg_read = tb_switch_nvm_no_read; config.reg_write = tb_switch_nvm_write; config.root_only = true; }
Greg Kroah-Hartman
maintainerPATCH 173/237 USB: misc: iowarrior: add support for 2 OEMed devices
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit 461d8deb26a7d70254bc0391feb4fd8a95e674e8 upstream.
Add support for two OEM devices that are identical to existing IO-Warrior devices, except for the USB device id.
--- drivers/usb/misc/iowarrior.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/usb/misc/iowarrior.c +13 -2
@@ -33,6 +33,10 @@/* full speed iowarrior */ #define USB_DEVICE_ID_CODEMERCS_IOW56 0x1503 +/* OEMed devices */ +#define USB_DEVICE_ID_CODEMERCS_IOW24SAG 0x158a +#define USB_DEVICE_ID_CODEMERCS_IOW56AM 0x158b +/* Get a minor range for your devices from the usb maintainer */ #ifdef CONFIG_USB_DYNAMIC_MINORS #define IOWARRIOR_MINOR_BASE 0
@@ -137,6 +141,8 @@ static const struct usb_device_id iowarr {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOWPV1)}, {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOWPV2)}, {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW56)}, + {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW24SAG)}, + {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW56AM)}, {} /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, iowarrior_ids);
@@ -364,6 +370,7 @@ static ssize_t iowarrior_write(struct fi }switch (dev->product_id) {case USB_DEVICE_ID_CODEMERCS_IOW24 : +case USB_DEVICE_ID_CODEMERCS_IOW24SAG :case USB_DEVICE_ID_CODEMERCS_IOWPV1 :case USB_DEVICE_ID_CODEMERCS_IOWPV2 :case USB_DEVICE_ID_CODEMERCS_IOW40 :
@@ -378,6 +385,7 @@ static ssize_t iowarrior_write(struct fi goto exit;break ;case USB_DEVICE_ID_CODEMERCS_IOW56 : +case USB_DEVICE_ID_CODEMERCS_IOW56AM :/* The IOW56 uses asynchronous IO and more urbs */ if (atomic_read (&dev->write_busy) ==MAX_WRITES_IN_FLIGHT ) {/* Wait until we are below the limit for submitted urbs */
@@ -502,6 +510,7 @@ static long iowarrior_ioctl(struct fileswitch (cmd) {case IOW_WRITE :if (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW24 || + dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW24SAG || dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOWPV1 || dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOWPV2 || dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW40 ) {
@@ -786,7 +795,8 @@ static int iowarrior_probe(struct usb_in goto error; } -if (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 ) { +if ((dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 ) || + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM )) { res =usb_find_last_int_out_endpoint (iface_desc, &dev->int_out_endpoint);if (res) {
@@ -799,7 +809,8 @@ static int iowarrior_probe(struct usb_in/* we have to check the report_size often, so remember it in the endianness suitable for our machine */ dev->report_size =usb_endpoint_maxp (dev->int_in_endpoint);if ((dev->interface->cur_altsetting->desc.bInterfaceNumber ==0 ) && - (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 )) + ((dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 ) || + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM )))/* IOWarrior56 has wMaxPacketSize different from report size */ dev->report_size =7 ;
Greg Kroah-Hartman
maintainerPATCH 174/237 USB: misc: iowarrior: add support for the 28 and 28L devices
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit 5f6f8da2d7b5a431d3f391d0d73ace8edfb42af7 upstream.
Add new device ids for the 28 and 28L devices. These have 4 interfaces instead of 2, but the driver binds the same, so the driver changes are minimal.
--- drivers/usb/misc/iowarrior.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/usb/misc/iowarrior.c +13 -2
@@ -32,6 +32,9 @@#define USB_DEVICE_ID_CODEMERCS_IOWPV2 0x1512/* full speed iowarrior */ #define USB_DEVICE_ID_CODEMERCS_IOW56 0x1503 +/* fuller speed iowarrior */ +#define USB_DEVICE_ID_CODEMERCS_IOW28 0x1504 +#define USB_DEVICE_ID_CODEMERCS_IOW28L 0x1505/* OEMed devices */ #define USB_DEVICE_ID_CODEMERCS_IOW24SAG 0x158a
@@ -143,6 +146,8 @@ static const struct usb_device_id iowarr {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW56)}, {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW24SAG)}, {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW56AM)}, + {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28)}, + {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28L)}, {} /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, iowarrior_ids);
@@ -386,6 +391,8 @@ static ssize_t iowarrior_write(struct fibreak ;case USB_DEVICE_ID_CODEMERCS_IOW56 :case USB_DEVICE_ID_CODEMERCS_IOW56AM : +case USB_DEVICE_ID_CODEMERCS_IOW28 : +case USB_DEVICE_ID_CODEMERCS_IOW28L :/* The IOW56 uses asynchronous IO and more urbs */ if (atomic_read (&dev->write_busy) ==MAX_WRITES_IN_FLIGHT ) {/* Wait until we are below the limit for submitted urbs */
@@ -796,7 +803,9 @@ static int iowarrior_probe(struct usb_in }if ((dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 ) || - (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM )) { + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM ) || + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28 ) || + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28L )) { res =usb_find_last_int_out_endpoint (iface_desc, &dev->int_out_endpoint);if (res) {
@@ -810,7 +819,9 @@ static int iowarrior_probe(struct usb_in dev->report_size =usb_endpoint_maxp (dev->int_in_endpoint);if ((dev->interface->cur_altsetting->desc.bInterfaceNumber ==0 ) && ((dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 ) || - (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM ))) + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM ) || + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28 ) || + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28L )))/* IOWarrior56 has wMaxPacketSize different from report size */ dev->report_size =7 ;
Greg Kroah-Hartman
maintainerPATCH 175/237 USB: misc: iowarrior: add support for the 100 device
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit bab5417f5f0118ce914bc5b2f8381e959e891155 upstream.
Add a new device id for the 100 devie. It has 4 interfaces like the 28 and 28L devices but a larger endpoint so more I/O pins.
--- drivers/usb/misc/iowarrior.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/usb/misc/iowarrior.c +7 -2
@@ -35,6 +35,7 @@/* fuller speed iowarrior */ #define USB_DEVICE_ID_CODEMERCS_IOW28 0x1504#define USB_DEVICE_ID_CODEMERCS_IOW28L 0x1505 +#define USB_DEVICE_ID_CODEMERCS_IOW100 0x1506/* OEMed devices */ #define USB_DEVICE_ID_CODEMERCS_IOW24SAG 0x158a
@@ -148,6 +149,7 @@ static const struct usb_device_id iowarr {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW56AM)}, {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28)}, {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28L)}, + {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW100)}, {} /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, iowarrior_ids);
@@ -393,6 +395,7 @@ static ssize_t iowarrior_write(struct ficase USB_DEVICE_ID_CODEMERCS_IOW56AM :case USB_DEVICE_ID_CODEMERCS_IOW28 :case USB_DEVICE_ID_CODEMERCS_IOW28L : +case USB_DEVICE_ID_CODEMERCS_IOW100 :/* The IOW56 uses asynchronous IO and more urbs */ if (atomic_read (&dev->write_busy) ==MAX_WRITES_IN_FLIGHT ) {/* Wait until we are below the limit for submitted urbs */
@@ -805,7 +808,8 @@ static int iowarrior_probe(struct usb_inif ((dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 ) || (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM ) || (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28 ) || - (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28L )) { + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28L ) || + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW100 )) { res =usb_find_last_int_out_endpoint (iface_desc, &dev->int_out_endpoint);if (res) {
@@ -821,7 +825,8 @@ static int iowarrior_probe(struct usb_in ((dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 ) || (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM ) || (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28 ) || - (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW28L))) + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28L ) || + (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW100))) /* IOWarrior56 has wMaxPacketSize different from report size */ dev->report_size = 7;
Greg Kroah-Hartman
maintainerPATCH 176/237 floppy: check FDC index for errors before assigning it
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit 2e90ca68b0d2f5548804f22f0dd61145516171e3 upstream.
Jordy Zomer reported a KASAN out-of-bounds read in the floppy driver in wait_til_ready().
Which on the face of it can't happen, since as Willy Tarreau points out, the function does no particular memory access. Except through the FDCS macro, which just indexes a static allocation through teh current fdc, which is always checked against N_FDC.
Except the checking happens after we've already assigned the value.
The floppy driver is a disgrace (a lot of it going back to my original horrd "design"), and has no real maintainer. Nobody has the hardware, and nobody really cares. But it still gets used in virtual environment because it's one of those things that everybody supports.
The whole thing should be re-written, or at least parts of it should be seriously cleaned up. The 'current fdc' index, which is used by the FDCS macro, and which is often shadowed by a local 'fdc' variable, is a prime example of how not to write code.
But because nobody has the hardware or the motivation, let's just fix up the immediate problem with a nasty band-aid: test the fdc index before actually assigning it to the static 'fdc' variable.
--- drivers/block/floppy.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/block/floppy.c +5 -2
@@ -848,14 +848,17 @@ static void reset_fdc_info(int mode)/* selects the fdc and drive, and enables the fdc's input/dma. */ static void set_fdc (int drive) { +unsigned int new_fdc = fdc; +if (drive >=0 && drive <N_DRIVE ) { - fdc =FDC (drive); + new_fdc =FDC (drive); current_drive = drive; } -if (fdc !=1 && fdc !=0 ) { +if (new_fdc >=N_FDC ) {pr_info ("bad fdc value\n" );return ; } + fdc = new_fdc;set_dor (fdc, ~0 ,8 );#if N_FDC >1 set_dor (1 - fdc, ~8 ,0 );
Greg Kroah-Hartman
maintainerPATCH 177/237 vt: selection, handle pending signals in paste_selection
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
commit 687bff0cd08f790d540cfb7b2349f0d876cdddec upstream.
When pasting a selection to a vt, the task is set as INTERRUPTIBLE while waiting for a tty to unthrottle. But signals are not handled at all. Normally, this is not a problem as tty_ldisc_receive_buf receives all the goods and a user has no reason to interrupt the task.
There are two scenarios where this matters:
1) when the tty is throttled and a signal is sent to the process, it spins on a CPU until the tty is unthrottled. schedule() does not really echedule, but returns immediately, of course.
2) when the sel_buffer becomes invalid, KASAN prevents any reads from it and the loop simply does not proceed and spins forever (causing the tty to throttle, but the code never sleeps, the same as above). This sometimes happens as there is a race in the sel_buffer handling code.
So add signal handling to this ioctl (TIOCL_PASTESEL) and return -EINTR in case a signal is pending.
--- drivers/tty/vt/selection.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/tty/vt/selection.c +8 -1
@@ -27,6 +27,8 @@#include <linux/console.h> #include <linux/tty_flip.h> +#include <linux/sched/signal.h> +/* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */ #define isspace (c) ((c) == ' ')
@@ -338,6 +340,7 @@ int paste_selection(struct tty_struct *tunsigned int count;struct tty_ldisc *ld;DECLARE_WAITQUEUE (wait, current); +int ret =0 ;console_lock ();poke_blanked_console ();
@@ -351,6 +354,10 @@ int paste_selection(struct tty_struct *tadd_wait_queue (&vc->paste_wait, &wait);while (sel_buffer && sel_buffer_lth > pasted) {set_current_state (TASK_INTERRUPTIBLE ); +if (signal_pending (current)) { + ret = -EINTR ; +break ; + }if (tty_throttled (tty)) {schedule ();continue ;
@@ -366,5 +373,5 @@ int paste_selection(struct tty_struct *ttty_buffer_unlock_exclusive (&vc->port);tty_ldisc_deref (ld); -return 0 ; +return ret; }
Greg Kroah-Hartman
maintainerPATCH 178/237 staging: android: ashmem: Disallow ashmem memory from being remapped
In reply to Greg Kroah-HartmanFrom: Suren Baghdasaryan <[email protected]>
commit 6d67b0290b4b84c477e6a2fc6e005e174d3c7786 upstream.
When ashmem file is mmapped, the resulting vma->vm_file points to the backing shmem file with the generic fops that do not check ashmem permissions like fops of ashmem do. If an mremap is done on the ashmem region, then the permission checks will be skipped. Fix that by disallowing mapping operation on the backing shmem file.
--- drivers/staging/android/ashmem.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/staging/android/ashmem.c +28 -0
@@ -361,8 +361,23 @@ static inline vm_flags_t calc_vm_may_fla_calc_vm_trans (prot,PROT_EXEC ,VM_MAYEXEC ); } +static int ashmem_vmfile_mmap (struct file *file,struct vm_area_struct *vma) +{ +/* do not allow to mmap ashmem backing shmem file directly */ +return -EPERM ; +} + +static unsigned long +ashmem_vmfile_get_unmapped_area (struct file *file,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags) +{ +return current->mm->get_unmapped_area (file, addr, len, pgoff, flags); +} +static int ashmem_mmap (struct file *file,struct vm_area_struct *vma) { +static struct file_operations vmfile_fops;struct ashmem_area *asma = file->private_data;int ret =0 ;
@@ -403,6 +418,19 @@ static int ashmem_mmap(struct file *file } vmfile->f_mode |=FMODE_LSEEK ; asma->file = vmfile; +/* +* override mmap operation of the vmfile so that it can't be +* remapped which would lead to creation of a new vma with no +* asma permission checks. Have to override get_unmapped_area +* as well to prevent VM_BUG_ON check for f_ops modification. +*/ +if (!vmfile_fops.mmap) { + vmfile_fops = *vmfile->f_op; + vmfile_fops.mmap = ashmem_vmfile_mmap; + vmfile_fops.get_unmapped_area = + ashmem_vmfile_get_unmapped_area; + } + vmfile->f_op = &vmfile_fops; }get_file (asma->file);
Greg Kroah-Hartman
maintainerPATCH 179/237 staging: vt6656: fix sign of rx_dbm to bb_pre_ed_rssi.
In reply to Greg Kroah-HartmanFrom: Malcolm Priestley <[email protected]>
commit 93134df520f23f4e9998c425b8987edca7016817 upstream.
bb_pre_ed_rssi is an u8 rx_dm always returns negative signed values add minus operator to always yield positive.
fixes issue where rx sensitivity is always set to maximum because the unsigned numbers were always greater then 100.
--- drivers/staging/vt6656/dpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vt6656/dpc.c +1 -1
@@ -140,7 +140,7 @@ int vnt_rx_data(struct vnt_private *privvnt_rf_rssi_to_dbm (priv, *rssi, &rx_dbm); - priv->bb_pre_ed_rssi = (u8 )rx_dbm +1 ; + priv->bb_pre_ed_rssi = (u8)-rx_dbm +1 ; priv->current_rssi = priv->bb_pre_ed_rssi; frame = skb_data +8 ;
Greg Kroah-Hartman
maintainerPATCH 180/237 xhci: Force Maximum Packet size for Full-speed bulk devices to valid range.
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit f148b9f402ef002b57bcff3964d45abc8ffb6c3f upstream.
A Full-speed bulk USB audio device (DJ-Tech CTRL) with a invalid Maximum Packet Size of 4 causes a xHC "Parameter Error" at enumeration.
This is because valid Maximum packet sizes for Full-speed bulk endpoints are 8, 16, 32 and 64 bytes. Hosts are not required to support other values than these. See usb 2 specs section 5.8.3 for details.
The device starts working after forcing the maximum packet size to 8. This is most likely the case with other devices as well, so force the maximum packet size to a valid range.
--- drivers/usb/host/xhci-mem.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/usb/host/xhci-mem.c +9 -3
@@ -1479,9 +1479,15 @@ int xhci_endpoint_init(struct xhci_hcd */* Allow 3 retries for everything but isoc, set CErr = 3 */ if (!usb_endpoint_xfer_isoc (&ep->desc)) err_count =3 ; -/* Some devices get this wrong */ -if (usb_endpoint_xfer_bulk (&ep->desc) && udev->speed ==USB_SPEED_HIGH ) - max_packet =512 ; +/* HS bulk max packet should be 512, FS bulk supports 8, 16, 32 or 64 */ +if (usb_endpoint_xfer_bulk (&ep->desc)) { +if (udev->speed ==USB_SPEED_HIGH ) + max_packet =512 ; +if (udev->speed ==USB_SPEED_FULL ) { + max_packet =rounddown_pow_of_two (max_packet); + max_packet =clamp_val (max_packet,8 ,64 ); + } + }/* xHCI 1.0 and 1.1 indicates that ctrl ep avg TRB Length should be 8 */ if (usb_endpoint_xfer_control (&ep->desc) && xhci->hci_version >=0x100 ) avg_trb_len =8 ;
Greg Kroah-Hartman
maintainerPATCH 181/237 xhci: fix runtime pm enabling for quirky Intel hosts
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 024d411e9c5d49eb96c825af52a3ce2682895676 upstream.
Intel hosts that need the XHCI_PME_STUCK_QUIRK flag should enable runtime pm by calling xhci_pme_acpi_rtd3_enable() before usb_hcd_pci_probe() calls pci_dev_run_wake().
Otherwise usage count for the device won't be decreased, and runtime suspend is prevented.
usb_hcd_pci_probe() only decreases the usage count if device can generate run-time wake-up events, i.e. when pci_dev_run_wake() returns true.
This issue was exposed by pci_dev_run_wake() change in commit 8feaec33b986 ("PCI / PM: Always check PME wakeup capability for runtime wakeup support")
and should be backported to kernels with that change
--- drivers/usb/host/xhci-pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/host/xhci-pci.c +3 -3
@@ -284,6 +284,9 @@ static int xhci_pci_setup(struct usb_hcdif (!usb_hcd_is_primary_hcd (hcd))return 0 ; +if (xhci->quirks &XHCI_PME_STUCK_QUIRK ) +xhci_pme_acpi_rtd3_enable (pdev); +xhci_dbg (xhci,"Got SBRN %u\n" , (unsigned int ) xhci->sbrn);/* Find any debug ports */
@@ -344,9 +347,6 @@ static int xhci_pci_probe(struct pci_dev HCC_MAX_PSA(xhci->hcc_params) >= 4) xhci->shared_hcd->can_do_streams =1 ; -if (xhci->quirks &XHCI_PME_STUCK_QUIRK ) -xhci_pme_acpi_rtd3_enable (dev); -/* USB-2 and USB-3 roothubs initialized, allow runtime pm suspend */ pm_runtime_put_noidle (&dev->dev);
Greg Kroah-Hartman
maintainerPATCH 182/237 usb: host: xhci: update event ring dequeue pointer on purpose
In reply to Greg Kroah-HartmanFrom: Peter Chen <[email protected]>
commit dc0ffbea5729a3abafa577ebfce87f18b79e294b upstream.
On some situations, the software handles TRB events slower than adding TRBs, then xhci_handle_event can't return zero long time, the xHC will consider the event ring is full, and trigger "Event Ring Full" error, but in fact, the software has already finished lots of events, just no chance to update ERDP (event ring dequeue pointer).
In this commit, we force update ERDP if half of TRBS_PER_SEGMENT events have handled to avoid "Event Ring Full" error.
--- drivers/usb/host/xhci-ring.c | 60 ++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 17 deletions(-)
drivers/usb/host/xhci-ring.c +43 -17
@@ -2759,6 +2759,42 @@ static int xhci_handle_event(struct xhci }/* +* Update Event Ring Dequeue Pointer: +* - When all events have finished +* - To avoid "Event Ring Full Error" condition +*/ +static void xhci_update_erst_dequeue (struct xhci_hcd *xhci, +union xhci_trb *event_ring_deq) +{ +u64 temp_64; +dma_addr_t deq; + + temp_64 =xhci_read_64 (xhci, &xhci->ir_set->erst_dequeue); +/* If necessary, update the HW's version of the event ring deq ptr. */ +if (event_ring_deq != xhci->event_ring->dequeue) { + deq =xhci_trb_virt_to_dma (xhci->event_ring->deq_seg, + xhci->event_ring->dequeue); +if (deq ==0 ) +xhci_warn (xhci,"WARN something wrong with SW event ring dequeue ptr\n" ); +/* +* Per 4.9.4, Software writes to the ERDP register shall +* always advance the Event Ring Dequeue Pointer value. +*/ +if ((temp_64 & (u64 ) ~ERST_PTR_MASK ) == + ((u64 ) deq & (u64 ) ~ERST_PTR_MASK )) +return ; + +/* Update HC event ring dequeue pointer */ + temp_64 &=ERST_PTR_MASK ; + temp_64 |= ((u64 ) deq & (u64 ) ~ERST_PTR_MASK ); + } + +/* Clear the event handler busy flag (RW1C) */ + temp_64 |=ERST_EHB ; +xhci_write_64 (xhci, temp_64, &xhci->ir_set->erst_dequeue); +} + +/* * xHCI spec says we can get an interrupt, and if the HC has an error condition, * we might get bad data out of the event ring. Section 4.10.2.7 has a list of * indicators of an event TRB error, but we check the status *first* to be safe.
@@ -2769,9 +2805,9 @@ irqreturn_t xhci_irq(struct usb_hcd *hcdunion xhci_trb *event_ring_deq;irqreturn_t ret =IRQ_NONE ;unsigned long flags; -dma_addr_t deq;u64 temp_64;u32 status; +int event_loop =0 ;spin_lock_irqsave (&xhci->lock, flags);/* Check if the xHC generated the interrupt, or the irq is shared */
@@ -2825,24 +2861,14 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd/* FIXME this should be a delayed service routine * that clears the EHB. */ -while (xhci_handle_event (xhci) >0 ) {} - - temp_64 =xhci_read_64 (xhci, &xhci->ir_set->erst_dequeue); -/* If necessary, update the HW's version of the event ring deq ptr. */ -if (event_ring_deq != xhci->event_ring->dequeue) { - deq =xhci_trb_virt_to_dma (xhci->event_ring->deq_seg, - xhci->event_ring->dequeue); -if (deq ==0 ) -xhci_warn (xhci,"WARN something wrong with SW event " -"ring dequeue ptr.\n" ); -/* Update HC event ring dequeue pointer */ - temp_64 &=ERST_PTR_MASK ; - temp_64 |= ((u64 ) deq & (u64 ) ~ERST_PTR_MASK ); +while (xhci_handle_event (xhci) >0 ) { +if (event_loop++ <TRBS_PER_SEGMENT /2 ) +continue ; +xhci_update_erst_dequeue (xhci, event_ring_deq); + event_loop =0 ; } -/* Clear the event handler busy flag (RW1C); event ring is empty. */ - temp_64 |=ERST_EHB ; -xhci_write_64 (xhci, temp_64, &xhci->ir_set->erst_dequeue); +xhci_update_erst_dequeue (xhci, event_ring_deq); ret =IRQ_HANDLED ; out:
Greg Kroah-Hartman
maintainerPATCH 183/237 usb: uas: fix a plug & unplug racing
In reply to Greg Kroah-HartmanFrom: EJ Hsu <[email protected]>
commit 3e99862c05a9caa5a27969f41566b428696f5a9a upstream.
When a uas disk is plugged into an external hub, uas_probe() will be called by the hub thread to do the probe. It will first create a SCSI host and then do the scan for this host. During the scan, it will probe the LUN using SCSI INQUERY command which will be packed in the URB and submitted to uas disk.
There might be a chance that this external hub with uas disk attached is unplugged during the scan. In this case, uas driver will fail to submit the URB (due to the NOTATTACHED state of uas device) and try to put this SCSI command back to request queue waiting for next chance to run.
In normal case, this cycle will terminate when hub thread gets disconnection event and calls into uas_disconnect() accordingly. But in this case, uas_disconnect() will not be called because hub thread of external hub gets stuck waiting for the completion of this SCSI command. A deadlock happened.
In this fix, uas will call scsi_scan_host() asynchronously to avoid the blocking of hub thread.
--- drivers/usb/storage/uas.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/usb/storage/uas.c +22 -1
@@ -46,6 +46,7 @@ struct uas_dev_info {struct scsi_cmnd *cmnd[MAX_CMNDS ];spinlock_t lock;struct work_struct work; +struct work_struct scan_work;/* for async scanning */ };enum {
@@ -115,6 +116,17 @@ out:spin_unlock_irqrestore (&devinfo->lock, flags); } +static void uas_scan_work (struct work_struct *work) +{ +struct uas_dev_info *devinfo = + container_of(work, struct uas_dev_info, scan_work); +struct Scsi_Host *shost =usb_get_intfdata (devinfo->intf); + +dev_dbg (&devinfo->intf->dev,"starting scan\n" ); +scsi_scan_host (shost); +dev_dbg (&devinfo->intf->dev,"scan complete\n" ); +} +static void uas_add_work (struct uas_cmd_info *cmdinfo) {struct scsi_pointer *scp = (void *)cmdinfo;
@@ -989,6 +1001,7 @@ static int uas_probe(struct usb_interfacinit_usb_anchor (&devinfo->data_urbs);spin_lock_init (&devinfo->lock);INIT_WORK (&devinfo->work, uas_do_work); +INIT_WORK (&devinfo->scan_work, uas_scan_work); result =uas_configure_endpoints (devinfo);if (result)
@@ -1005,7 +1018,9 @@ static int uas_probe(struct usb_interfacif (result) goto free_streams; -scsi_scan_host (shost); +/* Submit the delayed_work for SCSI-device scanning */ +schedule_work (&devinfo->scan_work); +return result; free_streams:
@@ -1173,6 +1188,12 @@ static void uas_disconnect(struct usb_inusb_kill_anchored_urbs (&devinfo->data_urbs);uas_zap_pending (devinfo,DID_NO_CONNECT ); +/* +* Prevent SCSI scanning (if it hasn't started yet) +* or wait for the SCSI-scanning routine to stop. +*/ +cancel_work_sync (&devinfo->scan_work); +scsi_remove_host (shost);uas_free_streams (devinfo);scsi_host_put (shost);
Greg Kroah-Hartman
maintainerPATCH 184/237 USB: Fix novation SourceControl XL after suspend
In reply to Greg Kroah-HartmanFrom: Richard Dodd <[email protected]>
commit b692056db8ecc7f452b934f016c17348282b7699 upstream.
Currently, the SourceControl will stay in power-down mode after resuming from suspend. This patch resets the device after suspend to power it up.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -291,6 +291,9 @@ static const struct usb_device_id usb_qu/* INTEL VALUE SSD */ { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME }, + /* novation SoundControl XL */ + { USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME }, + { }/* terminating entry must be last */ };
Greg Kroah-Hartman
maintainerPATCH 185/237 USB: hub: Dont record a connect-change event during reset-resume
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 8099f58f1ecddf4f374f4828a3dff8397c7cbd74 upstream.
Paul Zimmerman reports that his USB Bluetooth adapter sometimes crashes following system resume, when it receives a Get-Device-Descriptor request while it is busy doing something else.
Such a request was added by commit a4f55d8b8c14 ("usb: hub: Check device descriptor before resusciation"). It gets sent when the hub driver's work thread checks whether a connect-change event on an enabled port really indicates a new device has been connected, as opposed to an old device momentarily disconnecting and then reconnecting (which can happen with xHCI host controllers, since they automatically enable connected ports).
The same kind of thing occurs when a port's power session is lost during system suspend. When the system wakes up it sees a connect-change event on the port, and if the child device's persist_enabled flag was set then hub_activate() sets the device's reset_resume flag as well as the port's bit in hub->change_bits. The reset-resume code then takes responsibility for checking that the same device is still attached to the port, and it does this as part of the device's resume pathway. By the time the hub driver's work thread starts up again, the device has already been fully reinitialized and is busy doing its own thing. There's no need for the work thread to do the same check a second time, and in fact this unnecessary check is what caused the problem that Paul observed.
Note that performing the unnecessary check is not actually a bug. Devices are supposed to be able to send descriptors back to the host even when they are busy doing something else. The underlying cause of Paul's problem lies in his Bluetooth adapter. Nevertheless, we shouldn't perform the same check twice in a row -- and as a nice side benefit, removing the extra check allows the Bluetooth adapter to work more reliably.
The work thread performs its check when it sees that the port's bit is set in hub->change_bits. In this situation that bit is interpreted as though a connect-change event had occurred on the port _after_ the reset-resume, which is not what actually happened.
One possible fix would be to make the reset-resume code clear the port's bit in hub->change_bits. But it seems simpler to just avoid setting the bit during hub_activate() in the first place. That's what this patch does.
(Proving that the patch is correct when CONFIG_PM is disabled requires a little thought. In that setting hub_activate() will be called only for initialization and resets, since there won't be any resumes or reset-resumes. During initialization and hub resets the hub doesn't have any child devices, and so this code path never gets executed.)
--- drivers/usb/core/hub.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/usb/core/hub.c +0 -5
@@ -1189,11 +1189,6 @@ static void hub_activate(struct usb_hub#ifdef CONFIG_PM udev->reset_resume =1 ;#endif -/* Don't set the change_bits when the device -* was powered off. -*/ -if (test_bit (port1, hub->power_bits)) -set_bit (port1, hub->change_bits); }else {/* The power session is gone; tell hub_wq */
Greg Kroah-Hartman
maintainerPATCH 186/237 USB: hub: Fix the broken detection of USB3 device in SMSC hub
In reply to Greg Kroah-HartmanFrom: Hardik Gajjar <[email protected]>
commit 1208f9e1d758c991b0a46a1bd60c616b906bbe27 upstream.
Renesas R-Car H3ULCB + Kingfisher Infotainment Board is either not able to detect the USB3.0 mass storage devices or is detecting those as USB2.0 high speed devices.
The explanation given by Renesas is that, due to a HW issue, the XHCI driver does not wake up after going to sleep on connecting a USB3.0 device.
In order to mitigate that, disable the auto-suspend feature specifically for SMSC hubs from hub_probe() function, as a quirk.
Renesas Kingfisher Infotainment Board has two USB3.0 ports (CN2) which are connected via USB5534B 4-port SuperSpeed/Hi-Speed, low-power, configurable hub controller.
[1] SanDisk USB 3.0 device detected as USB-2.0 before the patch
[ 74.036390] usb 5-1.1: new high-speed USB device number 4 using xhci-hcd [ 74.061598] usb 5-1.1: New USB device found, idVendor=0781, idProduct=5581, bcdDevice= 1.00 [ 74.069976] usb 5-1.1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 74.077303] usb 5-1.1: Product: Ultra [ 74.080980] usb 5-1.1: Manufacturer: SanDisk [ 74.085263] usb 5-1.1: SerialNumber: 4C530001110208116550
[2] SanDisk USB 3.0 device detected as USB-3.0 after the patch
[ 34.565078] usb 6-1.1: new SuperSpeed Gen 1 USB device number 3 using xhci-hcd [ 34.588719] usb 6-1.1: New USB device found, idVendor=0781, idProduct=5581, bcdDevice= 1.00 [ 34.597098] usb 6-1.1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 34.604430] usb 6-1.1: Product: Ultra [ 34.608110] usb 6-1.1: Manufacturer: SanDisk [ 34.612397] usb 6-1.1: SerialNumber: 4C530001110208116550
--- drivers/usb/core/hub.c | 15 +++++++++++++++ drivers/usb/core/hub.h | 1 + 2 files changed, 16 insertions(+)
drivers/usb/core/hub.c +15 -0
@@ -36,7 +36,9 @@#include "otg_whitelist.h" #define USB_VENDOR_GENESYS_LOGIC 0x05e3 +#define USB_VENDOR_SMSC 0x0424#define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND 0x01 +#define HUB_QUIRK_DISABLE_AUTOSUSPEND 0x02/* Protect struct usb_device->state and ->children members * Note: Both are also protected by ->dev.sem, except that ->state can
@@ -1680,6 +1682,10 @@ static void hub_disconnect(struct usb_inkfree (hub->buffer);pm_suspend_ignore_children (&intf->dev, false); + +if (hub->quirk_disable_autosuspend) +usb_autopm_put_interface (intf); +kref_put (&hub->kref, hub_release); }
@@ -1810,6 +1816,11 @@ static int hub_probe(struct usb_interfacif (id->driver_info &HUB_QUIRK_CHECK_PORT_AUTOSUSPEND ) hub->quirk_check_port_auto_suspend =1 ; +if (id->driver_info &HUB_QUIRK_DISABLE_AUTOSUSPEND ) { + hub->quirk_disable_autosuspend =1 ; +usb_autopm_get_interface (intf); + } +if (hub_configure (hub, &desc->endpoint[0 ].desc) >=0 )return 0 ;
@@ -5288,6 +5299,10 @@ out_hdev_lock: }static const struct usb_device_id hub_id_table[] = { + { .match_flags =USB_DEVICE_ID_MATCH_VENDOR |USB_DEVICE_ID_MATCH_INT_CLASS , + .idVendor =USB_VENDOR_SMSC , + .bInterfaceClass =USB_CLASS_HUB , + .driver_info =HUB_QUIRK_DISABLE_AUTOSUSPEND }, { .match_flags =USB_DEVICE_ID_MATCH_VENDOR |USB_DEVICE_ID_MATCH_INT_CLASS , .idVendor =USB_VENDOR_GENESYS_LOGIC ,
drivers/usb/core/hub.h +1 -0
@@ -69,6 +69,7 @@ struct usb_hub { unsigned quiescing:1; unsigned disconnected:1; unsigned in_reset:1; + unsigned quirk_disable_autosuspend:1; unsigned quirk_check_port_auto_suspend:1;
Greg Kroah-Hartman
maintainerPATCH 187/237 staging: rtl8188eu: Fix potential security hole
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit 499c405b2b80bb3a04425ba3541d20305e014d3e upstream.
In routine rtw_hostapd_ioctl(), the user-controlled p->length is assumed to be at least the size of struct ieee_param size, but this assumption is never checked. This could result in out-of-bounds read/write on kernel heap in case a p->length less than the size of struct ieee_param is specified by the user. If p->length is allowed to be greater than the size of the struct, then a malicious user could be wasting kernel memory. Fixes commit a2c60d42d97c ("Add files for new driver - part 16").
Reported by: Pietro Oliva <[email protected]>
--- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +1 -1
@@ -2856,7 +2856,7 @@ static int rtw_hostapd_ioctl(struct net_ goto out; } -if (!p->pointer) { +if (!p->pointer || p->length !=sizeof (struct ieee_param )) { ret = -EINVAL ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 188/237 staging: rtl8188eu: Fix potential overuse of kernel memory
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit 4ddf8ab8d15ddbc52eefb44eb64e38466ce1f70f upstream.
In routine wpa_supplicant_ioctl(), the user-controlled p->length is checked to be at least the size of struct ieee_param size, but the code does not detect the case where p->length is greater than the size of the struct, thus a malicious user could be wasting kernel memory. Fixes commit a2c60d42d97c ("Add files for new driver - part 16").
Reported by: Pietro Oliva <[email protected]>
Cc: Pietro Oliva <[email protected]>
Cc: Stable <[email protected]>
Fixes commit a2c60d42d97c ("Add files for new driver - part 16").
--- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +1 -1
@@ -2051,7 +2051,7 @@ static int wpa_supplicant_ioctl(struct nstruct ieee_param *param;uint ret =0 ; -if (p->length <sizeof (struct ieee_param ) || !p->pointer) { +if (!p->pointer || p->length !=sizeof (struct ieee_param )) { ret = -EINVAL ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 189/237 staging: rtl8723bs: Fix potential security hole
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit ac33597c0c0d1d819dccfe001bcd0acef7107e7c upstream.
In routine rtw_hostapd_ioctl(), the user-controlled p->length is assumed to be at least the size of struct ieee_param size, but this assumption is never checked. This could result in out-of-bounds read/write on kernel heap in case a p->length less than the size of struct ieee_param is specified by the user. If p->length is allowed to be greater than the size of the struct, then a malicious user could be wasting kernel memory. Fixes commit 554c0a3abf216 ("0taging: Add rtl8723bs sdio wifi driver").
Reported by: Pietro Oliva <[email protected]>
Cc: Pietro Oliva <[email protected]>
Cc: Stable <[email protected]>
Fixes 554c0a3abf216 ("0taging: Add rtl8723bs sdio wifi driver").
--- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +1 -1
@@ -4340,7 +4340,7 @@ static int rtw_hostapd_ioctl(struct net_/* if (p->length < sizeof(struct ieee_param) || !p->pointer) { */ -if (!p->pointer) { +if (!p->pointer || p->length !=sizeof (*param)) { ret = -EINVAL ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 190/237 staging: rtl8723bs: Fix potential overuse of kernel memory
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit 23954cb078febfc63a755301fe77e06bccdb4d2a upstream.
In routine wpa_supplicant_ioctl(), the user-controlled p->length is checked to be at least the size of struct ieee_param size, but the code does not detect the case where p->length is greater than the size of the struct, thus a malicious user could be wasting kernel memory. Fixes commit 554c0a3abf216 ("staging: Add rtl8723bs sdio wifi driver").
Reported by: Pietro Oliva <[email protected]>
--- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +1 -1
@@ -3495,7 +3495,7 @@ static int wpa_supplicant_ioctl(struct n/* down(&ieee->wx_sem); */ -if (p->length <sizeof (struct ieee_param ) || !p->pointer) { +if (!p->pointer || p->length !=sizeof (struct ieee_param )) { ret = -EINVAL ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 191/237 x86/mce/amd: Publish the bank pointer only after setup has succeeded
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
commit 6e5cf31fbe651bed7ba1df768f2e123531132417 upstream.
threshold_create_bank() creates a bank descriptor per MCA error thresholding counter which can be controlled over sysfs. It publishes the pointer to that bank in a per-CPU variable and then goes on to create additional thresholding blocks if the bank has such.
However, that creation of additional blocks in allocate_threshold_blocks() can fail, leading to a use-after-free through the per-CPU pointer.
Therefore, publish that pointer only after all blocks have been setup successfully.
--- arch/x86/kernel/cpu/mcheck/mce_amd.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
arch/x86/kernel/cpu/mcheck/mce_amd.c +16 -17
@@ -1151,8 +1151,9 @@ static const char *get_name(unsigned intreturn buf_mcatype; } -static int allocate_threshold_blocks (unsigned int cpu,unsigned int bank, -unsigned int block,u32 address) +static int allocate_threshold_blocks (unsigned int cpu,struct threshold_bank *tb, +unsigned int bank,unsigned int block, +u32 address) {struct threshold_block *b =NULL ;u32 low, high;
@@ -1196,16 +1197,12 @@ static int allocate_threshold_blocks(unsINIT_LIST_HEAD (&b->miscj); -if (per_cpu (threshold_banks, cpu)[bank]->blocks) { -list_add (&b->miscj, - &per_cpu (threshold_banks, cpu)[bank]->blocks->miscj); - }else { -per_cpu (threshold_banks, cpu)[bank]->blocks = b; - } +if (tb->blocks) +list_add (&b->miscj, &tb->blocks->miscj); +else + tb->blocks = b; - err =kobject_init_and_add (&b->kobj, &threshold_ktype, -per_cpu (threshold_banks, cpu)[bank]->kobj, -get_name (bank, b)); + err =kobject_init_and_add (&b->kobj, &threshold_ktype, tb->kobj,get_name (bank, b));if (err) goto out_free; recurse:
@@ -1213,7 +1210,7 @@ recurse:if (!address)return 0 ; - err =allocate_threshold_blocks (cpu, bank, block, address); + err =allocate_threshold_blocks (cpu, tb, bank, block, address);if (err) goto out_free;
@@ -1298,8 +1295,6 @@ static int threshold_create_bank(unsigne goto out_free; } -per_cpu (threshold_banks, cpu)[bank] = b; -if (is_shared_bank (bank)) {refcount_set (&b->cpus,1 );
@@ -1310,9 +1305,13 @@ static int threshold_create_bank(unsigne } } - err =allocate_threshold_blocks (cpu, bank,0 , msr_ops.misc (bank)); -if (!err) - goto out; + err =allocate_threshold_blocks (cpu, b, bank,0 , msr_ops.misc (bank)); +if (err) + goto out_free; + +per_cpu (threshold_banks, cpu)[bank] = b; + +return 0 ; out_free:kfree (b);
Greg Kroah-Hartman
maintainerPATCH 192/237 x86/mce/amd: Fix kobject lifetime
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit 51dede9c05df2b78acd6dcf6a17d21f0877d2d7b upstream.
Accessing the MCA thresholding controls in sysfs concurrently with CPU hotplug can lead to a couple of KASAN-reported issues:
BUG: KASAN: use-after-free in sysfs_file_ops+0x155/0x180 Read of size 8 at addr ffff888367578940 by task grep/4019
and
BUG: KASAN: use-after-free in show_error_count+0x15c/0x180 Read of size 2 at addr ffff888368a05514 by task grep/4454
for example. Both result from the fact that the threshold block creation/teardown code frees the descriptor memory itself instead of defining proper ->release function and leaving it to the driver core to take care of that, after all sysfs accesses have completed.
Do that and get rid of the custom freeing code, fixing the above UAFs in the process.
[ bp: write commit message. ]
--- arch/x86/kernel/cpu/mcheck/mce_amd.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/mcheck/mce_amd.c +11 -6
@@ -1116,9 +1116,12 @@ static const struct sysfs_ops threshold_ .store = store, }; +static void threshold_block_release (struct kobject *kobj); +static struct kobj_type threshold_ktype = { .sysfs_ops = &threshold_ops, .default_attrs = default_attrs, + .release = threshold_block_release, };static const char *get_name (unsigned int bank,struct threshold_block *b)
@@ -1320,8 +1323,12 @@ static int threshold_create_bank(unsignereturn err; } -static void deallocate_threshold_block (unsigned int cpu, -unsigned int bank) +static void threshold_block_release (struct kobject *kobj) +{ +kfree (to_block (kobj)); +} + +static void deallocate_threshold_block (unsigned int cpu,unsigned int bank) {struct threshold_block *pos =NULL ;struct threshold_block *tmp =NULL ;
@@ -1331,13 +1338,11 @@ static void deallocate_threshold_block(ureturn ;list_for_each_entry_safe (pos, tmp, &head->blocks->miscj, miscj) { -kobject_put (&pos->kobj);list_del (&pos->miscj); -kfree (pos); +kobject_put (&pos->kobj); } -kfree (per_cpu (threshold_banks, cpu)[bank]->blocks); -per_cpu (threshold_banks, cpu)[bank]->blocks =NULL ; +kobject_put (&head->blocks->kobj); }static void __threshold_remove_blocks (struct threshold_bank *b)
Greg Kroah-Hartman
maintainerPATCH 193/237 tty/serial: atmel: manage shutdown in case of RS485 or ISO7816 mode
In reply to Greg Kroah-HartmanFrom: Nicolas Ferre <[email protected]>
commit 04b5bfe3dc94e64d0590c54045815cb5183fb095 upstream.
In atmel_shutdown() we call atmel_stop_rx() and atmel_stop_tx() functions. Prevent the rx restart that is implemented in RS485 or ISO7816 modes when calling atmel_stop_tx() by using the atomic information tasklet_shutdown that is already in place for this purpose.
--- drivers/tty/serial/atmel_serial.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/tty/serial/atmel_serial.c +2 -1
@@ -498,7 +498,8 @@ static void atmel_stop_tx(struct uart_poatmel_uart_writel (port,ATMEL_US_IDR , atmel_port->tx_done_mask);if (atmel_uart_is_half_duplex (port)) -atmel_start_rx (port); +if (!atomic_read (&atmel_port->tasklet_shutdown)) +atmel_start_rx (port); }
Greg Kroah-Hartman
maintainerPATCH 194/237 tty: serial: imx: setup the correct sg entry for tx dma
In reply to Greg Kroah-HartmanFrom: Fugang Duan <[email protected]>
commit f76707831829530ffdd3888bebc108aecefccaa0 upstream.
There has oops as below happen on i.MX8MP EVK platform that has 6G bytes DDR memory.
when (xmit->tail < xmit->head) && (xmit->head == 0), it setups one sg entry with sg->length is zero:
sg_set_buf(sgl + 1, xmit->buf, xmit->head);
if xmit->buf is allocated from >4G address space, and SDMA only support <4G address space, then dma_map_sg() will call swiotlb_map() to do bounce buffer copying and mapping.
But swiotlb_map() don't allow sg entry's length is zero, otherwise report BUG_ON().
So the patch is to correct the tx DMA scatter list.
Oops:
[ 287.675715] kernel BUG at kernel/dma/swiotlb.c:497! [ 287.680592] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP [ 287.686075] Modules linked in: [ 287.689133] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.4.3-00016-g3fdc4e0-dirty #10 [ 287.696872] Hardware name: FSL i.MX8MP EVK (DT) [ 287.701402] pstate: 80000085 (Nzcv daIf -PAN -UAO) [ 287.706199] pc : swiotlb_tbl_map_single+0x1fc/0x310 [ 287.711076] lr : swiotlb_map+0x60/0x148 [ 287.714909] sp : ffff800010003c00 [ 287.718221] x29: ffff800010003c00 x28: 0000000000000000 [ 287.723533] x27: 0000000000000040 x26: ffff800011ae0000 [ 287.728844] x25: ffff800011ae09f8 x24: 0000000000000000 [ 287.734155] x23: 00000001b7af9000 x22: 0000000000000000 [ 287.739465] x21: ffff000176409c10 x20: 00000000001f7ffe [ 287.744776] x19: ffff000176409c10 x18: 000000000000002e [ 287.750087] x17: 0000000000000000 x16: 0000000000000000 [ 287.755397] x15: 0000000000000000 x14: 0000000000000000 [ 287.760707] x13: ffff00017f334000 x12: 0000000000000001 [ 287.766018] x11: 00000000001fffff x10: 0000000000000000 [ 287.771328] x9 : 0000000000000003 x8 : 0000000000000000 [ 287.776638] x7 : 0000000000000000 x6 : 0000000000000000 [ 287.781949] x5 : 0000000000200000 x4 : 0000000000000000 [ 287.787259] x3 : 0000000000000001 x2 : 00000001b7af9000 [ 287.792570] x1 : 00000000fbfff000 x0 : 0000000000000000 [ 287.797881] Call trace: [ 287.800328] swiotlb_tbl_map_single+0x1fc/0x310 [ 287.804859] swiotlb_map+0x60/0x148 [ 287.808347] dma_direct_map_page+0xf0/0x130 [ 287.812530] dma_direct_map_sg+0x78/0xe0 [ 287.816453] imx_uart_dma_tx+0x134/0x2f8 [ 287.820374] imx_uart_dma_tx_callback+0xd8/0x168 [ 287.824992] vchan_complete+0x194/0x200 [ 287.828828] tasklet_action_common.isra.0+0x154/0x1a0 [ 287.833879] tasklet_action+0x24/0x30 [ 287.837540] __do_softirq+0x120/0x23c [ 287.841202] irq_exit+0xb8/0xd8 [ 287.844343] __handle_domain_irq+0x64/0xb8 [ 287.848438] gic_handle_irq+0x5c/0x148 [ 287.852185] el1_irq+0xb8/0x180 [ 287.855327] cpuidle_enter_state+0x84/0x360 [ 287.859508] cpuidle_enter+0x34/0x48 [ 287.863083] call_cpuidle+0x18/0x38 [ 287.866571] do_idle+0x1e0/0x280 [ 287.869798] cpu_startup_entry+0x20/0x40 [ 287.873721] rest_init+0xd4/0xe0 [ 287.876949] arch_call_rest_init+0xc/0x14 [ 287.880958] start_kernel+0x420/0x44c [ 287.884622] Code: 9124c021 9417aff8 a94363f7 17ffffd5 (d4210000) [ 287.890718] ---[ end trace 5bc44c4ab6b009ce ]--- [ 287.895334] Kernel panic - not syncing: Fatal exception in interrupt [ 287.901686] SMP: stopping secondary CPUs [ 288.905607] SMP: failed to stop secondary CPUs 0-1 [ 288.910395] Kernel Offset: disabled [ 288.913882] CPU features: 0x0002,2000200c [ 288.917888] Memory Limit: none [ 288.920944] ---[ end Kernel panic - not syncing: Fatal exception in interrupt ]---
--- drivers/tty/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/imx.c +1 -1
@@ -557,7 +557,7 @@ static void imx_dma_tx(struct imx_port * sport->tx_bytes =uart_circ_chars_pending (xmit); -if (xmit->tail < xmit->head) { +if (xmit->tail < xmit->head || xmit->head ==0 ) { sport->dma_tx_nents =1 ;sg_init_one (sgl, xmit->buf + xmit->tail, sport->tx_bytes); }else {
Greg Kroah-Hartman
maintainerPATCH 195/237 serdev: ttyport: restore client ops on deregistration
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 0c5aae59270fb1f827acce182786094c9ccf598e upstream.
The serdev tty-port controller driver should reset the tty-port client operations also on deregistration to avoid a NULL-pointer dereference in case the port is later re-registered as a normal tty device.
Note that this can only happen with tty drivers such as 8250 which have statically allocated port structures that can end up being reused and where a later registration would not register a serdev controller (e.g. due to registration errors or if the devicetree has been changed in between).
Specifically, this can be an issue for any statically defined ports that would be registered by 8250 core when an 8250 driver is being unbound.
--- drivers/tty/serdev/serdev-ttyport.c | 6 ++---- drivers/tty/tty_port.c | 5 +++-- include/linux/tty.h | 2 ++ 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/tty/serdev/serdev-ttyport.c +2 -4
@@ -238,7 +238,6 @@ struct device *serdev_tty_port_register(struct device *parent, struct tty_driver *drv, int idx) { - const struct tty_port_client_operations *old_ops; struct serdev_controller *ctrl;struct serport *serport;int ret;
@@ -257,7 +256,6 @@ struct device *serdev_tty_port_register( ctrl->ops = &ctrl_ops; - old_ops = port->client_ops; port->client_ops = &client_ops; port->client_data = ctrl;
@@ -270,7 +268,7 @@ struct device *serdev_tty_port_register( err_reset_data: port->client_data =NULL ; - port->client_ops = old_ops; + port->client_ops = &tty_port_default_client_ops;serdev_controller_put (ctrl);return ERR_PTR (ret);
@@ -285,8 +283,8 @@ int serdev_tty_port_unregister(struct ttreturn -ENODEV ;serdev_controller_remove (ctrl); - port->client_ops =NULL ; port->client_data =NULL ; + port->client_ops = &tty_port_default_client_ops;serdev_controller_put (ctrl);return 0 ;
drivers/tty/tty_port.c +3 -2
@@ -51,10 +51,11 @@ static void tty_port_default_wakeup(stru } } -static const struct tty_port_client_operations default_client_ops = { +const struct tty_port_client_operations tty_port_default_client_ops = { .receive_buf = tty_port_default_receive_buf, .write_wakeup = tty_port_default_wakeup, }; +EXPORT_SYMBOL_GPL (tty_port_default_client_ops);void tty_port_init (struct tty_port *port) {
@@ -67,7 +68,7 @@ void tty_port_init(struct tty_port *portspin_lock_init (&port->lock); port->close_delay = (50 *HZ ) /100 ; port->closing_wait = (3000 *HZ ) /100 ; - port->client_ops = &default_client_ops; + port->client_ops = &tty_port_default_client_ops;kref_init (&port->kref); }EXPORT_SYMBOL (tty_port_init);
include/linux/tty.h +2 -0
@@ -224,6 +224,8 @@ struct tty_port_client_operations {void (*write_wakeup)(struct tty_port *port); }; +extern const struct tty_port_client_operations tty_port_default_client_ops; +struct tty_port {struct tty_bufhead buf;/* Locked internally */ struct tty_struct *tty;/* Back pointer */
Greg Kroah-Hartman
maintainerPATCH 196/237 MAINTAINERS: Update drm/i915 bug filing URL
In reply to Greg Kroah-HartmanFrom: Jani Nikula <[email protected]>
commit 96228b7df33f8eb9006f8ae96949400aed9bd303 upstream.
We've moved from bugzilla to gitlab.
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
@@ -6877,7 +6877,7 @@ M: Joonas Lahtinen <joonas.lahtinen@linu M: Rodrigo Vivi <[email protected]> L: [email protected] W: https://01.org/linuxgraphics/ -B: https://01.org/linuxgraphics/documentation/how-report-bugs +B: https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs C: irc://chat.freenode.net/intel-gfx Q: http://patchwork.freedesktop.org/project/intel-gfx/ T: git git://anongit.freedesktop.org/drm-intel
Greg Kroah-Hartman
maintainerPATCH 197/237 Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()"
In reply to Greg Kroah-HartmanFrom: Ioanna Alifieraki <[email protected]>
commit edf28f4061afe4c2d9eb1c3323d90e882c1d6800 upstream.
This reverts commit a97955844807e327df11aa33869009d14d6b7de0.
Commit a97955844807 ("ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()") removes a lock that is needed. This leads to a process looping infinitely in exit_sem() and can also lead to a crash. There is a reproducer available in [1] and with the commit reverted the issue does not reproduce anymore.
Using the reproducer found in [1] is fairly easy to reach a point where one of the child processes is looping infinitely in exit_sem between for(;;) and if (semid == -1) block, while it's trying to free its last sem_undo structure which has already been freed by freeary().
Each sem_undo struct is on two lists: one per semaphore set (list_id) and one per process (list_proc). The list_id list tracks undos by semaphore set, and the list_proc by process.
Undo structures are removed either by freeary() or by exit_sem(). The freeary function is invoked when the user invokes a syscall to remove a semaphore set. During this operation freeary() traverses the list_id associated with the semaphore set and removes the undo structures from both the list_id and list_proc lists.
For this case, exit_sem() is called at process exit. Each process contains a struct sem_undo_list (referred to as "ulp") which contains the head for the list_proc list. When the process exits, exit_sem() traverses this list to remove each sem_undo struct. As in freeary(), whenever a sem_undo struct is removed from list_proc, it is also removed from the list_id list.
Removing elements from list_id is safe for both exit_sem() and freeary() due to sem_lock(). Removing elements from list_proc is not safe; freeary() locks &un->ulp->lock when it performs list_del_rcu(&un->list_proc) but exit_sem() does not (locking was removed by commit a97955844807 ("ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()").
This can result in the following situation while executing the reproducer [1] : Consider a child process in exit_sem() and the parent in freeary() (because of semctl(sid[i], NSEM, IPC_RMID)).
- The list_proc for the child contains the last two undo structs A and B (the rest have been removed either by exit_sem() or freeary()).
- The semid for A is 1 and semid for B is 2.
- exit_sem() removes A and at the same time freeary() removes B.
- Since A and B have different semid sem_lock() will acquire different locks for each process and both can proceed.
The bug is that they remove A and B from the same list_proc at the same time because only freeary() acquires the ulp lock. When exit_sem() removes A it makes ulp->list_proc.next to point at B and at the same time freeary() removes B setting B->semid=-1.
At the next iteration of for(;;) loop exit_sem() will try to remove B.
The only way to break from for(;;) is for (&un->list_proc == &ulp->list_proc) to be true which is not. Then exit_sem() will check if B->semid=-1 which is and will continue looping in for(;;) until the memory for B is reallocated and the value at B->semid is changed.
At that point, exit_sem() will crash attempting to unlink B from the lists (this can be easily triggered by running the reproducer [1] a second time).
To prove this scenario instrumentation was added to keep information about each sem_undo (un) struct that is removed per process and per semaphore set (sma).
CPU0 CPU1
[caller holds sem_lock(sma for A)] ... freeary() exit_sem() ... ... ... sem_lock(sma for B) spin_lock(A->ulp->lock) ... list_del_rcu(un_A->list_proc) list_del_rcu(un_B->list_proc)
Undo structures A and B have different semid and sem_lock() operations proceed. However they belong to the same list_proc list and they are removed at the same time. This results into ulp->list_proc.next pointing to the address of B which is already removed.
After reverting commit a97955844807 ("ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()") the issue was no longer reproducible.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1694779
--- ipc/sem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
ipc/sem.c +2 -4
@@ -2248,11 +2248,9 @@ void exit_sem(struct task_struct *tsk)ipc_assert_locked_object (&sma->sem_perm);list_del (&un->list_id); -/* we are the last process using this ulp, acquiring ulp->lock -* isn't required. Besides that, we are also protected against -* IPC_RMID as we hold sma->sem_perm lock now -*/ +spin_lock (&ulp->lock);list_del_rcu (&un->list_proc); +spin_unlock (&ulp->lock);/* perform adjustments registered in un */ for (i =0 ; i < sma->sem_nsems; i++) {
Greg Kroah-Hartman
maintainerPATCH 198/237 mm/vmscan.c: dont round up scan size for online memory cgroup
In reply to Greg Kroah-HartmanFrom: Gavin Shan <[email protected]>
commit 76073c646f5f4999d763f471df9e38a5a912d70d upstream.
Commit 68600f623d69 ("mm: don't miss the last page because of round-off error") makes the scan size round up to @denominator regardless of the memory cgroup's state, online or offline. This affects the overall reclaiming behavior: the corresponding LRU list is eligible for reclaiming only when its size logically right shifted by @sc->priority is bigger than zero in the former formula.
For example, the inactive anonymous LRU list should have at least 0x4000 pages to be eligible for reclaiming when we have 60/12 for swappiness/priority and without taking scan/rotation ratio into account.
After the roundup is applied, the inactive anonymous LRU list becomes eligible for reclaiming when its size is bigger than or equal to 0x1000 in the same condition.
(0x4000 >> 12) * 60 / (60 + 140 + 1) = 1
((0x1000 >> 12) * 60) + 200) / (60 + 140 + 1) = 1aarch64 has 512MB huge page size when the base page size is 64KB. The memory cgroup that has a huge page is always eligible for reclaiming in that case.
The reclaiming is likely to stop after the huge page is reclaimed, meaing the further iteration on @sc->priority and the silbing and child memory cgroups will be skipped. The overall behaviour has been changed. This fixes the issue by applying the roundup to offlined memory cgroups only, to give more preference to reclaim memory from offlined memory cgroup. It sounds reasonable as those memory is unlikedly to be used by anyone.
The issue was found by starting up 8 VMs on a Ampere Mustang machine, which has 8 CPUs and 16 GB memory. Each VM is given with 2 vCPUs and 2GB memory. It took 264 seconds for all VMs to be completely up and 784MB swap is consumed after that. With this patch applied, it took 236 seconds and 60MB swap to do same thing. So there is 10% performance improvement for my case. Note that KSM is disable while THP is enabled in the testing.
total used free shared buff/cache available
Mem: 16196 10065 2049 16 4081 3749
Swap: 8175 784 7391
total used free shared buff/cache available
Mem: 16196 11324 3656 24 1215 2936
Swap: 8175 60 8115--- mm/vmscan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
mm/vmscan.c +6 -3
@@ -2369,10 +2369,13 @@ out:/* * Scan types proportional to swappiness and * their relative recent reclaim efficiency. -* Make sure we don't miss the last page -* because of a round-off error. +* Make sure we don't miss the last page on +* the offlined memory cgroups because of a +* round-off error. */ - scan =DIV64_U64_ROUND_UP (scan * fraction[file], + scan =mem_cgroup_online (memcg) ? +div64_u64 (scan * fraction[file], denominator) : +DIV64_U64_ROUND_UP (scan * fraction[file], denominator);break ;case SCAN_FILE :
Greg Kroah-Hartman
maintainerPATCH 199/237 drm/amdgpu/soc15: fix xclk for raven
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit c657b936ea98630ef5ba4f130ab1ad5c534d0165 upstream.
It's 25 Mhz (refclk / 4). This fixes the interpretation of the rlc clock counter.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +6 -1
@@ -279,7 +279,12 @@ static void soc15_init_golden_registers( }static u32 soc15_get_xclk (struct amdgpu_device *adev) { -return adev->clock.spll.reference_freq; +u32 reference_clock = adev->clock.spll.reference_freq; + +if (adev->asic_type ==CHIP_RAVEN ) +return reference_clock /4 ; + +return reference_clock; }
Greg Kroah-Hartman
maintainerPATCH 200/237 KVM: x86: dont notify userspace IOAPIC on edge-triggered interrupt EOI
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit 7455a8327674e1a7c9a1f5dd1b0743ab6713f6d1 upstream.
Commit 13db77347db1 ("KVM: x86: don't notify userspace IOAPIC on edge EOI") said, edge-triggered interrupts don't set a bit in TMR, which means that IOAPIC isn't notified on EOI. And var level indicates level-triggered interrupt.
But commit 3159d36ad799 ("KVM: x86: use generic function for MSI parsing") replace var level with irq.level by mistake. Fix it by changing irq.level to irq.trig_mode.
--- arch/x86/kvm/irq_comm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/irq_comm.c +1 -1
@@ -427,7 +427,7 @@ void kvm_scan_ioapic_routes(struct kvm_vkvm_set_msi_irq (vcpu->kvm, entry, &irq); -if (irq.level &&kvm_apic_match_dest (vcpu,NULL ,0 , +if (irq.trig_mode &&kvm_apic_match_dest (vcpu,NULL ,0 , irq.dest_id, irq.dest_mode))__set_bit (irq.vector, ioapic_handled_vectors); }
Greg Kroah-Hartman
maintainerPATCH 201/237 xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit a3ae87dce3a5abe0b57c811bab02b2564b574106 upstream.
Intel Comet Lake based platform require the XHCI_PME_STUCK_QUIRK quirk as well. Without this xHC can not enter D3 in runtime suspend.
--- drivers/usb/host/xhci-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-pci.c +3 -1
@@ -53,6 +53,7 @@#define PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI 0x1aa8#define PCI_DEVICE_ID_INTEL_APL_XHCI 0x5aa8#define PCI_DEVICE_ID_INTEL_DNV_XHCI 0x19d0 +#define PCI_DEVICE_ID_INTEL_CML_XHCI 0xa3af#define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9#define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba
@@ -191,7 +192,8 @@ static void xhci_pci_quirks(struct devic pdev->device ==PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_APL_XHCI || - pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI)) { + pdev->device ==PCI_DEVICE_ID_INTEL_DNV_XHCI || + pdev->device == PCI_DEVICE_ID_INTEL_CML_XHCI)) { xhci->quirks |= XHCI_PME_STUCK_QUIRK; } if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
Greg Kroah-Hartman
maintainerPATCH 202/237 VT_RESIZEX: get rid of field-by-field copyin
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
[ Upstream commit 1b3bce4d6bf839304a90951b4b25a5863533bf2a ]
--- drivers/tty/vt/vt_ioctl.c | 68 ++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 41 deletions(-)
drivers/tty/vt/vt_ioctl.c +27 -41
@@ -847,58 +847,44 @@ int vt_ioctl(struct tty_struct *tty,case VT_RESIZEX : { -struct vt_consize __user *vtconsize = up; -ushort ll,cc,vlin,clin,vcol,ccol; +struct vt_consize v;if (!perm)return -EPERM ; -if (!access_ok (VERIFY_READ , vtconsize, -sizeof (struct vt_consize ))) { - ret = -EFAULT ; -break ; - } +if (copy_from_user (&v, up,sizeof (struct vt_consize ))) +return -EFAULT ;/* FIXME: Should check the copies properly */ -__get_user (ll, &vtconsize->v_rows); -__get_user (cc, &vtconsize->v_cols); -__get_user (vlin, &vtconsize->v_vlin); -__get_user (clin, &vtconsize->v_clin); -__get_user (vcol, &vtconsize->v_vcol); -__get_user (ccol, &vtconsize->v_ccol); - vlin = vlin ? vlin : vc->vc_scan_lines; -if (clin) { -if (ll) { -if (ll != vlin/clin) { -/* Parameters don't add up */ - ret = -EINVAL ; -break ; - } - }else - ll = vlin/clin; +if (!v.v_vlin) + v.v_vlin = vc->vc_scan_lines; +if (v.v_clin) { +int rows = v.v_vlin/v.v_clin; +if (v.v_rows != rows) { +if (v.v_rows)/* Parameters don't add up */ +return -EINVAL ; + v.v_rows = rows; + } } -if (vcol && ccol) { -if (cc) { -if (cc != vcol/ccol) { - ret = -EINVAL ; -break ; - } - }else - cc = vcol/ccol; +if (v.v_vcol && v.v_ccol) { +int cols = v.v_vcol/v.v_ccol; +if (v.v_cols != cols) { +if (v.v_cols) +return -EINVAL ; + v.v_cols = cols; + } } -if (clin >32 ) { - ret = -EINVAL ; -break ; - } - +if (v.v_clin >32 ) +return -EINVAL ; +for (i =0 ; i <MAX_NR_CONSOLES ; i++) {if (!vc_cons[i].d)continue ;console_lock (); -if (vlin) - vc_cons[i].d->vc_scan_lines = vlin; -if (clin) - vc_cons[i].d->vc_font.height = clin; +if (v.v_vlin) + vc_cons[i].d->vc_scan_lines = v.v_vlin; +if (v.v_clin) + vc_cons[i].d->vc_font.height = v.v_clin; vc_cons[i].d->vc_resize_user =1 ; -vc_resize (vc_cons[i].d, cc, ll); +vc_resize (vc_cons[i].d, v.v_cols, v.v_rows);console_unlock (); }break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 203/237 vt: vt_ioctl: fix race in VT_RESIZEX
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 6cd1ed50efd88261298577cd92a14f2768eddeeb ]
We need to make sure vc_cons[i].d is not NULL after grabbing console_lock(), or risk a crash.
general protection fault, probably for non-canonical address 0xdffffc0000000068: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000340-0x0000000000000347] CPU: 1 PID: 19462 Comm: syz-executor.5 Not tainted 5.5.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:vt_ioctl+0x1f96/0x26d0 drivers/tty/vt/vt_ioctl.c:883 Code: 74 41 e8 bd a6 84 fd 48 89 d8 48 c1 e8 03 42 80 3c 28 00 0f 85 e4 04 00 00 48 8b 03 48 8d b8 40 03 00 00 48 89 fa 48 c1 ea 03 <42> 0f b6 14 2a 84 d2 74 09 80 fa 03 0f 8e b1 05 00 00 44 89 b8 40 RSP: 0018:ffffc900086d7bb0 EFLAGS: 00010202 RAX: 0000000000000000 RBX: ffffffff8c34ee88 RCX: ffffc9001415c000 RDX: 0000000000000068 RSI: ffffffff83f0e6e3 RDI: 0000000000000340 RBP: ffffc900086d7cd0 R08: ffff888054ce0100 R09: fffffbfff16a2f6d R10: ffff888054ce0998 R11: ffff888054ce0100 R12: 000000000000001d R13: dffffc0000000000 R14: 1ffff920010daf79 R15: 000000000000ff7f FS: 00007f7d13c12700(0000) GS:ffff8880ae900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffd477e3c38 CR3: 0000000095d0a000 CR4: 00000000001406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: tty_ioctl+0xa37/0x14f0 drivers/tty/tty_io.c:2660 vfs_ioctl fs/ioctl.c:47 [inline] ksys_ioctl+0x123/0x180 fs/ioctl.c:763 __do_sys_ioctl fs/ioctl.c:772 [inline] __se_sys_ioctl fs/ioctl.c:770 [inline] __x64_sys_ioctl+0x73/0xb0 fs/ioctl.c:770 do_syscall_64+0xfa/0x790 arch/x86/entry/common.c:294 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x45b399 Code: ad b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 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 7b b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007f7d13c11c78 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007f7d13c126d4 RCX: 000000000045b399 RDX: 0000000020000080 RSI: 000000000000560a RDI: 0000000000000003 RBP: 000000000075bf20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000ffffffff R13: 0000000000000666 R14: 00000000004c7f04 R15: 000000000075bf2c Modules linked in: ---[ end trace 80970faf7a67eb77 ]--- RIP: 0010:vt_ioctl+0x1f96/0x26d0 drivers/tty/vt/vt_ioctl.c:883 Code: 74 41 e8 bd a6 84 fd 48 89 d8 48 c1 e8 03 42 80 3c 28 00 0f 85 e4 04 00 00 48 8b 03 48 8d b8 40 03 00 00 48 89 fa 48 c1 ea 03 <42> 0f b6 14 2a 84 d2 74 09 80 fa 03 0f 8e b1 05 00 00 44 89 b8 40 RSP: 0018:ffffc900086d7bb0 EFLAGS: 00010202 RAX: 0000000000000000 RBX: ffffffff8c34ee88 RCX: ffffc9001415c000 RDX: 0000000000000068 RSI: ffffffff83f0e6e3 RDI: 0000000000000340 RBP: ffffc900086d7cd0 R08: ffff888054ce0100 R09: fffffbfff16a2f6d R10: ffff888054ce0998 R11: ffff888054ce0100 R12: 000000000000001d R13: dffffc0000000000 R14: 1ffff920010daf79 R15: 000000000000ff7f FS: 00007f7d13c12700(0000) GS:ffff8880ae900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffd477e3c38 CR3: 0000000095d0a000 CR4: 00000000001406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
--- drivers/tty/vt/vt_ioctl.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/tty/vt/vt_ioctl.c +11 -6
@@ -876,15 +876,20 @@ int vt_ioctl(struct tty_struct *tty,return -EINVAL ;for (i =0 ; i <MAX_NR_CONSOLES ; i++) { +struct vc_data *vcp; +if (!vc_cons[i].d)continue ;console_lock (); -if (v.v_vlin) - vc_cons[i].d->vc_scan_lines = v.v_vlin; -if (v.v_clin) - vc_cons[i].d->vc_font.height = v.v_clin; - vc_cons[i].d->vc_resize_user =1 ; -vc_resize (vc_cons[i].d, v.v_cols, v.v_rows); + vcp = vc_cons[i].d; +if (vcp) { +if (v.v_vlin) + vcp->vc_scan_lines = v.v_vlin; +if (v.v_clin) + vcp->vc_font.height = v.v_clin; + vcp->vc_resize_user =1 ; +vc_resize (vcp, v.v_cols, v.v_rows); + }console_unlock (); }break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 204/237 powerpc/tm: P9 disable transactionally suspended sigcontexts
In reply to Greg Kroah-HartmanFrom: Michael Neuling <[email protected]>
[ Upstream commit 92fb8690bd04cb421d987d246deac60eef85d272 ]
Unfortunately userspace can construct a sigcontext which enables suspend. Thus userspace can force Linux into a path where trechkpt is executed.
This patch blocks this from happening on POWER9 by sanity checking sigcontexts passed in.
ptrace doesn't have this problem as only MSR SE and BE can be changed via ptrace.
This patch also adds a number of WARN_ON()s in case we ever enter suspend when we shouldn't. This should not happen, but if it does the symptoms are soft lockup warnings which are not obviously TM related, so the WARN_ON()s should make it obvious what's happening.
--- arch/powerpc/kernel/process.c | 2 ++ arch/powerpc/kernel/signal_32.c | 4 ++++ arch/powerpc/kernel/signal_64.c | 5 +++++ 3 files changed, 11 insertions(+)
arch/powerpc/kernel/process.c +2 -0
@@ -903,6 +903,8 @@ static inline void tm_reclaim_task(struct task_struct *tsk)if (!MSR_TM_ACTIVE (thr->regs->msr)) goto out_and_saveregs; +WARN_ON (tm_suspend_disabled); + TM_DEBUG("--- tm_reclaim on pid %d (NIP=%lx, " "ccr=%lx, msr=%lx, trap=%lx)\n", tsk->pid, thr->regs->nip,
arch/powerpc/kernel/signal_32.c +4 -0
@@ -519,6 +519,8 @@ static int save_tm_user_regs(struct pt_regs *regs, {unsigned long msr = regs->msr; +WARN_ON (tm_suspend_disabled); +/* Remove TM bits from thread's MSR. The MSR in the sigcontext * just indicates to userland that we were doing a transaction, but we * don't want to return in transactional state. This also ensures
@@ -769,6 +771,8 @@ static long restore_tm_user_regs(struct pt_regs *regs,int i;#endif +if (tm_suspend_disabled) +return 1 ;/* * restore general registers but not including MSR or SOFTE. Also * take care of keeping r2 (TLS) intact if not a signal.
arch/powerpc/kernel/signal_64.c +5 -0
@@ -214,6 +214,8 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc,BUG_ON (!MSR_TM_ACTIVE (regs->msr)); +WARN_ON (tm_suspend_disabled); +/* Remove TM bits from thread's MSR. The MSR in the sigcontext * just indicates to userland that we were doing a transaction, but we * don't want to return in transactional state. This also ensures
@@ -430,6 +432,9 @@ static long restore_tm_sigcontexts(struct task_struct *tsk,BUG_ON (tsk != current); +if (tm_suspend_disabled) +return -EINVAL ; +/* copy the GPRs */ err |=__copy_from_user (regs->gpr, tm_sc->gp_regs,sizeof (regs->gpr)); err |= __copy_from_user(&tsk->thread.ckpt_regs, sc->gp_regs,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 205/237 powerpc/tm: Fix endianness flip on trap
In reply to Greg Kroah-HartmanFrom: Gustavo Romero <[email protected]>
[ Upstream commit 1c200e63d055ec0125e44a5e386b9b78aada7eb3 ]
Currently it's possible that a thread on PPC64 LE has its endianness flipped inadvertently to Big-Endian resulting in a crash once the process is back from the signal handler.
If giveup_all() is called when regs->msr has the bits MSR.FP and MSR.VEC disabled (and hence MSR.VSX disabled too) it returns without calling check_if_tm_restore_required() which copies regs->msr to ckpt_regs->msr if the process caught a signal whilst in transactional mode. Then once in setup_tm_sigcontexts() MSR from ckpt_regs.msr is used, but since check_if_tm_restore_required() was not called previuosly, gp_regs[PT_MSR] gets a copy of invalid MSR bits as MSR in ckpt_regs was not updated from regs->msr and so is zeroed. Later when leaving the signal handler once in sys_rt_sigreturn() the TS bits of gp_regs[PT_MSR] are checked to determine if restore_tm_sigcontexts() must be called to pull in the correct MSR state into the user context. Because TS bits are zeroed restore_tm_sigcontexts() is never called and MSR restored from the user context on returning from the signal handler has the MSR.LE (the endianness bit) forced to zero (Big-Endian). That leads, for instance, to 'nop' being treated as an illegal instruction in the following sequence:
tbegin. beq 1f trap tend.
1: nop
on PPC64 LE machines and the process dies just after returning from the signal handler.
PPC64 BE is also affected but in a subtle way since forcing Big-Endian on a BE machine does not change the endianness.
This commit fixes the issue described above by ensuring that once in setup_tm_sigcontexts() the MSR used is from regs->msr instead of from ckpt_regs->msr and by ensuring that we pull in only the MSR.FP, MSR.VEC, and MSR.VSX bits from ckpt_regs->msr.
The fix was tested both on LE and BE machines and no regression regarding the powerpc/tm selftests was observed.
--- arch/powerpc/kernel/signal_64.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/powerpc/kernel/signal_64.c +7 -1
@@ -207,7 +207,7 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc,elf_vrreg_t __user *tm_v_regs =sigcontext_vmx_regs (tm_sc);#endif struct pt_regs *regs = tsk->thread.regs; -unsigned long msr = tsk->thread.ckpt_regs.msr; +unsigned long msr = tsk->thread.regs->msr;long err =0 ;BUG_ON (tsk != current);
@@ -216,6 +216,12 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc,WARN_ON (tm_suspend_disabled); +/* Restore checkpointed FP, VEC, and VSX bits from ckpt_regs as +* it contains the correct FP, VEC, VSX state after we treclaimed +* the transaction and giveup_all() was called on reclaiming. +*/ + msr |= tsk->thread.ckpt_regs.msr & (MSR_FP |MSR_VEC |MSR_VSX ); +/* Remove TM bits from thread's MSR. The MSR in the sigcontext * just indicates to userland that we were doing a transaction, but we * don't want to return in transactional state. This also ensures
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 206/237 powerpc/tm: Fix clearing MSR[TS] in current when reclaiming on signal delivery
In reply to Greg Kroah-HartmanFrom: Gustavo Luiz Duarte <[email protected]>
[ Upstream commit 2464cc4c345699adea52c7aef75707207cb8a2f6 ]
After a treclaim, we expect to be in non-transactional state. If we don't clear the current thread's MSR[TS] before we get preempted, then tm_recheckpoint_new_task() will recheckpoint and we get rescheduled in suspended transaction state.
When handling a signal caught in transactional state, handle_rt_signal64() calls get_tm_stackpointer() that treclaims the transaction using tm_reclaim_current() but without clearing the thread's MSR[TS]. This can cause the TM Bad Thing exception below if later we pagefault and get preempted trying to access the user's sigframe, using __put_user(). Afterwards, when we are rescheduled back into do_page_fault() (but now in suspended state since the thread's MSR[TS] was not cleared), upon executing 'rfid' after completion of the page fault handling, the exception is raised because a transition from suspended to non-transactional state is invalid.
Unexpected TM Bad Thing exception at c00000000000de44 (msr 0x8000000302a03031) tm_scratch=800000010280b033
Oops: Unrecoverable exception, sig: 6 [#1] LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries CPU: 25 PID: 15547 Comm: a.out Not tainted 5.4.0-rc2 #32 NIP: c00000000000de44 LR: c000000000034728 CTR: 0000000000000000 REGS: c00000003fe7bd70 TRAP: 0700 Not tainted (5.4.0-rc2) MSR: 8000000302a03031 <SF,VEC,VSX,FP,ME,IR,DR,LE,TM[SE]> CR: 44000884 XER: 00000000 CFAR: c00000000000dda4 IRQMASK: 0 PACATMSCRATCH: 800000010280b033 GPR00: c000000000034728 c000000f65a17c80 c000000001662800 00007fffacf3fd78 GPR04: 0000000000001000 0000000000001000 0000000000000000 c000000f611f8af0 GPR08: 0000000000000000 0000000078006001 0000000000000000 000c000000000000 GPR12: c000000f611f84b0 c00000003ffcb200 0000000000000000 0000000000000000 GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR20: 0000000000000000 0000000000000000 0000000000000000 c000000f611f8140 GPR24: 0000000000000000 00007fffacf3fd68 c000000f65a17d90 c000000f611f7800 GPR28: c000000f65a17e90 c000000f65a17e90 c000000001685e18 00007fffacf3f000 NIP [c00000000000de44] fast_exception_return+0xf4/0x1b0 LR [c000000000034728] handle_rt_signal64+0x78/0xc50 Call Trace: [c000000f65a17c80] [c000000000034710] handle_rt_signal64+0x60/0xc50 (unreliable) [c000000f65a17d30] [c000000000023640] do_notify_resume+0x330/0x460 [c000000f65a17e20] [c00000000000dcc4] ret_from_except_lite+0x70/0x74 Instruction dump: 7c4ff120 e8410170 7c5a03a6 38400000 f8410060 e8010070 e8410080 e8610088 60000000 60000000 e8810090 e8210078 <4c000024> 48000000 e8610178 88ed0989 ---[ end trace 93094aa44b442f87 ]---
The simplified sequence of events that triggers the above exception is:
... # userspace in NON-TRANSACTIONAL state
tbegin # userspace in TRANSACTIONAL state
signal delivery # kernelspace in SUSPENDED state
handle_rt_signal64()
get_tm_stackpointer()
treclaim # kernelspace in NON-TRANSACTIONAL state
__put_user()
page fault happens. We will never get back here because of the TM Bad Thing exception.
page fault handling kicks in and we voluntarily preempt ourselves do_page_fault()
__schedule()
__switch_to(other_task) our task is rescheduled and we recheckpoint because the thread's MSR[TS] was not cleared __switch_to(our_task)
switch_to_tm()
tm_recheckpoint_new_task()
trechkpt # kernelspace in SUSPENDED state
The page fault handling resumes, but now we are in suspended transaction state
do_page_fault() completes
rfid <----- trying to get back where the page fault happened (we were non-transactional back then)
TM Bad Thing # illegal transition from suspended to non-transactional
This patch fixes that issue by clearing the current thread's MSR[TS] just after treclaim in get_tm_stackpointer() so that we stay in non-transactional state in case we are preempted. In order to make treclaim and clearing the thread's MSR[TS] atomic from a preemption perspective when CONFIG_PREEMPT is set, preempt_disable/enable() is used. It's also necessary to save the previous value of the thread's MSR before get_tm_stackpointer() is called so that it can be exposed to the signal handler later in setup_tm_sigcontexts() to inform the userspace MSR at the moment of the signal delivery.
Found with tm-signal-context-force-tm kernel selftest.
--- arch/powerpc/kernel/signal.c | 17 +++++++++++++++-- arch/powerpc/kernel/signal_32.c | 28 ++++++++++++++-------------- arch/powerpc/kernel/signal_64.c | 22 ++++++++++------------ 3 files changed, 39 insertions(+), 28 deletions(-)
arch/powerpc/kernel/signal.c +15 -2
@@ -193,14 +193,27 @@ unsigned long get_tm_stackpointer(struct task_struct *tsk)* normal/non-checkpointed stack pointer. */ +unsigned long ret = tsk->thread.regs->gpr[1 ]; +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM BUG_ON (tsk != current);if (MSR_TM_ACTIVE (tsk->thread.regs->msr)) { +preempt_disable ();tm_reclaim_current (TM_CAUSE_SIGNAL );if (MSR_TM_TRANSACTIONAL (tsk->thread.regs->msr)) -return tsk->thread.ckpt_regs.gpr[1 ]; + ret = tsk->thread.ckpt_regs.gpr[1 ]; + +/* +* If we treclaim, we must clear the current thread's TM bits +* before re-enabling preemption. Otherwise we might be +* preempted and have the live MSR[TS] changed behind our back +* (tm_recheckpoint_new_task() would recheckpoint). Besides, we +* enter the signal handler in non-transactional state. +*/ + tsk->thread.regs->msr &= ~MSR_TS_MASK ; +preempt_enable (); }#endif -return tsk->thread.regs->gpr[1 ]; +return ret; }
arch/powerpc/kernel/signal_32.c +14 -14
@@ -515,19 +515,11 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,*/ static int save_tm_user_regs (struct pt_regs *regs,struct mcontext __user *frame, -struct mcontext __user *tm_frame,int sigret) +struct mcontext __user *tm_frame,int sigret, +unsigned long msr) { -unsigned long msr = regs->msr; -WARN_ON (tm_suspend_disabled); -/* Remove TM bits from thread's MSR. The MSR in the sigcontext -* just indicates to userland that we were doing a transaction, but we -* don't want to return in transactional state. This also ensures -* that flush_fp_to_thread won't set TIF_RESTORE_TM again. -*/ - regs->msr &= ~MSR_TS_MASK ; -/* Save both sets of general registers */ if (save_general_regs (¤t->thread.ckpt_regs, frame) ||save_general_regs (regs, tm_frame))
@@ -1004,6 +996,10 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,int sigret;unsigned long tramp;struct pt_regs *regs = tsk->thread.regs; +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +/* Save the thread's msr before get_tm_stackpointer() changes it */ +unsigned long msr = regs->msr; +#endif BUG_ON (tsk != current);
@@ -1036,13 +1032,13 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,#ifdef CONFIG_PPC_TRANSACTIONAL_MEM tm_frame = &rt_sf->uc_transact.uc_mcontext; -if (MSR_TM_ACTIVE (regs->msr)) { +if (MSR_TM_ACTIVE (msr)) {if (__put_user ((unsigned long )&rt_sf->uc_transact, &rt_sf->uc.uc_link) ||__put_user ((unsigned long )tm_frame, &rt_sf->uc_transact.uc_regs)) goto badframe; -if (save_tm_user_regs (regs, frame, tm_frame, sigret)) +if (save_tm_user_regs (regs, frame, tm_frame, sigret, msr)) goto badframe; }else
@@ -1449,6 +1445,10 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset,int sigret;unsigned long tramp;struct pt_regs *regs = tsk->thread.regs; +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +/* Save the thread's msr before get_tm_stackpointer() changes it */ +unsigned long msr = regs->msr; +#endif BUG_ON (tsk != current);
@@ -1482,9 +1482,9 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset,#ifdef CONFIG_PPC_TRANSACTIONAL_MEM tm_mctx = &frame->mctx_transact; -if (MSR_TM_ACTIVE (regs->msr)) { +if (MSR_TM_ACTIVE (msr)) {if (save_tm_user_regs (regs, &frame->mctx, &frame->mctx_transact, - sigret)) + sigret, msr)) goto badframe; }else
arch/powerpc/kernel/signal_64.c +10 -12
@@ -192,7 +192,8 @@ static long setup_sigcontext(struct sigcontext __user *sc,static long setup_tm_sigcontexts (struct sigcontext __user *sc,struct sigcontext __user *tm_sc,struct task_struct *tsk, -int signr,sigset_t *set,unsigned long handler) +int signr,sigset_t *set,unsigned long handler, +unsigned long msr) {/* When CONFIG_ALTIVEC is set, we _always_ setup v_regs even if the * process never used altivec yet (MSR_VEC is zero in pt_regs of
@@ -207,12 +208,11 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc,elf_vrreg_t __user *tm_v_regs =sigcontext_vmx_regs (tm_sc);#endif struct pt_regs *regs = tsk->thread.regs; -unsigned long msr = tsk->thread.regs->msr;long err =0 ;BUG_ON (tsk != current); -BUG_ON (!MSR_TM_ACTIVE (regs->msr)); +BUG_ON (!MSR_TM_ACTIVE (msr));WARN_ON (tm_suspend_disabled);
@@ -222,13 +222,6 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc,*/ msr |= tsk->thread.ckpt_regs.msr & (MSR_FP |MSR_VEC |MSR_VSX ); -/* Remove TM bits from thread's MSR. The MSR in the sigcontext -* just indicates to userland that we were doing a transaction, but we -* don't want to return in transactional state. This also ensures -* that flush_fp_to_thread won't set TIF_RESTORE_TM again. -*/ - regs->msr &= ~MSR_TS_MASK ; -#ifdef CONFIG_ALTIVEC err |=__put_user (v_regs, &sc->v_regs); err |=__put_user (tm_v_regs, &tm_sc->v_regs);
@@ -805,6 +798,10 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set,unsigned long newsp =0 ;long err =0 ;struct pt_regs *regs = tsk->thread.regs; +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +/* Save the thread's msr before get_tm_stackpointer() changes it */ +unsigned long msr = regs->msr; +#endif BUG_ON (tsk != current);
@@ -822,7 +819,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, err |=__put_user (0 , &frame->uc.uc_flags); err |=__save_altstack (&frame->uc.uc_stack, regs->gpr[1 ]);#ifdef CONFIG_PPC_TRANSACTIONAL_MEM -if (MSR_TM_ACTIVE (regs->msr)) { +if (MSR_TM_ACTIVE (msr)) {/* The ucontext_t passed to userland points to the second * ucontext_t (for transactional state) with its uc_link ptr. */
@@ -830,7 +827,8 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, err |=setup_tm_sigcontexts (&frame->uc.uc_mcontext, &frame->uc_transact.uc_mcontext, tsk, ksig->sig,NULL , - (unsigned long )ksig->ka.sa.sa_handler); + (unsigned long )ksig->ka.sa.sa_handler, + msr); } else#endif {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 207/237 serial: 8250: Check UPF_IRQ_SHARED in advance
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 7febbcbc48fc92e3f33863b32ed715ba4aff18c4 ]
The commit 54e53b2e8081
("tty: serial: 8250: pass IRQ shared flag to UART ports")
nicely explained the problem:
---8<---8<---
On some systems IRQ lines between multiple UARTs might be shared. If so, the irqflags have to be configured accordingly. The reason is: The 8250 port startup code performs IRQ tests *before* the IRQ handler for that particular port is registered. This is performed in serial8250_do_startup(). This function checks whether IRQF_SHARED is configured and only then disables the IRQ line while testing.
This test is performed upon each open() of the UART device. Imagine two UARTs share the same IRQ line: On is already opened and the IRQ is active. When the second UART is opened, the IRQ line has to be disabled while performing IRQ tests. Otherwise an IRQ might handler might be invoked, but the IRQ itself cannot be handled, because the corresponding handler isn't registered, yet. That's because the 8250 code uses a chain-handler and invokes the corresponding port's IRQ handling routines himself.
Unfortunately this IRQF_SHARED flag isn't configured for UARTs probed via device tree even if the IRQs are shared. This way, the actual and shared IRQ line isn't disabled while performing tests and the kernel correctly detects a spurious IRQ. So, adding this flag to the DT probe solves the issue.
Note: The UPF_SHARE_IRQ flag is configured unconditionally. Therefore, the IRQF_SHARED flag can be set unconditionally as well.
Example stack trace by performing echo 1 > /dev/ttyS2 on a non-patched system:
|irq 85: nobody cared (try booting with the "irqpoll" option) | [...] |handlers: |[<ffff0000080fc628>] irq_default_primary_handler threaded [<ffff00000855fbb8>] serial8250_interrupt |Disabling IRQ #85
---8<---8<---
But unfortunately didn't fix the root cause. Let's try again here by moving IRQ flag assignment from serial_link_irq_chain() to serial8250_do_startup().
This should fix the similar issue reported for 8250_pnp case.
Since this change we don't need to have custom solutions in 8250_aspeed_vuart and 8250_of drivers, thus, drop them.
--- drivers/tty/serial/8250/8250_aspeed_vuart.c | 1 - drivers/tty/serial/8250/8250_core.c | 5 ++--- drivers/tty/serial/8250/8250_port.c | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-)
drivers/tty/serial/8250/8250_aspeed_vuart.c +0 -1
@@ -256,7 +256,6 @@ static int aspeed_vuart_probe(struct platform_device *pdev) port.port.line = rc; port.port.irq =irq_of_parse_and_map (np,0 ); - port.port.irqflags =IRQF_SHARED ; port.port.iotype =UPIO_MEM ; port.port.type =PORT_16550A ; port.port.uartclk = clk;
drivers/tty/serial/8250/8250_core.c +2 -3
@@ -181,7 +181,7 @@ static int serial_link_irq_chain(struct uart_8250_port *up)struct hlist_head *h;struct hlist_node *n;struct irq_info *i; -int ret, irq_flags = up->port.flags &UPF_SHARE_IRQ ?IRQF_SHARED :0 ; +int ret;mutex_lock (&hash_mutex);
@@ -216,9 +216,8 @@ static int serial_link_irq_chain(struct uart_8250_port *up)INIT_LIST_HEAD (&up->list); i->head = &up->list;spin_unlock_irq (&i->lock); - irq_flags |= up->port.irqflags; ret =request_irq (up->port.irq, serial8250_interrupt, - irq_flags, up->port.name, i); + up->port.irqflags, up->port.name, i);if (ret <0 )serial_do_unlink (i, up); }
drivers/tty/serial/8250/8250_port.c +4 -0
@@ -2258,6 +2258,10 @@ int serial8250_do_startup(struct uart_port *port) } } +/* Check if we need to have shared IRQs */ +if (port->irq && (up->port.flags &UPF_SHARE_IRQ )) + up->port.irqflags |=IRQF_SHARED ; +if (port->irq && !(up->port.flags &UPF_NO_THRE_TEST )) {unsigned char iir1;/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 208/237 lib/stackdepot: Fix outdated comments
In reply to Greg Kroah-HartmanFrom: Miles Chen <[email protected]>
[ Upstream commit ee050dc83bc326ad5ef8ee93bca344819371e7a5 ]
Replace "depot_save_stack" with "stack_depot_save" in code comments because depot_save_stack() was replaced in commit c0cfc337264c ("lib/stackdepot:
Provide functions which operate on plain storage arrays") and removed in commit 56d8f079c51a ("lib/stackdepot: Remove obsolete functions")
--- lib/stackdepot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/stackdepot.c +2 -2
@@ -96,7 +96,7 @@ static bool init_stack_slab(void **prealloc) stack_slabs[depot_index +1 ] = *prealloc;/* * This smp_store_release pairs with smp_load_acquire() from -* |next_slab_inited| above and in depot_save_stack(). +* |next_slab_inited| above and in stack_depot_save(). */ smp_store_release (&next_slab_inited,1 ); }
@@ -123,7 +123,7 @@ static struct stack_record *depot_alloc_stack(unsigned long *entries, int size, depot_offset =0 ;/* * smp_store_release() here pairs with smp_load_acquire() from -* |next_slab_inited| in depot_save_stack() and +* |next_slab_inited| in stack_depot_save() and * init_stack_slab(). */ if (depot_index +1 <STACK_ALLOC_MAX_SLABS )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 209/237 lib/stackdepot.c: fix global out-of-bounds in stack_slabs
In reply to Greg Kroah-HartmanFrom: Alexander Potapenko <[email protected]>
[ Upstream commit 305e519ce48e935702c32241f07d393c3c8fed3e ]
Walter Wu has reported a potential case in which init_stack_slab() is called after stack_slabs[STACK_ALLOC_MAX_SLABS - 1] has already been initialized. In that case init_stack_slab() will overwrite stack_slabs[STACK_ALLOC_MAX_SLABS], which may result in a memory corruption.
--- lib/stackdepot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
lib/stackdepot.c +6 -2
@@ -92,15 +92,19 @@ static bool init_stack_slab(void **prealloc)return true;if (stack_slabs[depot_index] ==NULL ) { stack_slabs[depot_index] = *prealloc; + *prealloc =NULL ; }else { - stack_slabs[depot_index +1 ] = *prealloc; +/* If this is the last depot slab, do not touch the next one. */ +if (depot_index +1 <STACK_ALLOC_MAX_SLABS ) { + stack_slabs[depot_index +1 ] = *prealloc; + *prealloc =NULL ; + }/* * This smp_store_release pairs with smp_load_acquire() from * |next_slab_inited| above and in stack_depot_save(). */ smp_store_release (&next_slab_inited,1 ); } - *prealloc =NULL ;return true; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 210/237 KVM: nVMX: Dont emulate instructions in guest mode
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
[ Upstream commit 07721feee46b4b248402133228235318199b05ec ]
vmx_check_intercept is not yet fully implemented. To avoid emulating instructions disallowed by the L1 hypervisor, refuse to emulate instructions by default.
--- arch/x86/kvm/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/vmx.c +1 -1
@@ -12340,7 +12340,7 @@ static int vmx_check_intercept(struct kv }/* TODO: check more intercepts... */ -return X86EMUL_CONTINUE ; +return X86EMUL_UNHANDLEABLE ; }#ifdef CONFIG_X86_64
Greg Kroah-Hartman
maintainerPATCH 211/237 ext4: fix a data race in EXT4_I(inode)->i_disksize
In reply to Greg Kroah-HartmanFrom: Qian Cai <[email protected]>
commit 35df4299a6487f323b0aca120ea3f485dfee2ae3 upstream.
EXT4_I(inode)->i_disksize could be accessed concurrently as noticed by KCSAN,
BUG: KCSAN: data-race in ext4_write_end [ext4] / ext4_writepages [ext4]
write to 0xffff91c6713b00f8 of 8 bytes by task 49268 on cpu 127:
ext4_write_end+0x4e3/0x750 [ext4] ext4_update_i_disksize at fs/ext4/ext4.h:3032 (inlined by) ext4_update_inode_size at fs/ext4/ext4.h:3046 (inlined by) ext4_write_end at fs/ext4/inode.c:1287 generic_perform_write+0x208/0x2a0 ext4_buffered_write_iter+0x11f/0x210 [ext4] ext4_file_write_iter+0xce/0x9e0 [ext4] new_sync_write+0x29c/0x3b0 __vfs_write+0x92/0xa0 vfs_write+0x103/0x260 ksys_write+0x9d/0x130 __x64_sys_write+0x4c/0x60 do_syscall_64+0x91/0xb47 entry_SYSCALL_64_after_hwframe+0x49/0xbe
read to 0xffff91c6713b00f8 of 8 bytes by task 24872 on cpu 37:
ext4_writepages+0x10ac/0x1d00 [ext4] mpage_map_and_submit_extent at fs/ext4/inode.c:2468 (inlined by) ext4_writepages at fs/ext4/inode.c:2772 do_writepages+0x5e/0x130 __writeback_single_inode+0xeb/0xb20 writeback_sb_inodes+0x429/0x900 __writeback_inodes_wb+0xc4/0x150 wb_writeback+0x4bd/0x870 wb_workfn+0x6b4/0x960 process_one_work+0x54c/0xbe0 worker_thread+0x80/0x650 kthread+0x1e0/0x200 ret_from_fork+0x27/0x50
Reported by Kernel Concurrency Sanitizer on:
CPU: 37 PID: 24872 Comm: kworker/u261:2 Tainted: G W O L 5.5.0-next-20200204+ #5 Hardware name: HPE ProLiant DL385 Gen10/ProLiant DL385 Gen10, BIOS A40 07/10/2019 Workqueue: writeback wb_workfn (flush-7:0)
Since only the read is operating as lockless (outside of the "i_data_sem"), load tearing could introduce a logic bug. Fix it by adding READ_ONCE() for the read and WRITE_ONCE() for the write.
--- fs/ext4/ext4.h | 2 +- fs/ext4/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -2867,7 +2867,7 @@ static inline void ext4_update_i_disksiz !inode_is_locked(inode));down_write (&EXT4_I (inode)->i_data_sem);if (newsize >EXT4_I (inode)->i_disksize) -EXT4_I (inode)->i_disksize = newsize; +WRITE_ONCE (EXT4_I (inode)->i_disksize, newsize);up_write (&EXT4_I (inode)->i_data_sem); }
fs/ext4/inode.c +1 -1
@@ -2564,7 +2564,7 @@ update_disksize:* truncate are avoided by checking i_size under i_data_sem. */ disksize = ((loff_t )mpd->first_page) <<PAGE_SHIFT ; -if (disksize >EXT4_I (inode)->i_disksize) { +if (disksize >READ_ONCE (EXT4_I (inode)->i_disksize)) {int err2;loff_t i_size;
Greg Kroah-Hartman
maintainerPATCH 212/237 ext4: add cond_resched() to __ext4_find_entry()
In reply to Greg Kroah-HartmanFrom: Shijie Luo <[email protected]>
commit 9424ef56e13a1f14c57ea161eed3ecfdc7b2770e upstream.
We tested a soft lockup problem in linux 4.19 which could also be found in linux 5.x.
When dir inode takes up a large number of blocks, and if the directory is growing when we are searching, it's possible the restart branch could be called many times, and the do while loop could hold cpu a long time.
Here is the call trace in linux 4.19.
[ 473.756186] Call trace: [ 473.756196] dump_backtrace+0x0/0x198 [ 473.756199] show_stack+0x24/0x30 [ 473.756205] dump_stack+0xa4/0xcc [ 473.756210] watchdog_timer_fn+0x300/0x3e8 [ 473.756215] __hrtimer_run_queues+0x114/0x358 [ 473.756217] hrtimer_interrupt+0x104/0x2d8 [ 473.756222] arch_timer_handler_virt+0x38/0x58 [ 473.756226] handle_percpu_devid_irq+0x90/0x248 [ 473.756231] generic_handle_irq+0x34/0x50 [ 473.756234] __handle_domain_irq+0x68/0xc0 [ 473.756236] gic_handle_irq+0x6c/0x150 [ 473.756238] el1_irq+0xb8/0x140 [ 473.756286] ext4_es_lookup_extent+0xdc/0x258 [ext4] [ 473.756310] ext4_map_blocks+0x64/0x5c0 [ext4] [ 473.756333] ext4_getblk+0x6c/0x1d0 [ext4] [ 473.756356] ext4_bread_batch+0x7c/0x1f8 [ext4] [ 473.756379] ext4_find_entry+0x124/0x3f8 [ext4] [ 473.756402] ext4_lookup+0x8c/0x258 [ext4] [ 473.756407] __lookup_hash+0x8c/0xe8 [ 473.756411] filename_create+0xa0/0x170 [ 473.756413] do_mkdirat+0x6c/0x140 [ 473.756415] __arm64_sys_mkdirat+0x28/0x38 [ 473.756419] el0_svc_common+0x78/0x130 [ 473.756421] el0_svc_handler+0x38/0x78 [ 473.756423] el0_svc+0x8/0xc [ 485.755156] watchdog: BUG: soft lockup - CPU#2 stuck for 22s! [tmp:5149]
Add cond_resched() to avoid soft lockup and to provide a better system responding.
--- fs/ext4/namei.c | 1 + 1 file changed, 1 insertion(+)
fs/ext4/namei.c +1 -0
@@ -1430,6 +1430,7 @@ restart:/* * We deal with the read-ahead logic here. */ +cond_resched ();if (ra_ptr >= ra_max) {/* Refill the readahead buffer */ ra_ptr =0 ;
Greg Kroah-Hartman
maintainerPATCH 213/237 ext4: fix mount failure with quota configured as module
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 9db176bceb5c5df4990486709da386edadc6bd1d upstream.
When CONFIG_QFMT_V2 is configured as a module, the test in ext4_feature_set_ok() fails and so mount of filesystems with quota or project features fails. Fix the test to use IS_ENABLED macro which works properly even for modules.
--- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/super.c +1 -1
@@ -2863,7 +2863,7 @@ static int ext4_feature_set_ok(struct sureturn 0 ; } -#if !defined(CONFIG_QUOTA ) || !defined(CONFIG_QFMT_V2 ) +#if !IS_ENABLED (CONFIG_QUOTA ) || !IS_ENABLED (CONFIG_QFMT_V2 )if (!readonly && (ext4_has_feature_quota (sb) ||ext4_has_feature_project (sb))) { ext4_msg(sb, KERN_ERR,
Greg Kroah-Hartman
maintainerPATCH 214/237 ext4: rename s_journal_flag_rwsem to s_writepages_rwsem
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit bbd55937de8f2754adc5792b0f8e5ff7d9c0420e upstream.
In preparation for making s_journal_flag_rwsem synchronize ext4_writepages() with changes to both the EXTENTS and JOURNAL_DATA flags (rather than just JOURNAL_DATA as it does currently), rename it to s_writepages_rwsem.
--- fs/ext4/ext4.h | 2 +- fs/ext4/inode.c | 10 +++++----- fs/ext4/super.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -1533,7 +1533,7 @@ struct ext4_sb_info {struct ratelimit_state s_msg_ratelimit_state;/* Barrier between changing inodes' journal flags and writepages ops. */ -struct percpu_rw_semaphore s_journal_flag_rwsem; +struct percpu_rw_semaphore s_writepages_rwsem;struct dax_device *s_daxdev; };
fs/ext4/inode.c +5 -5
@@ -2744,7 +2744,7 @@ static int ext4_writepages(struct addresif (unlikely (ext4_forced_shutdown (EXT4_SB (inode->i_sb))))return -EIO ; -percpu_down_read (&sbi->s_journal_flag_rwsem); +percpu_down_read (&sbi->s_writepages_rwsem);trace_ext4_writepages (inode, wbc);if (dax_mapping (mapping)) {
@@ -2974,7 +2974,7 @@ unplug: out_writepages:trace_ext4_writepages_result (inode, wbc, ret, nr_to_write - wbc->nr_to_write); -percpu_up_read (&sbi->s_journal_flag_rwsem); +percpu_up_read (&sbi->s_writepages_rwsem);return ret; }
@@ -6050,7 +6050,7 @@ int ext4_change_inode_journal_flag(struc } } -percpu_down_write (&sbi->s_journal_flag_rwsem); +percpu_down_write (&sbi->s_writepages_rwsem);jbd2_journal_lock_updates (journal);/*
@@ -6067,7 +6067,7 @@ int ext4_change_inode_journal_flag(struc err =jbd2_journal_flush (journal);if (err <0 ) {jbd2_journal_unlock_updates (journal); -percpu_up_write (&sbi->s_journal_flag_rwsem); +percpu_up_write (&sbi->s_writepages_rwsem);ext4_inode_resume_unlocked_dio (inode);return err; }
@@ -6076,7 +6076,7 @@ int ext4_change_inode_journal_flag(strucext4_set_aops (inode);jbd2_journal_unlock_updates (journal); -percpu_up_write (&sbi->s_journal_flag_rwsem); +percpu_up_write (&sbi->s_writepages_rwsem);if (val)up_write (&EXT4_I (inode)->i_mmap_sem);
fs/ext4/super.c +3 -3
@@ -939,7 +939,7 @@ static void ext4_put_super(struct super_percpu_counter_destroy (&sbi->s_freeinodes_counter);percpu_counter_destroy (&sbi->s_dirs_counter);percpu_counter_destroy (&sbi->s_dirtyclusters_counter); -percpu_free_rwsem (&sbi->s_journal_flag_rwsem); +percpu_free_rwsem (&sbi->s_writepages_rwsem);#ifdef CONFIG_QUOTA for (i =0 ; i <EXT4_MAXQUOTAS ; i++)kfree (get_qf_name (sb, sbi, i));
@@ -4396,7 +4396,7 @@ no_journal: err =percpu_counter_init (&sbi->s_dirtyclusters_counter,0 ,GFP_KERNEL );if (!err) - err =percpu_init_rwsem (&sbi->s_journal_flag_rwsem); + err =percpu_init_rwsem (&sbi->s_writepages_rwsem);if (err) {ext4_msg (sb,KERN_ERR ,"insufficient memory" );
@@ -4490,7 +4490,7 @@ failed_mount6:percpu_counter_destroy (&sbi->s_freeinodes_counter);percpu_counter_destroy (&sbi->s_dirs_counter);percpu_counter_destroy (&sbi->s_dirtyclusters_counter); -percpu_free_rwsem (&sbi->s_journal_flag_rwsem); +percpu_free_rwsem (&sbi->s_writepages_rwsem); failed_mount5:ext4_ext_release (sb);ext4_release_system_zone (sb);
Greg Kroah-Hartman
maintainerPATCH 215/237 ext4: fix race between writepages and enabling EXT4_EXTENTS_FL
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit cb85f4d23f794e24127f3e562cb3b54b0803f456 upstream.
If EXT4_EXTENTS_FL is set on an inode while ext4_writepages() is running on it, the following warning in ext4_add_complete_io() can be hit:
WARNING: CPU: 1 PID: 0 at fs/ext4/page-io.c:234 ext4_put_io_end_defer+0xf0/0x120
Here's a minimal reproducer (not 100% reliable) (root isn't required):
while true; do
sync
done &
while true; do
rm -f file
touch file
chattr -e file
echo X >> file
chattr +e file
done
The problem is that in ext4_writepages(), ext4_should_dioread_nolock() (which only returns true on extent-based files) is checked once to set the number of reserved journal credits, and also again later to select the flags for ext4_map_blocks() and copy the reserved journal handle to ext4_io_end::handle. But if EXT4_EXTENTS_FL is being concurrently set, the first check can see dioread_nolock disabled while the later one can see it enabled, causing the reserved handle to unexpectedly be NULL.
Since changing EXT4_EXTENTS_FL is uncommon, and there may be other races related to doing so as well, fix this by synchronizing changing EXT4_EXTENTS_FL with ext4_writepages() via the existing s_writepages_rwsem (previously called s_journal_flag_rwsem).
This was originally reported by syzbot without a reproducer at
https://syzkaller.appspot.com/bug?extid=2202a584a00fffd19fbf,
but now that dioread_nolock is the default I also started seeing this when running syzkaller locally.
--- fs/ext4/ext4.h | 5 ++++- fs/ext4/migrate.c | 27 +++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-)
fs/ext4/ext4.h +4 -1
@@ -1532,7 +1532,10 @@ struct ext4_sb_info {struct ratelimit_state s_warning_ratelimit_state;struct ratelimit_state s_msg_ratelimit_state; -/* Barrier between changing inodes' journal flags and writepages ops. */ +/* +* Barrier between writepages ops and changing any inode's JOURNAL_DATA +* or EXTENTS flag. +*/ struct percpu_rw_semaphore s_writepages_rwsem;struct dax_device *s_daxdev; };
fs/ext4/migrate.c +19 -8
@@ -434,6 +434,7 @@ static int free_ext_block(handle_t *handint ext4_ext_migrate (struct inode *inode) { +struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb);handle_t *handle;int retval =0 , i;__le32 *i_data;
@@ -458,6 +459,8 @@ int ext4_ext_migrate(struct inode *inode*/ return retval; +percpu_down_write (&sbi->s_writepages_rwsem); +/* * Worst case we can touch the allocation bitmaps, a bgd * block, and a block to link in the orphan list. We do need
@@ -468,7 +471,7 @@ int ext4_ext_migrate(struct inode *inodeif (IS_ERR (handle)) { retval =PTR_ERR (handle); -return retval; + goto out_unlock; } goal = (((inode->i_ino -1 ) /EXT4_INODES_PER_GROUP (inode->i_sb)) *EXT4_INODES_PER_GROUP (inode->i_sb)) +1 ;
@@ -479,7 +482,7 @@ int ext4_ext_migrate(struct inode *inodeif (IS_ERR (tmp_inode)) { retval =PTR_ERR (tmp_inode);ext4_journal_stop (handle); -return retval; + goto out_unlock; }i_size_write (tmp_inode,i_size_read (inode));/*
@@ -521,7 +524,7 @@ int ext4_ext_migrate(struct inode *inode*/ ext4_orphan_del (NULL , tmp_inode); retval =PTR_ERR (handle); - goto out; + goto out_tmp_inode; } ei =EXT4_I (inode);
@@ -602,10 +605,11 @@ err_out:/* Reset the extent details */ ext4_ext_tree_init (handle, tmp_inode);ext4_journal_stop (handle); -out: +out_tmp_inode:unlock_new_inode (tmp_inode);iput (tmp_inode); - +out_unlock: +percpu_up_write (&sbi->s_writepages_rwsem);return retval; }
@@ -615,7 +619,8 @@ out:int ext4_ind_migrate (struct inode *inode) {struct ext4_extent_header *eh; -struct ext4_super_block *es =EXT4_SB (inode->i_sb)->s_es; +struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb); +struct ext4_super_block *es = sbi->s_es;struct ext4_inode_info *ei =EXT4_I (inode);struct ext4_extent *ex;unsigned int i, len;
@@ -639,9 +644,13 @@ int ext4_ind_migrate(struct inode *inodeif (test_opt (inode->i_sb,DELALLOC ))ext4_alloc_da_blocks (inode); +percpu_down_write (&sbi->s_writepages_rwsem); + handle =ext4_journal_start (inode,EXT4_HT_MIGRATE ,1 ); -if (IS_ERR (handle)) -return PTR_ERR (handle); +if (IS_ERR (handle)) { + ret =PTR_ERR (handle); + goto out_unlock; + }down_write (&EXT4_I (inode)->i_data_sem); ret =ext4_ext_check_inode (inode);
@@ -676,5 +685,7 @@ int ext4_ind_migrate(struct inode *inode errout:ext4_journal_stop (handle);up_write (&EXT4_I (inode)->i_data_sem); +out_unlock: +percpu_up_write (&sbi->s_writepages_rwsem);return ret; }
Greg Kroah-Hartman
maintainerPATCH 216/237 KVM: nVMX: Refactor IO bitmap checks into helper function
In reply to Greg Kroah-HartmanFrom: Oliver Upton <[email protected]>
commit e71237d3ff1abf9f3388337cfebf53b96df2020d upstream.
Checks against the IO bitmap are useful for both instruction emulation and VM-exit reflection. Refactor the IO bitmap checks into a helper function.
--- arch/x86/kvm/vmx.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-)
arch/x86/kvm/vmx.c +27 -13
@@ -4991,6 +4991,26 @@ static bool cs_ss_rpl_check(struct kvm_v (ss.selector & SEGMENT_RPL_MASK)); } +static bool nested_vmx_check_io_bitmaps (struct kvm_vcpu *vcpu, +unsigned int port,int size); +static bool nested_vmx_exit_handled_io (struct kvm_vcpu *vcpu, +struct vmcs12 *vmcs12) +{ +unsigned long exit_qualification; +unsigned int port; +int size; + +if (!nested_cpu_has (vmcs12,CPU_BASED_USE_IO_BITMAPS )) +return nested_cpu_has (vmcs12,CPU_BASED_UNCOND_IO_EXITING ); + + exit_qualification =vmcs_readl (EXIT_QUALIFICATION ); + + port = exit_qualification >>16 ; + size = (exit_qualification &7 ) +1 ; + +return nested_vmx_check_io_bitmaps (vcpu, port, size); +} +/* * Check if guest state is valid. Returns true if valid, false if * not.
@@ -8521,23 +8541,17 @@ static int (*const kvm_vmx_exit_handlersstatic const int kvm_vmx_max_exit_handlers =ARRAY_SIZE (kvm_vmx_exit_handlers); -static bool nested_vmx_exit_handled_io (struct kvm_vcpu *vcpu, -struct vmcs12 *vmcs12) +/* +* Return true if an IO instruction with the specified port and size should cause +* a VM-exit into L1. +*/ +bool nested_vmx_check_io_bitmaps (struct kvm_vcpu *vcpu,unsigned int port, +int size) { -unsigned long exit_qualification; +struct vmcs12 *vmcs12 =get_vmcs12 (vcpu);gpa_t bitmap, last_bitmap; -unsigned int port; -int size;u8 b; -if (!nested_cpu_has (vmcs12,CPU_BASED_USE_IO_BITMAPS )) -return nested_cpu_has (vmcs12,CPU_BASED_UNCOND_IO_EXITING ); - - exit_qualification =vmcs_readl (EXIT_QUALIFICATION ); - - port = exit_qualification >>16 ; - size = (exit_qualification &7 ) +1 ; - last_bitmap = (gpa_t)-1 ; b =-1 ;
Greg Kroah-Hartman
maintainerPATCH 217/237 KVM: nVMX: Check IO instruction VM-exit conditions
In reply to Greg Kroah-HartmanFrom: Oliver Upton <[email protected]>
commit 35a571346a94fb93b5b3b6a599675ef3384bc75c upstream.
Consult the 'unconditional IO exiting' and 'use IO bitmaps' VM-execution controls when checking instruction interception. If the 'use IO bitmaps' VM-execution control is 1, check the instruction access against the IO bitmaps to determine if the instruction causes a VM-exit.
--- arch/x86/kvm/vmx.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 7 deletions(-)
arch/x86/kvm/vmx.c +52 -7
@@ -4997,7 +4997,7 @@ static bool nested_vmx_exit_handled_io(s struct vmcs12 *vmcs12) {unsigned long exit_qualification; -unsigned int port; +unsigned short port;int size;if (!nested_cpu_has (vmcs12,CPU_BASED_USE_IO_BITMAPS ))
@@ -12335,6 +12335,39 @@ static void nested_vmx_entry_failure(strto_vmx (vcpu)->nested.sync_shadow_vmcs = true; } +static int vmx_check_intercept_io (struct kvm_vcpu *vcpu, +struct x86_instruction_info *info) +{ +struct vmcs12 *vmcs12 =get_vmcs12 (vcpu); +unsigned short port; +bool intercept; +int size; + +if (info->intercept == x86_intercept_in || + info->intercept == x86_intercept_ins) { + port = info->src_val; + size = info->dst_bytes; + }else { + port = info->dst_val; + size = info->src_bytes; + } + +/* +* If the 'use IO bitmaps' VM-execution control is 0, IO instruction +* VM-exits depend on the 'unconditional IO exiting' VM-execution +* control. +* +* Otherwise, IO instruction VM-exits are controlled by the IO bitmaps. +*/ +if (!nested_cpu_has (vmcs12,CPU_BASED_USE_IO_BITMAPS )) + intercept =nested_cpu_has (vmcs12, +CPU_BASED_UNCOND_IO_EXITING ); +else + intercept =nested_vmx_check_io_bitmaps (vcpu, port, size); + +return intercept ?X86EMUL_UNHANDLEABLE :X86EMUL_CONTINUE ; +} +static int vmx_check_intercept (struct kvm_vcpu *vcpu,struct x86_instruction_info *info,enum x86_intercept_stage stage)
@@ -12342,18 +12375,30 @@ static int vmx_check_intercept(struct kvstruct vmcs12 *vmcs12 =get_vmcs12 (vcpu);struct x86_emulate_ctxt *ctxt = &vcpu->arch.emulate_ctxt; +switch (info->intercept) {/* * RDPID causes #UD if disabled through secondary execution controls. * Because it is marked as EmulateOnUD, we need to intercept it here. */ -if (info->intercept == x86_intercept_rdtscp && - !nested_cpu_has2 (vmcs12,SECONDARY_EXEC_RDTSCP )) { - ctxt->exception.vector =UD_VECTOR ; - ctxt->exception.error_code_valid = false; -return X86EMUL_PROPAGATE_FAULT ; - } +case x86_intercept_rdtscp: +if (!nested_cpu_has2 (vmcs12,SECONDARY_EXEC_RDTSCP )) { + ctxt->exception.vector =UD_VECTOR ; + ctxt->exception.error_code_valid = false; +return X86EMUL_PROPAGATE_FAULT ; + } +break ; + +case x86_intercept_in: +case x86_intercept_ins: +case x86_intercept_out: +case x86_intercept_outs: +return vmx_check_intercept_io (vcpu, info);/* TODO: check more intercepts... */ +default : +break ; + } +return X86EMUL_UNHANDLEABLE ; }
Greg Kroah-Hartman
maintainerPATCH 218/237 KVM: nVMX: handle nested posted interrupts when apicv is disabled for L1
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
commit 91a5f413af596ad01097e59bf487eb07cb3f1331 upstream.
Even when APICv is disabled for L1 it can (and, actually, is) still available for L2, this means we need to always call vmx_deliver_nested_posted_interrupt() when attempting an interrupt delivery.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/lapic.c | 5 +---- arch/x86/kvm/svm.c | 7 ++++++- arch/x86/kvm/vmx.c | 13 +++++++++---- 4 files changed, 17 insertions(+), 10 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1006,7 +1006,7 @@ struct kvm_x86_ops {void (*load_eoi_exitmap)(struct kvm_vcpu *vcpu,u64 *eoi_exit_bitmap);void (*set_virtual_apic_mode)(struct kvm_vcpu *vcpu);void (*set_apic_access_page_addr)(struct kvm_vcpu *vcpu,hpa_t hpa); -void (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu,int vector); +int (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu,int vector);int (*sync_pir_to_irr)(struct kvm_vcpu *vcpu);int (*set_tss_addr)(struct kvm *kvm,unsigned int addr);int (*get_tdp_level)(struct kvm_vcpu *vcpu);
arch/x86/kvm/lapic.c +1 -4
@@ -993,11 +993,8 @@ static int __apic_accept_irq(struct kvm_apic_clear_vector (vector, apic->regs +APIC_TMR ); } -if (vcpu->arch.apicv_active) - kvm_x86_ops->deliver_posted_interrupt (vcpu, vector); -else { +if (kvm_x86_ops->deliver_posted_interrupt (vcpu, vector)) {kvm_lapic_set_irr (vector, apic); -kvm_make_request (KVM_REQ_EVENT , vcpu);kvm_vcpu_kick (vcpu); }
arch/x86/kvm/svm.c +6 -1
@@ -4631,8 +4631,11 @@ static void svm_load_eoi_exitmap(structreturn ; } -static void svm_deliver_avic_intr (struct kvm_vcpu *vcpu,int vec) +static int svm_deliver_avic_intr (struct kvm_vcpu *vcpu,int vec) { +if (!vcpu->arch.apicv_active) +return -1 ; +kvm_lapic_set_irr (vec, vcpu->arch.apic);smp_mb__after_atomic ();
@@ -4641,6 +4644,8 @@ static void svm_deliver_avic_intr(struct kvm_cpu_get_apicid(vcpu->cpu)); elsekvm_vcpu_wake_up (vcpu ); + +return 0 ; }static bool svm_dy_apicv_has_pending_interrupt (struct kvm_vcpu *vcpu)
arch/x86/kvm/vmx.c +9 -4
@@ -5541,24 +5541,29 @@ static int vmx_deliver_nested_posted_int* 2. If target vcpu isn't running(root mode), kick it to pick up the * interrupt from PIR in next vmentry. */ -static void vmx_deliver_posted_interrupt (struct kvm_vcpu *vcpu,int vector) +static int vmx_deliver_posted_interrupt (struct kvm_vcpu *vcpu,int vector) {struct vcpu_vmx *vmx =to_vmx (vcpu);int r; r =vmx_deliver_nested_posted_interrupt (vcpu, vector);if (!r) -return ; +return 0 ; + +if (!vcpu->arch.apicv_active) +return -1 ;if (pi_test_and_set_pir (vector, &vmx->pi_desc)) -return ; +return 0 ;/* If a previous notification has sent the IPI, nothing to do. */ if (pi_test_and_set_on (&vmx->pi_desc)) -return ; +return 0 ;if (!kvm_vcpu_trigger_posted_interrupt (vcpu, false))kvm_vcpu_kick (vcpu); + +return 0 ; }/*
Greg Kroah-Hartman
maintainerPATCH 219/237 KVM: apic: avoid calculating pending eoi from an uninitialized val
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit 23520b2def95205f132e167cf5b25c609975e959 upstream.
When pv_eoi_get_user() fails, 'val' may remain uninitialized and the return value of pv_eoi_get_pending() becomes random. Fix the issue by initializing the variable.
--- arch/x86/kvm/lapic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kvm/lapic.c +3 -1
@@ -566,9 +566,11 @@ static inline bool pv_eoi_enabled(structstatic bool pv_eoi_get_pending (struct kvm_vcpu *vcpu) {u8 val; -if (pv_eoi_get_user (vcpu, &val) <0 ) +if (pv_eoi_get_user (vcpu, &val) <0 ) {apic_debug ("Can't read EOI MSR value: 0x%llx\n" , (unsigned long long )vcpu->arch.pv_eoi.msr_val); +return false; + }return val &0x1 ; }
Greg Kroah-Hartman
maintainerPATCH 220/237 btrfs: fix bytes_may_use underflow in prealloc error condtition
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit b778cf962d71a0e737923d55d0432f3bd287258e upstream.
I hit the following warning while running my error injection stress testing:
WARNING: CPU: 3 PID: 1453 at fs/btrfs/space-info.h:108 btrfs_free_reserved_data_space_noquota+0xfd/0x160 [btrfs] RIP: 0010:btrfs_free_reserved_data_space_noquota+0xfd/0x160 [btrfs] Call Trace: btrfs_free_reserved_data_space+0x4f/0x70 [btrfs] __btrfs_prealloc_file_range+0x378/0x470 [btrfs] elfcorehdr_read+0x40/0x40 ? elfcorehdr_read+0x40/0x40 ? btrfs_commit_transaction+0xca/0xa50 [btrfs] ? dput+0xb4/0x2a0 ? btrfs_log_dentry_safe+0x55/0x70 [btrfs] ? btrfs_sync_file+0x30e/0x420 [btrfs] ? do_fsync+0x38/0x70 ? __x64_sys_fdatasync+0x13/0x20 ? do_syscall_64+0x5b/0x1b0 ? entry_SYSCALL_64_after_hwframe+0x44/0xa9
This happens if we fail to insert our reserved file extent. At this point we've already converted our reservation from ->bytes_may_use to ->bytes_reserved. However once we break we will attempt to free everything from [cur_offset, end] from ->bytes_may_use, but our extent reservation will overlap part of this.
Fix this problem by adding ins.offset (our extent allocation size) to cur_offset so we remove the actual remaining part from ->bytes_may_use.
I validated this fix using my inject-error.py script
python inject-error.py -o should_fail_bio -t cache_save_setup -t \ __btrfs_prealloc_file_range \ -t insert_reserved_file_extent.constprop.0 \ -r "-5" ./run-fsstress.sh
where run-fsstress.sh simply mounts and runs fsstress on a disk.
--- fs/btrfs/inode.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
fs/btrfs/inode.c +13 -3
@@ -10639,6 +10639,7 @@ static int __btrfs_prealloc_file_range(sstruct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_key ins;u64 cur_offset = start; +u64 clear_offset = start;u64 i_size;u64 cur_bytes;u64 last_alloc = (u64)-1 ;
@@ -10673,6 +10674,15 @@ static int __btrfs_prealloc_file_range(sbtrfs_end_transaction (trans);break ; } + +/* +* We've reserved this space, and thus converted it from +* ->bytes_may_use to ->bytes_reserved. Any error that happens +* from here on out we will only need to clear our reservation +* for the remaining unreserved area, so advance our +* clear_offset by our extent size. +*/ + clear_offset += ins.offset;btrfs_dec_block_group_reservations (fs_info, ins.objectid); last_alloc = ins.offset;
@@ -10753,9 +10763,9 @@ next:if (own_trans)btrfs_end_transaction (trans); } -if (cur_offset < end) -btrfs_free_reserved_data_space (inode,NULL , cur_offset, - end - cur_offset +1 ); +if (clear_offset < end) +btrfs_free_reserved_data_space (inode,NULL , clear_offset, + end - clear_offset +1 );return ret; }
Greg Kroah-Hartman
maintainerPATCH 221/237 btrfs: do not check delayed items are empty for single transaction cleanup
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 1e90315149f3fe148e114a5de86f0196d1c21fa5 upstream.
btrfs_assert_delayed_root_empty() will check if the delayed root is completely empty, but this is a filesystem-wide check. On cleanup we may have allowed other transactions to begin, for whatever reason, and thus the delayed root is not empty.
So remove this check from cleanup_one_transation(). This however can stay in btrfs_cleanup_transaction(), because it checks only after all of the transactions have been properly cleaned up, and thus is valid.
--- fs/btrfs/disk-io.c | 1 - 1 file changed, 1 deletion(-)
fs/btrfs/disk-io.c +0 -1
@@ -4394,7 +4394,6 @@ void btrfs_cleanup_one_transaction(strucwake_up (&fs_info->transaction_wait);btrfs_destroy_delayed_inodes (fs_info); -btrfs_assert_delayed_root_empty (fs_info);btrfs_destroy_marked_extents (fs_info, &cur_trans->dirty_pages,EXTENT_DIRTY );
Greg Kroah-Hartman
maintainerPATCH 222/237 Btrfs: fix btrfs_wait_ordered_range() so that it waits for all ordered extents
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit e75fd33b3f744f644061a4f9662bd63f5434f806 upstream.
In btrfs_wait_ordered_range() once we find an ordered extent that has finished with an error we exit the loop and don't wait for any other ordered extents that might be still in progress.
All the users of btrfs_wait_ordered_range() expect that there are no more ordered extents in progress after that function returns. So past fixes such like the ones from the two following commits:
ff612ba7849964 ("btrfs: fix panic during relocation after ENOSPC before
writeback happens")
28aeeac1dd3080 ("Btrfs: fix panic when starting bg cache writeout after
IO error")
don't work when there are multiple ordered extents in the range.
Fix that by making btrfs_wait_ordered_range() wait for all ordered extents even after it finds one that had an error.
--- fs/btrfs/ordered-data.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/btrfs/ordered-data.c +6 -1
@@ -838,10 +838,15 @@ int btrfs_wait_ordered_range(struct inod }btrfs_start_ordered_extent (inode, ordered,1 ); end = ordered->file_offset; +/* +* If the ordered extent had an error save the error but don't +* exit without waiting first for all other ordered extents in +* the range to complete. +*/ if (test_bit (BTRFS_ORDERED_IOERR , &ordered->flags)) ret = -EIO ;btrfs_put_ordered_extent (ordered); -if (ret || end ==0 || end == start) +if (end ==0 || end == start)break ; end--; }
Greg Kroah-Hartman
maintainerPATCH 223/237 scsi: Revert "RDMA/isert: Fix a recently introduced regression related to logout"
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
commit 76261ada16dcc3be610396a46d35acc3efbda682 upstream.
Since commit 04060db41178 introduces soft lockups when toggling network interfaces, revert it.
--- drivers/infiniband/ulp/isert/ib_isert.c | 12 ++++++++++++ drivers/target/iscsi/iscsi_target.c | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-)
drivers/infiniband/ulp/isert/ib_isert.c +12 -0
@@ -2582,6 +2582,17 @@ isert_wait4logout(struct isert_conn *ise } } +static void +isert_wait4cmds (struct iscsi_conn *conn) +{ +isert_info ("iscsi_conn %p\n" , conn); + +if (conn->sess) { +target_sess_cmd_list_set_waiting (conn->sess->se_sess); +target_wait_for_sess_cmds (conn->sess->se_sess); + } +} +/** * isert_put_unsol_pending_cmds() - Drop commands waiting for * unsolicitate dataout
@@ -2629,6 +2640,7 @@ static void isert_wait_conn(struct iscsiib_drain_qp (isert_conn->qp);isert_put_unsol_pending_cmds (conn); +isert_wait4cmds (conn);isert_wait4logout (isert_conn);queue_work (isert_release_wq, &isert_conn->release_work);
drivers/target/iscsi/iscsi_target.c +3 -3
@@ -4155,6 +4155,9 @@ int iscsit_close_connection(iscsit_stop_nopin_response_timer (conn);iscsit_stop_nopin_timer (conn); +if (conn->conn_transport->iscsit_wait_conn) + conn->conn_transport->iscsit_wait_conn (conn); +/* * During Connection recovery drop unacknowledged out of order * commands for this connection, and prepare the other commands
@@ -4240,9 +4243,6 @@ int iscsit_close_connection(target_sess_cmd_list_set_waiting (sess->se_sess);target_wait_for_sess_cmds (sess->se_sess); -if (conn->conn_transport->iscsit_wait_conn) - conn->conn_transport->iscsit_wait_conn (conn); -ahash_request_free (conn->conn_tx_hash);if (conn->conn_rx_hash) {struct crypto_ahash *tfm;
Greg Kroah-Hartman
maintainerPATCH 224/237 scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session"
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
commit 807b9515b7d044cf77df31f1af9d842a76ecd5cb upstream.
Since commit e9d3009cb936 introduced a regression and since the fix for that regression was not perfect, revert this commit.
--- drivers/target/iscsi/iscsi_target.c | 10 ++-------- include/scsi/iscsi_proto.h | 1 - 2 files changed, 2 insertions(+), 9 deletions(-)
drivers/target/iscsi/iscsi_target.c +2 -8
@@ -1158,9 +1158,7 @@ int iscsit_setup_scsi_cmd(struct iscsi_c hdr->cmdsn,be32_to_cpu (hdr->data_length), payload_length, conn->cid); -if (target_get_sess_cmd (&cmd->se_cmd, true) <0 ) -return iscsit_add_reject_cmd (cmd, -ISCSI_REASON_WAITING_FOR_LOGOUT , buf); +target_get_sess_cmd (&cmd->se_cmd, true); cmd->sense_reason =transport_lookup_cmd_lun (&cmd->se_cmd,scsilun_to_int (&hdr->lun));
@@ -2006,9 +2004,7 @@ iscsit_handle_task_mgt_cmd(struct iscsi_ conn->sess->se_sess,0 ,DMA_NONE , TCM_SIMPLE_TAG, cmd->sense_buffer + 2); -if (target_get_sess_cmd (&cmd->se_cmd, true) <0 ) -return iscsit_add_reject_cmd (cmd, -ISCSI_REASON_WAITING_FOR_LOGOUT , buf); +target_get_sess_cmd (&cmd->se_cmd, true);/* * TASK_REASSIGN for ERL=2 / connection stays inside of
@@ -4240,8 +4236,6 @@ int iscsit_close_connection(* must wait until they have completed. */ iscsit_check_conn_usage_count (conn); -target_sess_cmd_list_set_waiting (sess->se_sess); -target_wait_for_sess_cmds (sess->se_sess);ahash_request_free (conn->conn_tx_hash);if (conn->conn_rx_hash) {
include/scsi/iscsi_proto.h +0 -1
@@ -638,7 +638,6 @@ struct iscsi_reject {#define ISCSI_REASON_BOOKMARK_INVALID 9#define ISCSI_REASON_BOOKMARK_NO_RESOURCES 10#define ISCSI_REASON_NEGOTIATION_RESET 11 -#define ISCSI_REASON_WAITING_FOR_LOGOUT 12/* Max. number of Key=Value pairs in a text message */ #define MAX_KEY_VALUE_PAIRS 8192
Greg Kroah-Hartman
maintainerPATCH 225/237 usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus
In reply to Greg Kroah-HartmanFrom: Jack Pham <[email protected]>
commit c724417baf162bd3e035659e22cdf990cfb0d917 upstream.
SuperSpeedPlus peripherals must report their bMaxPower of the configuration descriptor in units of 8mA as per the USB 3.2 specification. The current switch statement in encode_bMaxPower() only checks for USB_SPEED_SUPER but not USB_SPEED_SUPER_PLUS so the latter falls back to USB 2.0 encoding which uses 2mA units. Replace the switch with a simple if/else.
--- drivers/usb/gadget/composite.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/usb/gadget/composite.c +3 -5
@@ -440,12 +440,10 @@ static u8 encode_bMaxPower(enum usb_devi val =CONFIG_USB_GADGET_VBUS_DRAW ;if (!val)return 0 ; -switch (speed) { -case USB_SPEED_SUPER : -return DIV_ROUND_UP (val,8 ); -default : +if (speed <USB_SPEED_SUPER )return DIV_ROUND_UP (val,2 ); - } +else +return DIV_ROUND_UP (val,8 ); } static int config_buf(struct usb_configuration *config,
Greg Kroah-Hartman
maintainerPATCH 226/237 staging: rtl8723bs: fix copy of overlapping memory
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit 8ae9a588ca35eb9c32dc03299c5e1f4a1e9a9617 upstream.
Currently the rtw_sprintf prints the contents of thread_name onto thread_name and this can lead to a potential copy of a string over itself. Avoid this by printing the literal string RTWHALXT instread of the contents of thread_name.
Addresses-Coverity: ("copy of overlapping memory")
--- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +2 -3
@@ -486,14 +486,13 @@ int rtl8723bs_xmit_thread(void *context)s32 ret;struct adapter *padapter;struct xmit_priv *pxmitpriv; -u8 thread_name[20 ] ="RTWHALXT" ; - +u8 thread_name[20 ]; ret = _SUCCESS; padapter = context; pxmitpriv = &padapter->xmitpriv; -rtw_sprintf (thread_name,20 ,"%s-" ADPT_FMT , thread_name,ADPT_ARG (padapter)); +rtw_sprintf (thread_name,20 ,"RTWHALXT-" ADPT_FMT ,ADPT_ARG (padapter));thread_enter (thread_name);DBG_871X ("start " FUNC_ADPT_FMT "\n" ,FUNC_ADPT_ARG (padapter));
Greg Kroah-Hartman
maintainerPATCH 227/237 staging: greybus: use after free in gb_audio_manager_remove_all()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit b7db58105b80fa9232719c8329b995b3addfab55 upstream.
When we call kobject_put() and it's the last reference to the kobject then it calls gb_audio_module_release() and frees module. We dereference "module" on the next line which is a use after free.
--- drivers/staging/greybus/audio_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/greybus/audio_manager.c +1 -1
@@ -90,8 +90,8 @@ void gb_audio_manager_remove_all(void)list_for_each_entry_safe (module, next, &modules_list, list) {list_del (&module->list); -kobject_put (&module->kobj);ida_simple_remove (&module_id, module->id); +kobject_put (&module->kobj); } is_empty =list_empty (&modules_list);
Greg Kroah-Hartman
maintainerPATCH 228/237 ecryptfs: replace BUG_ON with error handling code
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
commit 2c2a7552dd6465e8fde6bc9cccf8d66ed1c1eb72 upstream.
In crypt_scatterlist, if the crypt_stat argument is not set up correctly, the kernel crashes. Instead, by returning an error code upstream, the error is handled safely.
The issue is detected via a static analysis tool written by us.
--- fs/ecryptfs/crypto.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/ecryptfs/crypto.c +4 -2
@@ -339,8 +339,10 @@ static int crypt_scatterlist(struct ecrystruct extent_crypt_result ecr;int rc =0 ; -BUG_ON (!crypt_stat || !crypt_stat->tfm - || !(crypt_stat->flags &ECRYPTFS_STRUCT_INITIALIZED )); +if (!crypt_stat || !crypt_stat->tfm + || !(crypt_stat->flags &ECRYPTFS_STRUCT_INITIALIZED )) +return -EINVAL ; +if (unlikely (ecryptfs_verbosity >0 )) {ecryptfs_printk (KERN_DEBUG ,"Key size [%zd]; key:\n" , crypt_stat->key_size);
Greg Kroah-Hartman
maintainerPATCH 229/237 iommu/vt-d: Fix compile warning from intel-svm.h
In reply to Greg Kroah-HartmanFrom: Joerg Roedel <[email protected]>
commit e7598fac323aad0e502415edeffd567315994dd6 upstream.
The intel_svm_is_pasid_valid() needs to be marked inline, otherwise it causes the compile warning below:
CC [M] drivers/dma/idxd/cdev.o
In file included from drivers/dma/idxd/cdev.c:9:0:./include/linux/intel-svm.h:125:12: warning: ‘intel_svm_is_pasid_valid’ defined but not used [-Wunused-function]
static int intel_svm_is_pasid_valid(struct device *dev, int pasid)
^~~~~~~~~~~~~~~~~~~~~~~~
--- include/linux/intel-svm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/intel-svm.h +1 -1
@@ -130,7 +130,7 @@ static inline int intel_svm_unbind_mm(stBUG (); } -static int intel_svm_is_pasid_valid (struct device *dev,int pasid) +static inline int intel_svm_is_pasid_valid (struct device *dev,int pasid) {return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 230/237 genirq/proc: Reject invalid affinity masks (again)
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit cba6437a1854fde5934098ec3bd0ee83af3129f5 upstream.
Qian Cai reported that the WARN_ON() in the x86/msi affinity setting code, which catches cases where the affinity setting is not done on the CPU which is the current target of the interrupt, triggers during CPU hotplug stress testing.
It turns out that the warning which was added with the commit addressing the MSI affinity race unearthed yet another long standing bug.
If user space writes a bogus affinity mask, i.e. it contains no online CPUs, then it calls irq_select_affinity_usr(). This was introduced for ALPHA in
eee45269b0f5 ("[PATCH] Alpha: convert to generic irq framework (generic part)")
and subsequently made available for all architectures in
18404756765c ("genirq: Expose default irq affinity mask (take 3)")
which introduced the circumvention of the affinity setting restrictions for interrupt which cannot be moved in process context.
The whole exercise is bogus in various aspects:
1) If the interrupt is already started up then there is absolutely no point to honour a bogus interrupt affinity setting from user space. The interrupt is already assigned to an online CPU and it does not make any sense to reassign it to some other randomly chosen online CPU.
2) If the interupt is not yet started up then there is no point either. A subsequent startup of the interrupt will invoke irq_setup_affinity() anyway which will chose a valid target CPU.
So the only correct solution is to just return -EINVAL in case user space wrote an affinity mask which does not contain any online CPUs, except for ALPHA which has it's own magic sauce for this.
--- kernel/irq/internals.h | 2 -- kernel/irq/manage.c | 18 ++---------------- kernel/irq/proc.c | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 18 deletions(-)
kernel/irq/internals.h +0 -2
@@ -119,8 +119,6 @@ static inline void unregister_handler_prextern bool irq_can_set_affinity_usr (unsigned int irq); -extern int irq_select_affinity_usr (unsigned int irq); -extern void irq_set_thread_affinity (struct irq_desc *desc); extern int irq_do_set_affinity(struct irq_data *data,
kernel/irq/manage.c +2 -16
@@ -382,23 +382,9 @@ int irq_setup_affinity(struct irq_desc * {return irq_select_affinity (irq_desc_get_irq (desc)); } -#endif +#endif /* CONFIG_AUTO_IRQ_AFFINITY */ +#endif /* CONFIG_SMP */ -/* -* Called when a bogus affinity is set via /proc/irq -*/ -int irq_select_affinity_usr (unsigned int irq) -{ -struct irq_desc *desc =irq_to_desc (irq); -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&desc->lock, flags); - ret =irq_setup_affinity (desc); -raw_spin_unlock_irqrestore (&desc->lock, flags); -return ret; -} -#endif /** * irq_set_vcpu_affinity - Set vcpu affinity for the interrupt
kernel/irq/proc.c +22 -0
@@ -117,6 +117,28 @@ static int irq_affinity_list_proc_show(sreturn show_irq_affinity (AFFINITY_LIST , m); } +#ifndef CONFIG_AUTO_IRQ_AFFINITY +static inline int irq_select_affinity_usr (unsigned int irq) +{ +/* +* If the interrupt is started up already then this fails. The +* interrupt is assigned to an online CPU already. There is no +* point to move it around randomly. Tell user space that the +* selected mask is bogus. +* +* If not then any change to the affinity is pointless because the +* startup code invokes irq_setup_affinity() which will select +* a online CPU anyway. +*/ +return -EINVAL ; +} +#else +/* ALPHA magic affinity auto selector. Keep it for historical reasons. */ +static inline int irq_select_affinity_usr (unsigned int irq) +{ +return irq_select_affinity (irq); +} +#endif static ssize_t write_irq_affinity (int type,struct file *file,const char __user *buffer,size_t count,loff_t *pos)
Greg Kroah-Hartman
maintainerPATCH 231/237 ALSA: rawmidi: Avoid bit fields for state flags
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit dfa9a5efe8b932a84b3b319250aa3ac60c20f876 upstream.
The rawmidi state flags (opened, append, active_sensing) are stored in bit fields that can be potentially racy when concurrently accessed without any locks. Although the current code should be fine, there is also no any real benefit by keeping the bitfields for this kind of short number of members.
This patch changes those bit fields flags to the simple bool fields. There should be no size increase of the snd_rawmidi_substream by this change.
--- include/sound/rawmidi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/sound/rawmidi.h +3 -3
@@ -92,9 +92,9 @@ struct snd_rawmidi_substream {struct list_head list;/* list of all substream for given stream */ int stream;/* direction */ int number;/* substream number */ - unsigned int opened: 1, /* open flag */ - append: 1, /* append flag (merge more streams) */ - active_sensing: 1; /* send active sensing when close */ +bool opened;/* open flag */ +bool append;/* append flag (merge more streams) */ +bool active_sensing;/* send active sensing when close */ int use_count;/* use counter (for output) */ size_t bytes;struct snd_rawmidi *rmidi;
Greg Kroah-Hartman
maintainerPATCH 232/237 ALSA: seq: Avoid concurrent access to queue flags
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit bb51e669fa49feb5904f452b2991b240ef31bc97 upstream.
The queue flags are represented in bit fields and the concurrent access may result in unexpected results. Although the current code should be mostly OK as it's only reading a field while writing other fields as KCSAN reported, it's safer to cover both with a proper spinlock protection.
This patch fixes the possible concurrent read by protecting with q->owner_lock. Also the queue owner field is protected as well since it's the field to be protected by the lock itself.
--- sound/core/seq/seq_queue.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
sound/core/seq/seq_queue.c +16 -4
@@ -415,6 +415,7 @@ int snd_seq_queue_check_access(int queueint snd_seq_queue_set_owner (int queueid,int client,int locked) {struct snd_seq_queue *q =queueptr (queueid); +unsigned long flags;if (q ==NULL )return -EINVAL ;
@@ -424,8 +425,10 @@ int snd_seq_queue_set_owner(int queueid,return -EPERM ; } +spin_lock_irqsave (&q->owner_lock, flags); q->locked = locked ?1 :0 ; q->owner = client; +spin_unlock_irqrestore (&q->owner_lock, flags);queue_access_unlock (q);queuefree (q);
@@ -564,15 +567,17 @@ void snd_seq_queue_client_termination(inunsigned long flags;int i;struct snd_seq_queue *q; +bool matched;for (i =0 ; i <SNDRV_SEQ_MAX_QUEUES ; i++) {if ((q =queueptr (i)) ==NULL )continue ;spin_lock_irqsave (&q->owner_lock, flags); -if (q->owner == client) + matched = (q->owner == client); +if (matched) q->klocked =1 ;spin_unlock_irqrestore (&q->owner_lock, flags); -if (q->owner == client) { +if (matched) {if (q->timer->running)snd_seq_timer_stop (q->timer);snd_seq_timer_reset (q->timer);
@@ -764,6 +769,8 @@ void snd_seq_info_queues_read(struct sndint i, bpm;struct snd_seq_queue *q;struct snd_seq_timer *tmr; +bool locked; +int owner;for (i =0 ; i <SNDRV_SEQ_MAX_QUEUES ; i++) {if ((q =queueptr (i)) ==NULL )
@@ -775,9 +782,14 @@ void snd_seq_info_queues_read(struct sndelse bpm =0 ; +spin_lock_irq (&q->owner_lock); + locked = q->locked; + owner = q->owner; +spin_unlock_irq (&q->owner_lock); +snd_iprintf (buffer,"queue %d: [%s]\n" , q->queue, q->name); -snd_iprintf (buffer,"owned by client : %d\n" , q->owner); -snd_iprintf (buffer,"lock status : %s\n" , q->locked ?"Locked" :"Free" ); +snd_iprintf (buffer,"owned by client : %d\n" , owner); +snd_iprintf (buffer,"lock status : %s\n" , locked ?"Locked" :"Free" );snd_iprintf (buffer,"queued time events : %d\n" ,snd_seq_prioq_avail (q->timeq));snd_iprintf (buffer,"queued tick events : %d\n" ,snd_seq_prioq_avail (q->tickq));snd_iprintf (buffer,"timer state : %s\n" , tmr->running ?"Running" :"Stopped" );
Greg Kroah-Hartman
maintainerPATCH 233/237 ALSA: seq: Fix concurrent access to queue current tick/time
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit dc7497795e014d84699c3b8809ed6df35352dd74 upstream.
snd_seq_check_queue() passes the current tick and time of the given queue as a pointer to snd_seq_prioq_cell_out(), but those might be updated concurrently by the seq timer update.
Fix it by retrieving the current tick and time via the proper helper functions at first, and pass those values to snd_seq_prioq_cell_out() later in the loops.
snd_seq_timer_get_cur_time() takes a new argument and adjusts with the current system time only when it's requested so; this update isn't needed for snd_seq_check_queue(), as it's called either from the interrupt handler or right after queuing.
Also, snd_seq_timer_get_cur_tick() is changed to read the value in the spinlock for the concurrency, too.
--- sound/core/seq/seq_clientmgr.c | 4 ++-- sound/core/seq/seq_queue.c | 9 ++++++--- sound/core/seq/seq_timer.c | 13 ++++++++++--- sound/core/seq/seq_timer.h | 3 ++- 4 files changed, 20 insertions(+), 9 deletions(-)
sound/core/seq/seq_clientmgr.c +2 -2
@@ -564,7 +564,7 @@ static int update_timestamp_of_queue(str event->queue = queue; event->flags &= ~SNDRV_SEQ_TIME_STAMP_MASK ;if (real_time) { - event->time.time =snd_seq_timer_get_cur_time (q->timer); + event->time.time =snd_seq_timer_get_cur_time (q->timer, true); event->flags |=SNDRV_SEQ_TIME_STAMP_REAL ; }else { event->time.tick =snd_seq_timer_get_cur_tick (q->timer);
@@ -1639,7 +1639,7 @@ static int snd_seq_ioctl_get_queue_statu tmr = queue->timer; status->events = queue->tickq->cells + queue->timeq->cells; - status->time =snd_seq_timer_get_cur_time (tmr); + status->time =snd_seq_timer_get_cur_time (tmr, true); status->tick =snd_seq_timer_get_cur_tick (tmr); status->running = tmr->running;
sound/core/seq/seq_queue.c +6 -3
@@ -261,6 +261,8 @@ void snd_seq_check_queue(struct snd_seq_ {unsigned long flags;struct snd_seq_event_cell *cell; +snd_seq_tick_time_t cur_tick; +snd_seq_real_time_t cur_time;if (q ==NULL )return ;
@@ -277,17 +279,18 @@ void snd_seq_check_queue(struct snd_seq_ __again:/* Process tick queue... */ + cur_tick =snd_seq_timer_get_cur_tick (q->timer);for (;;) { - cell =snd_seq_prioq_cell_out (q->tickq, - &q->timer->tick.cur_tick); + cell =snd_seq_prioq_cell_out (q->tickq, &cur_tick);if (!cell)break ;snd_seq_dispatch_event (cell, atomic, hop); }/* Process time queue... */ + cur_time =snd_seq_timer_get_cur_time (q->timer, false);for (;;) { - cell =snd_seq_prioq_cell_out (q->timeq, &q->timer->cur_time); + cell =snd_seq_prioq_cell_out (q->timeq, &cur_time);if (!cell)break ;snd_seq_dispatch_event (cell, atomic, hop);
sound/core/seq/seq_timer.c +10 -3
@@ -436,14 +436,15 @@ int snd_seq_timer_continue(struct snd_se }/* return current 'real' time. use timeofday() to get better granularity. */ -snd_seq_real_time_t snd_seq_timer_get_cur_time (struct snd_seq_timer *tmr) +snd_seq_real_time_t snd_seq_timer_get_cur_time (struct snd_seq_timer *tmr, +bool adjust_ktime) {snd_seq_real_time_t cur_time;unsigned long flags;spin_lock_irqsave (&tmr->lock, flags); cur_time = tmr->cur_time; -if (tmr->running) { +if (adjust_ktime && tmr->running) {struct timespec64 tm;ktime_get_ts64 (&tm);
@@ -460,7 +461,13 @@ snd_seq_real_time_t snd_seq_timer_get_cuhigh PPQ values) */ snd_seq_tick_time_t snd_seq_timer_get_cur_tick (struct snd_seq_timer *tmr) { -return tmr->tick.cur_tick; +snd_seq_tick_time_t cur_tick; +unsigned long flags; + +spin_lock_irqsave (&tmr->lock, flags); + cur_tick = tmr->tick.cur_tick; +spin_unlock_irqrestore (&tmr->lock, flags); +return cur_tick; }
sound/core/seq/seq_timer.h +2 -1
@@ -135,7 +135,8 @@ int snd_seq_timer_set_ppq(struct snd_seqint snd_seq_timer_set_position_tick (struct snd_seq_timer *tmr,snd_seq_tick_time_t position);int snd_seq_timer_set_position_time (struct snd_seq_timer *tmr,snd_seq_real_time_t position);int snd_seq_timer_set_skew (struct snd_seq_timer *tmr,unsigned int skew,unsigned int base); -snd_seq_real_time_t snd_seq_timer_get_cur_time (struct snd_seq_timer *tmr); +snd_seq_real_time_t snd_seq_timer_get_cur_time (struct snd_seq_timer *tmr, +bool adjust_ktime);snd_seq_tick_time_t snd_seq_timer_get_cur_tick (struct snd_seq_timer *tmr);extern int seq_default_timer_class;
Greg Kroah-Hartman
maintainerPATCH 234/237 netfilter: xt_hashlimit: limit the max size of hashtable
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
commit 8d0015a7ab76b8b1e89a3e5f5710a6e5103f2dd5 upstream.
The user-specified hashtable size is unbound, this could easily lead to an OOM or a hung task as we hold the global mutex while allocating and initializing the new hashtable.
Add a max value to cap both cfg->size and cfg->max, as suggested by Florian.
--- net/netfilter/xt_hashlimit.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/netfilter/xt_hashlimit.c +10 -0
@@ -845,6 +845,8 @@ hashlimit_mt(const struct sk_buff *skb,return hashlimit_mt_common (skb, par, hinfo, &info->cfg,3 ); } +#define HASHLIMIT_MAX_SIZE 1048576 + static int hashlimit_mt_check_common(const struct xt_mtchk_param *par, struct xt_hashlimit_htable **hinfo, struct hashlimit_cfg3 *cfg,
@@ -855,6 +857,14 @@ static int hashlimit_mt_check_common(conif (cfg->gc_interval ==0 || cfg->expire ==0 )return -EINVAL ; +if (cfg->size >HASHLIMIT_MAX_SIZE ) { + cfg->size =HASHLIMIT_MAX_SIZE ; +pr_info_ratelimited ("size too large, truncated to %u\n" , cfg->size); + } +if (cfg->max >HASHLIMIT_MAX_SIZE ) { + cfg->max =HASHLIMIT_MAX_SIZE ; +pr_info_ratelimited ("max too large, truncated to %u\n" , cfg->max); + }if (par->family ==NFPROTO_IPV4 ) {if (cfg->srcmask >32 || cfg->dstmask >32 )return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 235/237 ata: ahci: Add shutdown to freeze hardware resources of ahci
In reply to Greg Kroah-HartmanFrom: Prabhakar Kushwaha <[email protected]>
commit 10a663a1b15134a5a714aa515e11425a44d4fdf7 upstream.
device_shutdown() called from reboot or power_shutdown expect all devices to be shutdown. Same is true for even ahci pci driver. As no ahci shutdown function is implemented, the ata subsystem always remains alive with DMA & interrupt support. File system related calls should not be honored after device_shutdown().
So defining ahci pci driver shutdown to freeze hardware (mask interrupt, stop DMA engine and free DMA resources).
--- drivers/ata/ahci.c | 7 +++++++ drivers/ata/libata-core.c | 21 +++++++++++++++++++++ include/linux/libata.h | 1 + 3 files changed, 29 insertions(+)
drivers/ata/ahci.c +7 -0
@@ -88,6 +88,7 @@ enum board_ids {static int ahci_init_one (struct pci_dev *pdev,const struct pci_device_id *ent);static void ahci_remove_one (struct pci_dev *dev); +static void ahci_shutdown_one (struct pci_dev *dev);static int ahci_vt8251_hardreset (struct ata_link *link,unsigned int *class,unsigned long deadline); static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class,
@@ -586,6 +587,7 @@ static struct pci_driver ahci_pci_driver .id_table = ahci_pci_tbl, .probe = ahci_init_one, .remove = ahci_remove_one, + .shutdown = ahci_shutdown_one, .driver = { .pm = &ahci_pci_pm_ops, },
@@ -1823,6 +1825,11 @@ static int ahci_init_one(struct pci_devreturn 0 ; } +static void ahci_shutdown_one (struct pci_dev *pdev) +{ +ata_pci_shutdown_one (pdev); +} +static void ahci_remove_one (struct pci_dev *pdev) {pm_runtime_get_noresume (&pdev->dev);
drivers/ata/libata-core.c +21 -0
@@ -6706,6 +6706,26 @@ void ata_pci_remove_one(struct pci_dev *ata_host_detach (host); } +void ata_pci_shutdown_one (struct pci_dev *pdev) +{ +struct ata_host *host =pci_get_drvdata (pdev); +int i; + +for (i =0 ; i < host->n_ports; i++) { +struct ata_port *ap = host->ports[i]; + + ap->pflags |=ATA_PFLAG_FROZEN ; + +/* Disable port interrupts */ +if (ap->ops->freeze) + ap->ops->freeze (ap); + +/* Stop the port DMA engines */ +if (ap->ops->port_stop) + ap->ops->port_stop (ap); + } +} +/* move to PCI subsystem */ int pci_test_config_bits (struct pci_dev *pdev,const struct pci_bits *bits) {
@@ -7326,6 +7346,7 @@ EXPORT_SYMBOL_GPL(ata_timing_cycle2mode)#ifdef CONFIG_PCI EXPORT_SYMBOL_GPL (pci_test_config_bits); +EXPORT_SYMBOL_GPL (ata_pci_shutdown_one);EXPORT_SYMBOL_GPL (ata_pci_remove_one);#ifdef CONFIG_PM EXPORT_SYMBOL_GPL (ata_pci_device_do_suspend);
include/linux/libata.h +1 -0
@@ -1229,6 +1229,7 @@ struct pci_bits { };extern int pci_test_config_bits (struct pci_dev *pdev,const struct pci_bits *bits); +extern void ata_pci_shutdown_one (struct pci_dev *pdev);extern void ata_pci_remove_one (struct pci_dev *pdev);#ifdef CONFIG_PM
Greg Kroah-Hartman
maintainerPATCH 236/237 xen: Enable interrupts when calling _cond_resched()
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit 8645e56a4ad6dcbf504872db7f14a2f67db88ef2 upstream.
xen_maybe_preempt_hcall() is called from the exception entry point xen_do_hypervisor_callback with interrupts disabled.
_cond_resched() evades the might_sleep() check in cond_resched() which would have caught that and schedule_debug() unfortunately lacks a check for irqs_disabled().
Enable interrupts around the call and use cond_resched() to catch future issues.
--- drivers/xen/preempt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/xen/preempt.c +3 -1
@@ -37,7 +37,9 @@ asmlinkage __visible void xen_maybe_pree* cpu. */ __this_cpu_write (xen_in_preemptible_hcall, false); -_cond_resched (); +local_irq_enable (); +cond_resched (); +local_irq_disable ();__this_cpu_write (xen_in_preemptible_hcall, true); } }
Greg Kroah-Hartman
maintainerPATCH 237/237 s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit 380324734956c64cd060e1db4304f3117ac15809 upstream.
Clang warns:
In file included from ../arch/s390/purgatory/purgatory.c:10:
In file included from ../include/linux/kexec.h:18:
In file included from ../include/linux/crash_core.h:6:
In file included from ../include/linux/elfcore.h:5:
In file included from ../include/linux/user.h:1:
In file included from ../arch/s390/include/asm/user.h:11:
../arch/s390/include/asm/page.h:45:6: warning: converting the result of '<<' to a boolean always evaluates to false [-Wtautological-constant-compare]
if (PAGE_DEFAULT_KEY)
^
../arch/s390/include/asm/page.h:23:44: note: expanded from macro
'PAGE_DEFAULT_KEY'
#define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4)
^1 warning generated.
Explicitly compare this against zero to silence the warning as it is intended to be used in a boolean context.
--- arch/s390/include/asm/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/include/asm/page.h +1 -1
@@ -42,7 +42,7 @@ void __storage_key_init_range(unsigned lstatic inline void storage_key_init_range (unsigned long start,unsigned long end) { -if (PAGE_DEFAULT_KEY ) +if (PAGE_DEFAULT_KEY !=0 )__storage_key_init_range (start, end); }
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.172-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v4.14:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
24 tests: 24 pass, 0 failLinux version: 4.14.172-rc1-g47e811c62a4a
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +0000. Anything received after that time might be too late.
Build results:
total: 172 pass: 170 fail: 2
Failed builds:
powerpc:defconfig
powerpc:allmodconfig
Qemu test results:
total: 394 pass: 378 fail: 16 Failed tests: ppc64:mac99:ppc64_book3s_defconfig:smp:nvme:rootfs ppc64:pseries:pseries_defconfig:initrd ppc64:pseries:pseries_defconfig:scsi:rootfs ppc64:pseries:pseries_defconfig:usb:rootfs ppc64:pseries:pseries_defconfig:sdhci:mmc:rootfs ppc64:pseries:pseries_defconfig:nvme:rootfs ppc64:pseries:pseries_defconfig:sata-sii3112:rootfs ppc64:pseries:pseries_defconfig:little:initrd ppc64:pseries:pseries_defconfig:little:scsi:rootfs ppc64:pseries:pseries_defconfig:little:usb:rootfs ppc64:pseries:pseries_defconfig:little:sata-sii3112:rootfs ppc64:pseries:pseries_defconfig:little:scsi[MEGASAS]:rootfs ppc64:pseries:pseries_defconfig:little:scsi[FUSION]:rootfs ppc64:pseries:pseries_defconfig:little:sdhci:mmc:rootfs ppc64:pseries:pseries_defconfig:little:nvme:rootfs ppc64:powernv:powernv_defconfig:initrd
Failures as already reported.
Guenter
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.172-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.14.172-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.14.y
git commit: 47e811c62a4a89755af4c26a95985cec9cf10e80
git describe: v4.14.171-238-g47e811c62a4a
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.14-oe/build/v4.14.171-238-g47e811c62a4a
No regressions (compared to build v4.14.171)
No fixes (compared to build v4.14.171)
Ran 28113 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* network-basic-tests
* ltp-open-posix-tests
* kvm-unit-tests
* ltp-cap_bounds-64k-page_size-tests
* ltp-cap_bounds-kasan-tests
* ltp-commands-64k-page_size-tests
* ltp-commands-kasan-tests
* ltp-containers-64k-page_size-tests
* ltp-containers-kasan-tests
* ltp-cpuhotplug-64k-page_size-tests
* ltp-cpuhotplug-kasan-tests
* ltp-crypto-64k-page_size-tests
* ltp-crypto-kasan-tests
* ltp-crypto-tests
* ltp-cve-64k-page_size-tests
* ltp-cve-kasan-tests
* ltp-dio-64k-page_size-tests
* ltp-dio-kasan-tests
* ltp-fcntl-locktests-64k-page_size-tests
* ltp-fcntl-locktests-kasan-tests
* ltp-filecaps-64k-page_size-tests
* ltp-filecaps-kasan-tests
* ltp-fs-64k-page_size-tests
* ltp-fs-kasan-tests
* ltp-fs_bind-64k-page_size-tests
* ltp-fs_bind-kasan-tests
* ltp-fs_perms_simple-64k-page_size-tests
* ltp-fs_perms_simple-kasan-tests
* ltp-fsx-64k-page_size-tests
* ltp-fsx-kasan-tests
* ltp-hugetlb-64k-page_size-tests
* ltp-hugetlb-kasan-tests
* ltp-io-64k-page_size-tests
* ltp-io-kasan-tests
* ltp-ipc-64k-page_size-tests
* ltp-ipc-kasan-tests
* ltp-math-64k-page_size-tests
* ltp-math-kasan-tests
* ltp-mm-64k-page_size-tests
* ltp-mm-kasan-tests
* ltp-nptl-64k-page_size-tests
* ltp-nptl-kasan-tests
* ltp-pty-64k-page_size-tests
* ltp-pty-kasan-tests
* ltp-sched-64k-page_size-tests
* ltp-sched-kasan-tests
* ltp-securebits-64k-page_size-tests
* ltp-securebits-kasan-tests
* ltp-syscalls-64k-page_size-tests
* ltp-syscalls-compat-tests
* ltp-syscalls-kasan-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.172-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +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.14.172-rc1.gz
-rc2 is out to hopefully resolve some powerpc build issues:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.172-rc2.gz
Quoted 13 lines · Greg Kroah-Hartman
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +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.14.172-rc1.gz
Review
Quoted 2 lines
(quoted diff) +0
-1-rc2 is out to hopefully resolve some powerpc build issues: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.172-rc2.gz
For v4.14.171-235-g7184e90f61c3:
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 394 pass: 394 fail: 0
Guenter
Greg Kroah-Hartman
maintainerQuoted 16 lines · Guenter Roeck
Quoted 13 lines · Greg Kroah-Hartman
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +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.14.172-rc1.gzReview
Quoted 2 lines
(quoted diff) +0
-1-rc2 is out to hopefully resolve some powerpc build issues: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.172-rc2.gz
Quoted 6 lines
For v4.14.171-235-g7184e90f61c3:
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 394 pass: 394 fail: 0
Wonderful, thanks for re-testing two of these and for the original reports.
greg k-h
Hi Greg,
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +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.14.172-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.
Quoted 6 lines
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Given you do have a git branch containing these commits, is there any chance you can update your scripts to insert a real (sorted) shortlog here?
That would make it easier for us contributors to track what has been backported.
Many thanks in advance!
Quoted 6 lines
Greg Kroah-Hartman <[email protected]>
Linux 4.14.172-rc1Nathan Chancellor <[email protected]>
s390/mm: Explicitly comparePAGE_DEFAULT_KEYagainst zero instorage_key_init_range
Quoted 8 lines
Thomas Gleixner <[email protected]>
xen: Enable interrupts when calling_cond_resched()Prabhakar Kushwaha <[email protected]>
ata: ahci: Add shutdown to freeze hardware resources of ahciCong Wang <[email protected]>
netfilter:xt_hashlimit: limit the max size of hashtable
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Greg Kroah-Hartman
maintainerQuoted 22 lines · Geert Uytterhoeven
Hi Greg,
Quoted 18 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +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.14.172-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Quoted 8 lines
Quoted 2 lines
-------------
Pseudo-Shortlog of commits:Given you do have a git branch containing these commits, is there any chance you can update your scripts to insert a real (sorted) shortlog here?
That would make it easier for us contributors to track what has been backported.
How would a real shortlog help any better, except to have things sorted a tad easier?
I can't remember why I do it this way, but for some reason, many many years ago, this was a better solution than a "traditional" shortlog.
Here's the shortlog for this release for comparison:
Aditya Pakki (3):
fore200e: Fix incorrect checks of NULL pointer dereference
orinoco: avoid assertion in case of NULL pointer
ecryptfs: replace BUG_ON with error handling code
Al Viro (1):
VT_RESIZEX: get rid of field-by-field copyin
Alan Stern (1):
USB: hub: Don't record a connect-change event during reset-resume
Alex Deucher (1):
drm/amdgpu/soc15: fix xclk for raven
Alexander Potapenko (1):
lib/stackdepot.c: fix global out-of-bounds in stack_slabs
Allen Pais (1):
scsi: qla2xxx: fix a potential NULL pointer dereference
Anand Jain (1):
btrfs: device stats, log when stats are zeroed
Andreas Dilger (1):
ext4: don't assume that mmp_nodename/bdevname have NUL
Andrei Otcheretianski (1):
iwlwifi: mvm: Fix thermal zone registration
Andrey Smirnov (1):
ARM: dts: imx6: rdu2: Disable WP for USDHC2 and USDHC3
Andrey Zhizhikin (1):
tools lib api fs: Fix gcc9 stringop-truncation compilation error
Andy Shevchenko (1):
serial: 8250: Check UPF_IRQ_SHARED in advance
Ard Biesheuvel (3):
efi/x86: Map the entire EFI vendor string before copying it efi/x86: Don't panic or BUG() on non-critical error conditions x86/mm: Fix NX bit clearing issue in kernel_map_pages_in_pgd
Arnd Bergmann (2):
wan: ixp4xx_hss: fix compile-testing on 64-bit
vme: bridges: reduce stack usage
Arvind Sankar (2):
ALSA: usb-audio: Apply sample rate quirk for Audioengine D1 x86/sysfb: Fix check for bad VRAM size
Bart Van Assche (2):
scsi: Revert "RDMA/isert: Fix a recently introduced regression related to logout"
scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session"
Ben Skeggs (2):
drm/nouveau/gr/gk20a,gm200-: add terminators to method lists read from fw drm/nouveau/disp/nv50-: prevent oops when no channel method map provided
Benjamin Tissoires (1):
Input: synaptics - remove the LEN0049 dmi id from topbuttonpad list
Bibby Hsieh (1):
drm/mediatek: handle events when enabling/disabling crtc
Borislav Petkov (1):
x86/mce/amd: Publish the bank pointer only after setup has succeeded
Brandon Maier (1):
remoteproc: Initialize rproc_class before use
Can Guo (1):
scsi: ufs: Complete pending requests in host reset and restore path
Chanwoo Choi (1):
PM / devfreq: rk3399_dmc: Add COMPILE_TEST and HAVE_ARM_SMCCC dependency
Chao Yu (1):
f2fs: fix memleak of kobject
Chen Zhou (1):
ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m
Christian Borntraeger (1):
KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups
Christophe JAILLET (1):
pxa168fb: Fix the function used to release some memory in an error handling path
Colin Ian King (4):
clocksource/drivers/bcm2835_timer: Fix memory leak of timer driver core: platform: fix u32 greater or equal to zero comparison
iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop
staging: rtl8723bs: fix copy of overlapping memory
Coly Li (1):
bcache: explicity type cast in bset_bkey_last()
Cong Wang (1):
netfilter: xt_hashlimit: limit the max size of hashtable
Dan Carpenter (5):
brcmfmac: Fix use after free in brcmf_sdio_readframes() drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new()
cmd64x: potential buffer overflow in cmd64x_program_timings()
ide: serverworks: potential overflow in svwks_set_pio_mode()
staging: greybus: use after free in gb_audio_manager_remove_all()
Daniel Vetter (1):
radeon: insert 10ms sleep in dce5_crtc_load_lut
David S. Miller (1):
sparc: Add .exit.data section.
David Sterba (3):
btrfs: print message when tree-log replay starts
btrfs: log message when rw remount is attempted with unclean tree-log
btrfs: safely advance counter when looking up bio csums
Davide Caratti (2):
net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS net/sched: flower: add missing validation of TCA_FLOWER_FLAGS
Dingchen Zhang (1):
drm: remove the newline for CRC source name.
Dmitry Osipenko (1):
soc/tegra: fuse: Correct straps' address for older Tegra124 device trees
Douglas Anderson (1):
clk: qcom: rcg2: Don't crash if our parent can't be found; return an error
EJ Hsu (1):
usb: uas: fix a plug & unplug racing
Eric Biggers (2):
ext4: rename s_journal_flag_rwsem to s_writepages_rwsem
ext4: fix race between writepages and enabling EXT4_EXTENTS_FL
Eric Dumazet (2):
net/smc: fix leak of kernel memory to user space
vt: vt_ioctl: fix race in VT_RESIZEX
Erik Kaneda (1):
ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1
Eugen Hristev (1):
media: i2c: mt9v032: fix enum mbus codes and frame sizes
Filipe Manana (2):
Btrfs: fix race between using extent maps and merging them
Btrfs: fix btrfs_wait_ordered_range() so that it waits for all ordered extents
Firo Yang (1):
enic: prevent waking up stopped tx queues over watchdog reset
Fugang Duan (1):
tty: serial: imx: setup the correct sg entry for tx dma
Gaurav Agrawal (1):
Input: synaptics - enable SMBus on ThinkPad L470
Gavin Shan (1):
mm/vmscan.c: don't round up scan size for online memory cgroup
Geert Uytterhoeven (4):
pinctrl: sh-pfc: sh7264: Fix CAN function GPIOs
ARM: dts: r8a7779: Add device node for ARM global timer
pinctrl: sh-pfc: sh7269: Fix CAN function GPIOs
driver core: Print device when resources present in really_probe()
Greg Kroah-Hartman (4):
USB: misc: iowarrior: add support for 2 OEMed devices
USB: misc: iowarrior: add support for the 28 and 28L devices
USB: misc: iowarrior: add support for the 100 device Linux 4.14.172
Hans de Goede (1):
pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins
Hardik Gajjar (1):
USB: hub: Fix the broken detection of USB3 device in SMSC hub
Herbert Xu (1):
padata: Remove broken queue flushing
Icenowy Zheng (1):
clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock
Ido Schimmel (1):
mlxsw: spectrum_dpipe: Add missing error path
Ioanna Alifieraki (1):
Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()"
Jack Pham (1):
usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus
Jaegeuk Kim (1):
f2fs: free sysfs kobject
Jaihind Yadav (1):
selinux: ensure we cleanup the internal AVC counters on error in avc_update()
Jan Kara (4):
ext4: fix checksum errors with indexed dirs
reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling
udf: Fix free space reporting for metadata and virtual partitions
ext4: fix mount failure with quota configured as module
Jani Nikula (1):
MAINTAINERS: Update drm/i915 bug filing URL
Jia-Ju Bai (4):
gpio: gpio-grgpio: fix possible sleep-in-atomic-context bugs in grgpio_irq_map/unmap()
media: sti: bdisp: fix a possible sleep-in-atomic-context bug in bdisp_device_run()
uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol()
usb: gadget: udc: fix possible sleep-in-atomic-context bugs in gr_probe()
Jiewei Ke (1):
RDMA/rxe: Fix error type of mmap_offset
Jiri Slaby (1):
vt: selection, handle pending signals in paste_selection
Joerg Roedel (1):
iommu/vt-d: Fix compile warning from intel-svm.h
Johan Hovold (1):
serdev: ttyport: restore client ops on deregistration
Johannes Thumshirn (1):
btrfs: fix possible NULL-pointer dereference in integrity checks
John Garry (1):
irqchip/mbigen: Set driver .suppress_bind_attrs to avoid remove problems
John Keeping (1):
usb: dwc2: Fix IN FIFO allocation
Josef Bacik (2):
btrfs: fix bytes_may_use underflow in prealloc error condtition
btrfs: do not check delayed items are empty for single transaction cleanup
Kai Li (1):
jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal
Kai Vehmanen (1):
ALSA: hda/hdmi - add retry logic to parse_intel_hdmi()
Kan Liang (1):
perf/x86/intel: Fix inaccurate period in context switch for auto-reload
Kim Phillips (1):
perf/x86/amd: Add missing L2 misses event spec to AMD Family 17h's event map
Larry Finger (4):
staging: rtl8188eu: Fix potential security hole
staging: rtl8188eu: Fix potential overuse of kernel memory
staging: rtl8723bs: Fix potential security hole
staging: rtl8723bs: Fix potential overuse of kernel memory
Leon Romanovsky (1):
RDMA/core: Fix protection fault in get_pkey_idx_qp_list
Linus Torvalds (1):
floppy: check FDC index for errors before assigning it
Logan Gunthorpe (1):
dmaengine: Store module owner in dma_device struct
Luis Henriques (1):
tracing: Fix tracing_stat return values in error handling paths
Lyude Paul (1):
Input: synaptics - switch T470s to RMI4 by default
Malcolm Priestley (1):
staging: vt6656: fix sign of rx_dbm to bb_pre_ed_rssi.
Manu Gautam (1):
arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core
Mao Wenan (1):
NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu().
Marc Zyngier (1):
irqchip/gic-v3: Only provision redistributors that are enabled in ACPI
Masahiro Yamada (1):
kconfig: fix broken dependency in randconfig-generated .config
Masami Hiramatsu (1):
x86/decoder: Add TEST opcode to Group3-2
Mathias Nyman (3):
xhci: Force Maximum Packet size for Full-speed bulk devices to valid range.
xhci: fix runtime pm enabling for quirky Intel hosts
xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms
Miaohe Lin (2):
KVM: x86: don't notify userspace IOAPIC on edge-triggered interrupt EOI
KVM: apic: avoid calculating pending eoi from an uninitialized val
Michael S. Tsirkin (1):
virtio_balloon: prevent pfn array overflow
Mika Westerberg (1):
thunderbolt: Prevent crash if non-active NVMem file is read
Mike Jones (1):
hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions.
Mike Marciniszyn (2):
IB/hfi1: Close window for pq and request coliding IB/hfi1: Add software counter for ctxt0 seq drop
Miquel Raynal (1):
regulator: rk808: Lower log level on optional GPIOs being not available
Nathan Chancellor (9):
s390/time: Fix clk type in get_tod_clock
media: v4l2-device.h: Explicitly compare grp{id,mask} to zero in v4l2_device macros
ALSA: usx2y: Adjust indentation in snd_usX2Y_hwdep_dsp_status
scsi: aic7xxx: Adjust indentation in ahc_find_syncrate
tty: synclinkmp: Adjust indentation in several functions
tty: synclink_gt: Adjust indentation in several functions
hostap: Adjust indentation in prism2_hostapd_add_sta lib/scatterlist.c: adjust indentation in __sg_alloc_table
s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range
Navid Emamdoost (2):
PCI/IOV: Fix memory leak in pci_iov_add_virtfn() drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add
Nick Black (1):
scsi: iscsi: Don't destroy session if there are outstanding connections
Nicolas Ferre (1):
tty/serial: atmel: manage shutdown in case of RS485 or ISO7816 mode
Nicolas Pitre (1):
ARM: 8723/2: always assume the "unified" syntax for assembly code
Oliver O'Halloran (2):
powerpc/powernv/iov: Ensure the pdn for VFs always contains a valid PE number powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV
Oliver Upton (2):
KVM: nVMX: Refactor IO bitmap checks into helper function
KVM: nVMX: Check IO instruction VM-exit conditions
Paolo Bonzini (2):
KVM: x86: emulate RDPID
KVM: nVMX: Don't emulate instructions in guest mode
Paul E. McKenney (1):
rcu: Use WRITE_ONCE() for assignments to ->pprev for hlist_nulls
Paul Kocialkowski (1):
drm/gma500: Fixup fbdev stolen size usage evaluation
Per Forlin (1):
net: dsa: tag_qca: Make sure there is headroom for tag
Peter Chen (1):
usb: host: xhci: update event ring dequeue pointer on purpose
Peter Große (1):
ALSA: hda - Add docking station support for Lenovo Thinkpad T420s
Peter Zijlstra (1):
cpu/hotplug, stop_machine: Fix stop_machine vs hotplug order
Philipp Zabel (1):
Input: edt-ft5x06 - work around first register access error
Phong Tran (4):
b43legacy: Fix -Wcast-function-type
ipw2x00: Fix -Wcast-function-type
iwlegacy: Fix -Wcast-function-type
rtlwifi: rtl_pci: Fix -Wcast-function-type
Prabhakar Kushwaha (1):
ata: ahci: Add shutdown to freeze hardware resources of ahci
Qian Cai (1):
ext4: fix a data race in EXT4_I(inode)->i_disksize
Rasmus Villemoes (1):
net/wan/fsl_ucc_hdlc: reject muram offsets above 64K
Richard Dodd (1):
USB: Fix novation SourceControl XL after suspend
Ritesh Harjani (1):
ext4: fix ext4_dax_read/write inode locking sequence for IOCB_NOWAIT
Robin Murphy (1):
iommu/qcom: Fix bogus detach logic
Ronnie Sahlberg (1):
cifs: fix NULL dereference in match_prepath
Sami Tolvanen (1):
arm64: fix alternatives with LLVM's integrated assembler
Samuel Holland (1):
ASoC: sun8i-codec: Fix setting DAI data format
Sasha Levin (2):
Revert "KVM: nVMX: Use correct root level for nested EPT shadow page tables" Revert "KVM: VMX: Add non-canonical check on writes to RTIT address MSRs"
Sean Christopherson (2):
KVM: nVMX: Use correct root level for nested EPT shadow page tables
KVM: nVMX: Use correct root level for nested EPT shadow page tables
Sergey Senozhatsky (1):
char/random: silence a lockdep splat with printk()
Shijie Luo (1):
ext4: add cond_resched() to __ext4_find_entry()
Shuah Khan (1):
usbip: Fix unsafe unaligned pointer usage
Shubhrajyoti Datta (1):
microblaze: Prevent the overflow of the start
Siddhesh Poyarekar (1):
kselftest: Minimise dependency of get_size on C library interfaces
Simon Schwartz (1):
driver core: platform: Prevent resouce overflow from causing infinite loops
Steven Rostedt (VMware) (1):
tracing: Fix very unlikely race of registering two stat tracers
Sun Ke (1):
nbd: add a flush_workqueue in nbd_start_device
Suren Baghdasaryan (1):
staging: android: ashmem: Disallow ashmem memory from being remapped
Suzuki K Poulose (3):
arm64: cpufeature: Set the FP/SIMD compat HWCAP bits properly
arm64: ptrace: nofpsimd: Fail FP/SIMD regset operations
arm64: nofpsimd: Handle TIF_FOREIGN_FPSTATE flag cleanly
Takashi Iwai (6):
ALSA: hda: Use scnprintf() for printing texts for sysfs/procfs
ALSA: sh: Fix unused variable warnings
ALSA: sh: Fix compile warning wrt const
ALSA: rawmidi: Avoid bit fields for state flags
ALSA: seq: Avoid concurrent access to queue flags
ALSA: seq: Fix concurrent access to queue current tick/time
Takashi Sakamoto (1):
ALSA: ctl: allow TLV read operation for callback type of element in locked case
Theodore Ts'o (2):
ext4: fix support for inode sizes > 1024 bytes
ext4: improve explanation of a mount failure caused by a misconfigured kernel
Thomas Gleixner (4):
watchdog/softlockup: Enforce that timestamp is valid on boot x86/mce/amd: Fix kobject lifetime
genirq/proc: Reject invalid affinity masks (again)
xen: Enable interrupts when calling _cond_resched()
Tiezhu Yang (1):
MIPS: Loongson: Fix potential NULL dereference in loongson3_platform_init()
Tony Lindgren (1):
usb: musb: omap2430: Get rid of musb .set_vbus for omap2430 glue
Uwe Kleine-König (3):
serial: imx: ensure that RX irqs are off if RX is off
serial: imx: Only handle irqs that are actually enabled
pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional
Valdis Kletnieks (1):
x86/vdso: Provide missing include file
Vasily Averin (3):
ftrace: fpid_next() should increase position index trigger_next should increase position index help_next should increase position index
Vasily Gorbik (1):
s390/ftrace: generate traced function stack frame
Vincenzo Frascino (1):
ARM: 8951/1: Fix Kexec compilation issue.
Vitaly Kuznetsov (1):
KVM: nVMX: handle nested posted interrupts when apicv is disabled for L1
Vladimir Oltean (1):
gianfar: Fix TX timestamping with a stacked DSA driver
Wenwen Wang (2):
ecryptfs: fix a memory leak bug in parse_tag_1_packet()
ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()
Will Deacon (2):
arm64: ssbs: Fix context-switch when SSBS is present on all CPUs iommu/arm-smmu-v3: Use WRITE_ONCE() when changing validity of an STE
Xiubo Li (1):
ceph: check availability of mds cluster on mount after wait timeout
YueHaibing (1):
drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler
Yunfeng Ye (1):
reiserfs: prevent NULL pointer dereference in reiserfs_insert_item()
Zahari Petkov (1):
leds: pca963x: Fix open-drain initialization
Zenghui Yu (1):
irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL
Zhiqiang Liu (1):
brd: check and limit max_part par
wangyan (1):
ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans()
yu kuai (2):
drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table
pwm: Remove set but not set variable 'pwm'
zhangyi (F) (5):
jbd2: move the clearing of b_modified flag to the journal_unmap_buffer()
jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer ext4, jbd2: ensure panic when aborting with zero errno
jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record
jbd2: make sure ESHUTDOWN to be recorded in the journal superblock
Hi Greg,
Quoted 24 lines · Greg Kroah-Hartman
Quoted 23 lines · Geert Uytterhoeven
Quoted 20 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.172 release. There are 237 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, 29 Feb 2020 13:21:24 +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.14.172-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Quoted 8 lines
Quoted 5 lines
Given you do have a git branch containing these commits, is there any chance you can update your scripts to insert a real (sorted) shortlog here?
That would make it easier for us contributors to track what has been backported.How would a real shortlog help any better, except to have things sorted a tad easier?
One reason is that it is easier to search in a sorted list.
A second reason is that contributions by the same person would be grouped together.
Quoted 2 lines
I can't remember why I do it this way, but for some reason, many many years ago, this was a better solution than a "traditional" shortlog.
IIRC, because you started with quilt ;-)
Quoted 6 lines
Here's the shortlog for this release for comparison:
Aditya Pakki (3):
fore200e: Fix incorrect checks of NULL pointer dereference
orinoco: avoid assertion in case of NULL pointer
ecryptfs: replaceBUG_ONwith error handling code
See, the above are all commits by Aditya Pakki. No reason to continue looking below ;-)
Thanks!
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds