- Linux-stable-mirror - lists.linaro.org

FAILED: patch "[PATCH] mm/page_io.c: do not free shared swap slots" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5df373e95689b9519b8557da7c5bd0db0856d776 Mon Sep 17 00:00:00 2001 From: Vinayak Menon <vinmenon(a)codeaurora.org> Date: Fri, 15 Nov 2019 17:35:00 -0800 Subject: [PATCH] mm/page_io.c: do not free shared swap slots The following race is observed due to which a processes faulting on a swap entry, finds the page neither in swapcache nor swap. This causes zram to give a zero filled page that gets mapped to the process, resulting in a user space crash later. Consider parent and child processes Pa and Pb sharing the same swap slot with swap_count 2. Swap is on zram with SWP_SYNCHRONOUS_IO set. Virtual address 'VA' of Pa and Pb points to the shared swap entry. Pa Pb fault on VA fault on VA do_swap_page do_swap_page lookup_swap_cache fails lookup_swap_cache fails Pb scheduled out swapin_readahead (deletes zram entry) swap_free (makes swap_count 1) Pb scheduled in swap_readpage (swap_count == 1) Takes SWP_SYNCHRONOUS_IO path zram enrty absent zram gives a zero filled page Fix this by making sure that swap slot is freed only when swap count drops down to one. Link: http://lkml.kernel.org/r/1571743294-14285-1-git-send-email-vinmenon@codeaur… Fixes: aa8d22a11da9 ("mm: swap: SWP_SYNCHRONOUS_IO: skip swapcache only if swapped page has no other reference") Signed-off-by: Vinayak Menon <vinmenon(a)codeaurora.org> Suggested-by: Minchan Kim <minchan(a)google.com> Acked-by: Minchan Kim <minchan(a)kernel.org> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Hugh Dickins <hughd(a)google.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/mm/page_io.c b/mm/page_io.c index 24ee600f9131..60a66a58b9bf 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -73,6 +73,7 @@ static void swap_slot_free_notify(struct page *page) { struct swap_info_struct *sis; struct gendisk *disk; + swp_entry_t entry; /* * There is no guarantee that the page is in swap cache - the software @@ -104,11 +105,10 @@ static void swap_slot_free_notify(struct page *page) * we again wish to reclaim it. */ disk = sis->bdev->bd_disk; - if (disk->fops->swap_slot_free_notify) { - swp_entry_t entry; + entry.val = page_private(page); + if (disk->fops->swap_slot_free_notify && __swap_count(entry) == 1) { unsigned long offset; - entry.val = page_private(page); offset = swp_offset(entry); SetPageDirty(page);

5 years, 11 months

4
4
0 0

[tip: x86/urgent] x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3

by tip-bot2 for Andy Lutomirski

The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 4a13b0e3e10996b9aa0b45a764ecfe49f6fcd360 Gitweb: https://git.kernel.org/tip/4a13b0e3e10996b9aa0b45a764ecfe49f6fcd360 Author: Andy Lutomirski <luto(a)kernel.org> AuthorDate: Sun, 24 Nov 2019 08:50:03 -08:00 Committer: Ingo Molnar <mingo(a)kernel.org> CommitterDate: Mon, 25 Nov 2019 09:36:47 +01:00 x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 UNWIND_ESPFIX_STACK needs to read the GDT, and the GDT mapping that can be accessed via %fs is not mapped in the user pagetables. Use SGDT to find the cpu_entry_area mapping and read the espfix offset from that instead. Reported-and-tested-by: Borislav Petkov <bp(a)alien8.de> Signed-off-by: Andy Lutomirski <luto(a)kernel.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: <stable(a)vger.kernel.org> Signed-off-by: Ingo Molnar <mingo(a)kernel.org> --- arch/x86/entry/entry_32.S | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 0b8c931..f07baf0 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -415,7 +415,8 @@ .macro CHECK_AND_APPLY_ESPFIX #ifdef CONFIG_X86_ESPFIX32 -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8) +#define GDT_ESPFIX_OFFSET (GDT_ENTRY_ESPFIX_SS * 8) +#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + GDT_ESPFIX_OFFSET ALTERNATIVE "jmp .Lend_\@", "", X86_BUG_ESPFIX @@ -1147,12 +1148,26 @@ ENDPROC(entry_INT80_32) * We can't call C functions using the ESPFIX stack. This code reads * the high word of the segment base from the GDT and swiches to the * normal stack and adjusts ESP with the matching offset. + * + * We might be on user CR3 here, so percpu data is not mapped and we can't + * access the GDT through the percpu segment. Instead, use SGDT to find + * the cpu_entry_area alias of the GDT. */ #ifdef CONFIG_X86_ESPFIX32 /* fixup the stack */ - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */ - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */ + pushl %ecx + subl $2*4, %esp + sgdt (%esp) + movl 2(%esp), %ecx /* GDT address */ + /* + * Careful: ECX is a linear pointer, so we need to force base + * zero. %cs is the only known-linear segment we have right now. + */ + mov %cs:GDT_ESPFIX_OFFSET + 4(%ecx), %al /* bits 16..23 */ + mov %cs:GDT_ESPFIX_OFFSET + 7(%ecx), %ah /* bits 24..31 */ shl $16, %eax + addl $2*4, %esp + popl %ecx addl %esp, %eax /* the adjusted stack pointer */ pushl $__KERNEL_DS pushl %eax

5 years, 11 months

1
0
0 0

stable-rc/linux-4.4.y boot: 84 boots: 2 failed, 76 passed with 5 offline, 1 conflict (v4.4.202-157-g2576206c30b5)

by kernelci.org bot

stable-rc/linux-4.4.y boot: 84 boots: 2 failed, 76 passed with 5 offline, 1 conflict (v4.4.202-157-g2576206c30b5) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.4.y/kernel/v4.4.… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.4.y/kernel/v4.4.202-157… Tree: stable-rc Branch: linux-4.4.y Git Describe: v4.4.202-157-g2576206c30b5 Git Commit: 2576206c30b586012e4469b22f4aa3cd04869305 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 43 unique boards, 17 SoC families, 13 builds out of 190 Boot Regressions Detected: arm: tegra_defconfig: gcc-8: tegra124-nyan-big: lab-collabora: new failure (last pass: v4.4.202-159-gdbaac4c54573) Boot Failures Detected: arm: multi_v7_defconfig: gcc-8: tegra124-nyan-big: 1 failed lab tegra_defconfig: gcc-8: tegra124-nyan-big: 1 failed lab Offline Platforms: arm: multi_v7_defconfig: gcc-8 exynos5800-peach-pi: 1 offline lab sun7i-a20-bananapi: 1 offline lab exynos_defconfig: gcc-8 exynos5800-peach-pi: 1 offline lab davinci_all_defconfig: gcc-8 dm365evm,legacy: 1 offline lab sunxi_defconfig: gcc-8 sun7i-a20-bananapi: 1 offline lab Conflicting Boot Failure Detected: (These likely are not failures as other labs are reporting PASS. Needs review.) i386: i386_defconfig: qemu_i386: lab-baylibre: FAIL (gcc-8) lab-collabora: PASS (gcc-8) --- For more info write to <info(a)kernelci.org>

5 years, 11 months

1
0
0 0

Re: [PATCH] arm64: dts: agilex/stratix10: fix pmu interrupt numbers

by Dinh Nguyen

Please apply to v5.3.12 Thanks, Dinh On 11/25/19 5:11 AM, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a "Fixes:" tag, > fixing commit: 78cd6a9d8e15 ("arm64: dts: Add base stratix 10 dtsi"). > > The bot has tested the following trees: v5.3.12, v4.19.85, v4.14.155, v4.9.202, v4.4.202. > > v5.3.12: Build OK! > v4.19.85: Failed to apply! Possible dependencies: > 4b36daf9ada3 ("arm64: dts: agilex: Add initial support for Intel's Agilex SoCFPGA") > > v4.14.155: Failed to apply! Possible dependencies: > 4b36daf9ada3 ("arm64: dts: agilex: Add initial support for Intel's Agilex SoCFPGA") > 7e7962dd1a53 ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in Makefile.lib") > cbbde59b29d7 ("arm64: dts: sort vendor subdirectories in Makefile alphabetically") > > v4.9.202: Failed to apply! Possible dependencies: > 06edb80f8c79 ("arm64: dts: Add Actions Semi S900 and Bubblegum-96") > 0a07236269fa ("arm64: dts: meson-gxm: Add R-Box Pro") > 15abee8ab055 ("ARM64: dts: amlogic: Add basic support for Amlogic S905X") > 1d92bc896e2b ("ARM64: dts: meson-gxl-p23x: Add SD/SDIO/MMC and PWM nodes") > 2ff2836152c4 ("arm64: allwinner: h5: add support for Orange Pi Prime board") > 4b36daf9ada3 ("arm64: dts: agilex: Add initial support for Intel's Agilex SoCFPGA") > 4e3886081848 ("arm64: dts: add Pine64 support") > 4e6118974c7a ("ARM64: dts: meson-gxm: Rename q200 and q201 DT files for consistency") > 72093fac811f ("ARM64: dts: meson-gxl-p23x: Enable IR receiver") > 72a7786c0a0d ("ARM64: dts: Add Realtek RTD1295 and Zidoo X9S") > 73a5d99febe6 ("ARM64: dts: meson-gxl-p23x: Enable ethernet") > 7e7962dd1a53 ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in Makefile.lib") > 8441add12b9e ("ARM64: dts: meson-gxl: Add support for Nexbox A95X") > 9d41bbb6e13f ("arm64: allwinner: h5: add support for the Orange Pi PC 2 board") > bb51b5350d2f ("ARM64: dts: Add support for Meson GXM") > c67fe414059d ("ARM64: dts: meson-gxl-p23x: Add uart pinctrl") > c88cc3ee1b20 ("arm64: Prepare Actions Semi S900") > d6d1291d3b9d ("arm64: allwinner: h5: add support for NanoPi NEO2 board") > da47515ee63f ("ARM64: dts: amlogic: Add basic support for Amlogic S905D") > f51b454549b8 ("ARM64: dts: meson-gxm: Add support for the Nexbox A1") > > v4.4.202: Failed to apply! Possible dependencies: > 06edb80f8c79 ("arm64: dts: Add Actions Semi S900 and Bubblegum-96") > 0a07236269fa ("arm64: dts: meson-gxm: Add R-Box Pro") > 15abee8ab055 ("ARM64: dts: amlogic: Add basic support for Amlogic S905X") > 1c3554fa94d3 ("arm64: dts: add the Alpine v2 EVP") > 1d92bc896e2b ("ARM64: dts: meson-gxl-p23x: Add SD/SDIO/MMC and PWM nodes") > 26a7e06dfee9 ("arm64: renesas: r8a7795: Add Renesas R8A7795 SoC support") > 2e673c7dc37a ("arm64: dts: Add ZTE ZX296718 SoC dts and Makefile") > 2ff2836152c4 ("arm64: allwinner: h5: add support for Orange Pi Prime board") > 34b4f6d0599e ("arm64: tegra: Add Tegra132 support") > 3c7bccccd3ed ("Documentation: devicetree: amlogic: Document Tronsmart Vega S95 boards") > 49449828ba86 ("dtb: amd: Add support for new AMD Overdrive boards") > 4a6e0a771eaa ("dtb: amd: Add support for AMD/Linaro 96Boards Enterprise Edition Server board") > 4b36daf9ada3 ("arm64: dts: agilex: Add initial support for Intel's Agilex SoCFPGA") > 4e3886081848 ("arm64: dts: add Pine64 support") > 4e6118974c7a ("ARM64: dts: meson-gxm: Rename q200 and q201 DT files for consistency") > 4f24eda8401f ("ARM64: dts: Prepare configs for Amlogic Meson GXBaby") > 56a0eccdc0de ("arm64: dts: Add dts files for LG Electronics's lg1312 SoC") > 72093fac811f ("ARM64: dts: meson-gxl-p23x: Enable IR receiver") > 72a7786c0a0d ("ARM64: dts: Add Realtek RTD1295 and Zidoo X9S") > 73a5d99febe6 ("ARM64: dts: meson-gxl-p23x: Enable ethernet") > 7e7962dd1a53 ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in Makefile.lib") > 8441add12b9e ("ARM64: dts: meson-gxl: Add support for Nexbox A95X") > 985b81817ce1 ("Documentation: devicetree: amlogic: Document Meson GXBaby") > 9d41bbb6e13f ("arm64: allwinner: h5: add support for the Orange Pi PC 2 board") > a426e1dee661 ("Documentation: devicetree: amlogic: Document P20x and ODROID-C2 boards") > bb51b5350d2f ("ARM64: dts: Add support for Meson GXM") > c67fe414059d ("ARM64: dts: meson-gxl-p23x: Add uart pinctrl") > c88cc3ee1b20 ("arm64: Prepare Actions Semi S900") > cc733bc90636 ("ARM64: dts: amlogic: Add Tronsmart Vega S95 configs") > ce3dd55b99b1 ("arm64: Introduce Allwinner SoC config option") > d6d1291d3b9d ("arm64: allwinner: h5: add support for NanoPi NEO2 board") > da47515ee63f ("ARM64: dts: amlogic: Add basic support for Amlogic S905D") > e1a0ebc8d82b ("arm64: dts: uniphier: add PH1-LD10 SoC/board support") > > > NOTE: The patch will not be queued to stable trees until it is upstream. > > How should we proceed with this patch? >

5 years, 11 months

1
0
0 0

stable-rc/linux-4.14.y boot: 115 boots: 2 failed, 107 passed with 6 offline (v4.14.156)

by kernelci.org bot

stable-rc/linux-4.14.y boot: 115 boots: 2 failed, 107 passed with 6 offline (v4.14.156) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.14.y/kernel/v4.1… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.14.y/kernel/v4.14.156/ Tree: stable-rc Branch: linux-4.14.y Git Describe: v4.14.156 Git Commit: 43598c571e7ed29e4c81e35b4a870fe6b9f8d58e Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 65 unique boards, 22 SoC families, 13 builds out of 201 Boot Regressions Detected: arm: tegra_defconfig: gcc-8: tegra124-nyan-big: lab-collabora: new failure (last pass: v4.14.155) Boot Failures Detected: arm: multi_v7_defconfig: gcc-8: tegra124-nyan-big: 1 failed lab tegra_defconfig: gcc-8: tegra124-nyan-big: 1 failed lab Offline Platforms: arm: multi_v7_defconfig: gcc-8 exynos5800-peach-pi: 1 offline lab mt7623n-bananapi-bpi-r2: 1 offline lab sun7i-a20-bananapi: 1 offline lab exynos_defconfig: gcc-8 exynos5800-peach-pi: 1 offline lab davinci_all_defconfig: gcc-8 dm365evm,legacy: 1 offline lab sunxi_defconfig: gcc-8 sun7i-a20-bananapi: 1 offline lab --- For more info write to <info(a)kernelci.org>

5 years, 11 months

1
0
0 0

[PATCH] btrfs: don't double lock the subvol_sem

by Josef Bacik

If we're rename exchanging two subvols we'll try to lock this lock twice, which is bad. Just lock once if either of the ino's are subvols. cc: stable(a)vger.kernel.org Fixes: cdd1fedf8261 ("btrfs: add support for RENAME_EXCHANGE and RENAME_WHITEOUT") Signed-off-by: Josef Bacik <josef(a)toxicpanda.com> --- fs/btrfs/inode.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index b13c212b1bed..8db7455fee38 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9563,9 +9563,8 @@ static int btrfs_rename_exchange(struct inode *old_dir, btrfs_init_log_ctx(&ctx_dest, new_inode); /* close the race window with snapshot create/destroy ioctl */ - if (old_ino == BTRFS_FIRST_FREE_OBJECTID) - down_read(&fs_info->subvol_sem); - if (new_ino == BTRFS_FIRST_FREE_OBJECTID) + if (old_ino == BTRFS_FIRST_FREE_OBJECTID || + new_ino == BTRFS_FIRST_FREE_OBJECTID) down_read(&fs_info->subvol_sem); /* @@ -9799,9 +9798,8 @@ static int btrfs_rename_exchange(struct inode *old_dir, ret = ret ? ret : ret2; } out_notrans: - if (new_ino == BTRFS_FIRST_FREE_OBJECTID) - up_read(&fs_info->subvol_sem); - if (old_ino == BTRFS_FIRST_FREE_OBJECTID) + if (new_ino == BTRFS_FIRST_FREE_OBJECTID || + old_ino == BTRFS_FIRST_FREE_OBJECTID) up_read(&fs_info->subvol_sem); ASSERT(list_empty(&ctx_root.list)); -- 2.23.0

5 years, 11 months

2
1
0 0

stable-rc/linux-5.3.y boot: 141 boots: 2 failed, 131 passed with 7 offline, 1 untried/unknown (v5.3.13)

by kernelci.org bot

stable-rc/linux-5.3.y boot: 141 boots: 2 failed, 131 passed with 7 offline, 1 untried/unknown (v5.3.13) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-5.3.y/kernel/v5.3.… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-5.3.y/kernel/v5.3.13/ Tree: stable-rc Branch: linux-5.3.y Git Describe: v5.3.13 Git Commit: 42adce4180734a883f2d9b6cec24446d49c5c8eb Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 86 unique boards, 26 SoC families, 17 builds out of 208 Boot Regressions Detected: arm: multi_v7_defconfig: gcc-8: tegra124-nyan-big: lab-collabora: new failure (last pass: v5.3.12) Boot Failures Detected: arm: multi_v7_defconfig: gcc-8: tegra124-nyan-big: 1 failed lab tegra_defconfig: gcc-8: tegra124-nyan-big: 1 failed lab Offline Platforms: arm: multi_v7_defconfig: gcc-8 exynos5800-peach-pi: 1 offline lab mt7623n-bananapi-bpi-r2: 1 offline lab sun7i-a20-bananapi: 1 offline lab sunxi_defconfig: gcc-8 sun7i-a20-bananapi: 1 offline lab exynos_defconfig: gcc-8 exynos5800-peach-pi: 1 offline lab davinci_all_defconfig: gcc-8 dm365evm,legacy: 1 offline lab imx_v6_v7_defconfig: gcc-8 imx6q-wandboard: 1 offline lab --- For more info write to <info(a)kernelci.org>

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 4.9 01/99] ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback

by Sasha Levin

From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> [ Upstream commit 51e68fb0929c29e47e9074ca3e99ffd6021a1c5a ] In some error paths, reference count of firewire unit is not decreased. This commit fixes the bug. Fixes: 5b14ec25a79b('ALSA: firewire: release reference count of firewire unit in .remove callback of bus driver') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/firewire/isight.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c index 48d6dca471c6b..6c8daf5b391ff 100644 --- a/sound/firewire/isight.c +++ b/sound/firewire/isight.c @@ -639,7 +639,7 @@ static int isight_probe(struct fw_unit *unit, if (!isight->audio_base) { dev_err(&unit->device, "audio unit base not found\n"); err = -ENXIO; - goto err_unit; + goto error; } fw_iso_resources_init(&isight->resources, unit); @@ -668,12 +668,12 @@ static int isight_probe(struct fw_unit *unit, dev_set_drvdata(&unit->device, isight); return 0; - -err_unit: - fw_unit_put(isight->unit); - mutex_destroy(&isight->mutex); error: snd_card_free(card); + + mutex_destroy(&isight->mutex); + fw_unit_put(isight->unit); + return err; } -- 2.20.1

5 years, 11 months

2
100
0 0

stable-rc/linux-4.19.y boot: 128 boots: 1 failed, 121 passed with 6 offline (v4.19.86)

by kernelci.org bot

stable-rc/linux-4.19.y boot: 128 boots: 1 failed, 121 passed with 6 offline (v4.19.86) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.19.y/kernel/v4.1… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.19.y/kernel/v4.19.86/ Tree: stable-rc Branch: linux-4.19.y Git Describe: v4.19.86 Git Commit: 14260788bbb9c94b0e36abc17294266b69dd46e4 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 76 unique boards, 24 SoC families, 15 builds out of 206 Boot Regressions Detected: arm: multi_v7_defconfig: gcc-8: tegra124-nyan-big: lab-collabora: new failure (last pass: v4.19.85) Boot Failure Detected: arm: multi_v7_defconfig: gcc-8: tegra124-nyan-big: 1 failed lab Offline Platforms: arm: multi_v7_defconfig: gcc-8 exynos5800-peach-pi: 1 offline lab mt7623n-bananapi-bpi-r2: 1 offline lab sun7i-a20-bananapi: 1 offline lab exynos_defconfig: gcc-8 exynos5800-peach-pi: 1 offline lab davinci_all_defconfig: gcc-8 dm365evm,legacy: 1 offline lab sunxi_defconfig: gcc-8 sun7i-a20-bananapi: 1 offline lab --- For more info write to <info(a)kernelci.org>

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 4.19 001/237] ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback

by Sasha Levin

From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> [ Upstream commit 51e68fb0929c29e47e9074ca3e99ffd6021a1c5a ] In some error paths, reference count of firewire unit is not decreased. This commit fixes the bug. Fixes: 5b14ec25a79b('ALSA: firewire: release reference count of firewire unit in .remove callback of bus driver') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/firewire/isight.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c index 30957477e005e..0717ab9e48e3b 100644 --- a/sound/firewire/isight.c +++ b/sound/firewire/isight.c @@ -640,7 +640,7 @@ static int isight_probe(struct fw_unit *unit, if (!isight->audio_base) { dev_err(&unit->device, "audio unit base not found\n"); err = -ENXIO; - goto err_unit; + goto error; } fw_iso_resources_init(&isight->resources, unit); @@ -669,12 +669,12 @@ static int isight_probe(struct fw_unit *unit, dev_set_drvdata(&unit->device, isight); return 0; - -err_unit: - fw_unit_put(isight->unit); - mutex_destroy(&isight->mutex); error: snd_card_free(card); + + mutex_destroy(&isight->mutex); + fw_unit_put(isight->unit); + return err; } -- 2.20.1

5 years, 11 months

4
242
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror