May 2019 - Linux-stable-mirror

FAILED: patch "[PATCH] x86_64: Allow breakpoints to emulate call instructions" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-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 4b33dadf37666c0860b88f9e52a16d07bf6d0b03 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <peterz(a)infradead.org> Date: Wed, 1 May 2019 15:11:17 +0200 Subject: [PATCH] x86_64: Allow breakpoints to emulate call instructions In order to allow breakpoints to emulate call instructions, they need to push the return address onto the stack. The x86_64 int3 handler adds a small gap to allow the stack to grow some. Use this gap to add the return address to be able to emulate a call instruction at the breakpoint location. These helper functions are added: int3_emulate_jmp(): changes the location of the regs->ip to return there. (The next two are only for x86_64) int3_emulate_push(): to push the address onto the gap in the stack int3_emulate_call(): push the return address and change regs->ip Cc: Andy Lutomirski <luto(a)kernel.org> Cc: Nicolai Stange <nstange(a)suse.de> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Borislav Petkov <bp(a)alien8.de> Cc: "H. Peter Anvin" <hpa(a)zytor.com> Cc: the arch/x86 maintainers <x86(a)kernel.org> Cc: Josh Poimboeuf <jpoimboe(a)redhat.com> Cc: Jiri Kosina <jikos(a)kernel.org> Cc: Miroslav Benes <mbenes(a)suse.cz> Cc: Petr Mladek <pmladek(a)suse.com> Cc: Joe Lawrence <joe.lawrence(a)redhat.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com> Cc: Tim Chen <tim.c.chen(a)linux.intel.com> Cc: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> Cc: Mimi Zohar <zohar(a)linux.ibm.com> Cc: Juergen Gross <jgross(a)suse.com> Cc: Nick Desaulniers <ndesaulniers(a)google.com> Cc: Nayna Jain <nayna(a)linux.ibm.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Cc: Joerg Roedel <jroedel(a)suse.de> Cc: "open list:KERNEL SELFTEST FRAMEWORK" <linux-kselftest(a)vger.kernel.org> Cc: stable(a)vger.kernel.org Fixes: b700e7f03df5 ("livepatch: kernel: add support for live patching") Tested-by: Nicolai Stange <nstange(a)suse.de> Reviewed-by: Nicolai Stange <nstange(a)suse.de> Reviewed-by: Masami Hiramatsu <mhiramat(a)kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> [ Modified to only work for x86_64 and added comment to int3_emulate_push() ] Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h index e85ff65c43c3..05861cc08787 100644 --- a/arch/x86/include/asm/text-patching.h +++ b/arch/x86/include/asm/text-patching.h @@ -39,4 +39,32 @@ extern int poke_int3_handler(struct pt_regs *regs); extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler); extern int after_bootmem; +static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned long ip) +{ + regs->ip = ip; +} + +#define INT3_INSN_SIZE 1 +#define CALL_INSN_SIZE 5 + +#ifdef CONFIG_X86_64 +static inline void int3_emulate_push(struct pt_regs *regs, unsigned long val) +{ + /* + * The int3 handler in entry_64.S adds a gap between the + * stack where the break point happened, and the saving of + * pt_regs. We can extend the original stack because of + * this gap. See the idtentry macro's create_gap option. + */ + regs->sp -= sizeof(unsigned long); + *(unsigned long *)regs->sp = val; +} + +static inline void int3_emulate_call(struct pt_regs *regs, unsigned long func) +{ + int3_emulate_push(regs, regs->ip - INT3_INSN_SIZE + CALL_INSN_SIZE); + int3_emulate_jmp(regs, func); +} +#endif + #endif /* _ASM_X86_TEXT_PATCHING_H */

5 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] x86_64: Add gap to int3 to allow for call emulation" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-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 2700fefdb2d9751c416ad56897e27d41e409324a Mon Sep 17 00:00:00 2001 From: Josh Poimboeuf <jpoimboe(a)redhat.com> Date: Fri, 30 Nov 2018 12:39:17 -0600 Subject: [PATCH] x86_64: Add gap to int3 to allow for call emulation To allow an int3 handler to emulate a call instruction, it must be able to push a return address onto the stack. Add a gap to the stack to allow the int3 handler to push the return address and change the return from int3 to jump straight to the emulated called function target. Link: http://lkml.kernel.org/r/20181130183917.hxmti5josgq4clti@treble Link: http://lkml.kernel.org/r/20190502162133.GX2623@hirez.programming.kicks-ass.… [ Note, this is needed to allow Live Kernel Patching to not miss calling a patched function when tracing is enabled. -- Steven Rostedt ] Cc: stable(a)vger.kernel.org Fixes: b700e7f03df5 ("livepatch: kernel: add support for live patching") Tested-by: Nicolai Stange <nstange(a)suse.de> Reviewed-by: Nicolai Stange <nstange(a)suse.de> Reviewed-by: Masami Hiramatsu <mhiramat(a)kernel.org> Signed-off-by: Josh Poimboeuf <jpoimboe(a)redhat.com> Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 1f0efdb7b629..27fcc6fbdd52 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -879,7 +879,7 @@ apicinterrupt IRQ_WORK_VECTOR irq_work_interrupt smp_irq_work_interrupt * @paranoid == 2 is special: the stub will never switch stacks. This is for * #DF: if the thread stack is somehow unusable, we'll still get a useful OOPS. */ -.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 +.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 create_gap=0 ENTRY(\sym) UNWIND_HINT_IRET_REGS offset=\has_error_code*8 @@ -899,6 +899,20 @@ ENTRY(\sym) jnz .Lfrom_usermode_switch_stack_\@ .endif + .if \create_gap == 1 + /* + * If coming from kernel space, create a 6-word gap to allow the + * int3 handler to emulate a call instruction. + */ + testb $3, CS-ORIG_RAX(%rsp) + jnz .Lfrom_usermode_no_gap_\@ + .rept 6 + pushq 5*8(%rsp) + .endr + UNWIND_HINT_IRET_REGS offset=8 +.Lfrom_usermode_no_gap_\@: + .endif + .if \paranoid call paranoid_entry .else @@ -1130,7 +1144,7 @@ apicinterrupt3 HYPERV_STIMER0_VECTOR \ #endif /* CONFIG_HYPERV */ idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK -idtentry int3 do_int3 has_error_code=0 +idtentry int3 do_int3 has_error_code=0 create_gap=1 idtentry stack_segment do_stack_segment has_error_code=1 #ifdef CONFIG_XEN_PV

5 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] x86_64: Add gap to int3 to allow for call emulation" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-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 2700fefdb2d9751c416ad56897e27d41e409324a Mon Sep 17 00:00:00 2001 From: Josh Poimboeuf <jpoimboe(a)redhat.com> Date: Fri, 30 Nov 2018 12:39:17 -0600 Subject: [PATCH] x86_64: Add gap to int3 to allow for call emulation To allow an int3 handler to emulate a call instruction, it must be able to push a return address onto the stack. Add a gap to the stack to allow the int3 handler to push the return address and change the return from int3 to jump straight to the emulated called function target. Link: http://lkml.kernel.org/r/20181130183917.hxmti5josgq4clti@treble Link: http://lkml.kernel.org/r/20190502162133.GX2623@hirez.programming.kicks-ass.… [ Note, this is needed to allow Live Kernel Patching to not miss calling a patched function when tracing is enabled. -- Steven Rostedt ] Cc: stable(a)vger.kernel.org Fixes: b700e7f03df5 ("livepatch: kernel: add support for live patching") Tested-by: Nicolai Stange <nstange(a)suse.de> Reviewed-by: Nicolai Stange <nstange(a)suse.de> Reviewed-by: Masami Hiramatsu <mhiramat(a)kernel.org> Signed-off-by: Josh Poimboeuf <jpoimboe(a)redhat.com> Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 1f0efdb7b629..27fcc6fbdd52 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -879,7 +879,7 @@ apicinterrupt IRQ_WORK_VECTOR irq_work_interrupt smp_irq_work_interrupt * @paranoid == 2 is special: the stub will never switch stacks. This is for * #DF: if the thread stack is somehow unusable, we'll still get a useful OOPS. */ -.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 +.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 create_gap=0 ENTRY(\sym) UNWIND_HINT_IRET_REGS offset=\has_error_code*8 @@ -899,6 +899,20 @@ ENTRY(\sym) jnz .Lfrom_usermode_switch_stack_\@ .endif + .if \create_gap == 1 + /* + * If coming from kernel space, create a 6-word gap to allow the + * int3 handler to emulate a call instruction. + */ + testb $3, CS-ORIG_RAX(%rsp) + jnz .Lfrom_usermode_no_gap_\@ + .rept 6 + pushq 5*8(%rsp) + .endr + UNWIND_HINT_IRET_REGS offset=8 +.Lfrom_usermode_no_gap_\@: + .endif + .if \paranoid call paranoid_entry .else @@ -1130,7 +1144,7 @@ apicinterrupt3 HYPERV_STIMER0_VECTOR \ #endif /* CONFIG_HYPERV */ idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK -idtentry int3 do_int3 has_error_code=0 +idtentry int3 do_int3 has_error_code=0 create_gap=1 idtentry stack_segment do_stack_segment has_error_code=1 #ifdef CONFIG_XEN_PV

5 years, 9 months

1
0
0 0

❎ FAIL: Stable queue: queue-4.19

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: c3a072597748 - Linux 4.19.45 The results of these automated tests are provided below. Overall result: FAILED (see details below) Merge: FAILED When we attempted to merge the patchset, we received an error: error: patch failed: drivers/md/md.c:9227 error: drivers/md/md.c: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch Applying: md: add a missing endianness conversion in check_sb_changes Patch failed at 0001 md: add a missing endianness conversion in check_sb_changes We hope that these logs can help you find the problem quickly. For the full detail on our testing procedures, please scroll to the bottom of this message. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out the following commit: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: c3a072597748 - Linux 4.19.45 We then merged the patchset with `git am`: ipv6-fix-src-addr-routing-with-the-exception-table.patch ipv6-prevent-possible-fib6-leaks.patch net-always-descend-into-dsa.patch net-avoid-weird-emergency-message.patch net-mlx4_core-change-the-error-print-to-info-print.patch net-test-nouarg-before-dereferencing-zerocopy-pointers.patch net-usb-qmi_wwan-add-telit-0x1260-and-0x1261-compositions.patch nfp-flower-add-rcu-locks-when-accessing-netdev-for-tunnels.patch ppp-deflate-fix-possible-crash-in-deflate_init.patch rtnetlink-always-put-ifla_link-for-links-with-a-link-netnsid.patch tipc-switch-order-of-device-registration-to-fix-a-crash.patch vsock-virtio-free-packets-during-the-socket-release.patch tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch vsock-virtio-initialize-core-virtio-vsock-before-registering-the-driver.patch net-mlx5-imply-mlxfw-in-mlx5_core.patch net-mlx5e-fix-ethtool-rxfh-commands-when-config_mlx5_en_rxnfc-is-disabled.patch parisc-export-running_on_qemu-symbol-for-modules.patch parisc-skip-registering-led-when-running-in-qemu.patch parisc-use-pa_asm_level-in-boot-code.patch parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch stm-class-fix-channel-free-in-stm-output-free-path.patch stm-class-fix-channel-bitmap-on-32-bit-systems.patch brd-re-enable-__gfp_highmem-in-brd_insert_page.patch proc-prevent-changes-to-overridden-credentials.patch revert-md-fix-lock-contention-for-flush-bios.patch md-batch-flush-requests.patch md-add-mddev-pers-to-avoid-potential-null-pointer-dereference.patch dcache-sort-the-freeing-without-rcu-delay-mess-for-good.patch intel_th-msu-fix-single-mode-with-iommu.patch p54-drop-device-reference-count-if-fails-to-enable-device.patch of-fix-clang-wunsequenced-for-be32_to_cpu.patch cifs-fix-strcat-buffer-overflow-and-reduce-raciness-in-smb21_set_oplock_level.patch phy-ti-pipe3-fix-missing-bit-wise-or-operator-when-assigning-val.patch media-ov6650-fix-sensor-possibly-not-detected-on-probe.patch media-imx-csi-allow-unknown-nearest-upstream-entities.patch media-imx-clear-fwnode-link-struct-for-each-endpoint-iteration.patch nfs4-fix-v4.0-client-state-corruption-when-mount.patch pnfs-fallback-to-mds-if-no-deviceid-found.patch clk-hi3660-mark-clk_gate_ufs_subsys-as-critical.patch clk-tegra-fix-pllm-programming-on-tegra124-when-pmc-overrides-divider.patch clk-mediatek-disable-tuner_en-before-change-pll-rate.patch clk-rockchip-fix-wrong-clock-definitions-for-rk3328.patch udlfb-delete-the-unused-parameter-for-dlfb_handle_damage.patch udlfb-fix-sleeping-inside-spinlock.patch udlfb-introduce-a-rendering-mutex.patch fuse-fix-writepages-on-32bit.patch fuse-honor-rlimit_fsize-in-fuse_file_fallocate.patch ovl-fix-missing-upper-fs-freeze-protection-on-copy-up-for-ioctl.patch iommu-tegra-smmu-fix-invalid-asid-bits-on-tegra30-114.patch ceph-flush-dirty-inodes-before-proceeding-with-remount.patch

5 years, 9 months

2
1
0 0

[PATCH 4.19 000/105] 4.19.45-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.45 release. There are 105 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed 22 May 2019 11:50:49 AM UTC. 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.19.45-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.45-rc1 Andreas Dilger <adilger(a)dilger.ca> ext4: don't update s_rev_level if not required zhangyi (F) <yi.zhang(a)huawei.com> ext4: fix compile error when using BUFFER_TRACE Theodore Ts'o <tytso(a)mit.edu> ext4: fix block validity checks for journal inodes using indirect blocks Colin Ian King <colin.king(a)canonical.com> ext4: unsigned int compared against zero Kees Cook <keescook(a)chromium.org> pstore: Refactor compression initialization Joel Fernandes (Google) <joel(a)joelfernandes.org> pstore: Allocate compression during late_initcall() Kees Cook <keescook(a)chromium.org> pstore: Centralize init/exit routines Eric Dumazet <edumazet(a)google.com> iov_iter: optimize page_copy_sane() Dan Williams <dan.j.williams(a)intel.com> libnvdimm/namespace: Fix label tracking error Roger Pau Monne <roger.pau(a)citrix.com> xen/pvh: set xen_domain_type to HVM in xen_pvh_init Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: turn auto.conf.cmd into a mandatory include file Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: lapic: Busy wait for timer to expire when using hv_timer Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86: Skip EFER vs. guest CPUID checks for host-initiated writes Chengguang Xu <cgxu519(a)gmail.com> jbd2: fix potential double free Michał Wadowski <wadosm(a)gmail.com> ALSA: hda/realtek - Fix for Lenovo B50-70 inverted internal microphone bug Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Fixup headphone noise via runtime suspend Jeremy Soller <jeremy(a)system76.com> ALSA: hda/realtek - Corrected fixup for System76 Gazelle (gaze14) Jan Kara <jack(a)suse.cz> ext4: avoid panic during forced reboot due to aborted journal Sahitya Tummala <stummala(a)codeaurora.org> ext4: fix use-after-free in dx_release() Lukas Czerner <lczerner(a)redhat.com> ext4: fix data corruption caused by overlapping unaligned and aligned IO Sriram Rajagopalan <sriramr(a)arista.com> ext4: zero out the unused memory region in the extent tree block Anup Patel <Anup.Patel(a)wdc.com> tty: Don't force RISCV SBI console as preferred console Jiufei Xue <jiufei.xue(a)linux.alibaba.com> fs/writeback.c: use rcu_barrier() to wait for inflight wb switches going into workqueue when umount Eric Biggers <ebiggers(a)google.com> crypto: ccm - fix incompatibility between "ccm" and "ccm_base" Kamlakant Patel <kamlakantp(a)marvell.com> ipmi:ssif: compare block number correctly for multi-part return messages Coly Li <colyli(a)suse.de> bcache: never set KEY_PTRS of journal key to 0 in journal_reclaim() Liang Chen <liangchen.linux(a)gmail.com> bcache: fix a race between cache register and cacheset unregister Filipe Manana <fdmanana(a)suse.com> Btrfs: do not start a transaction at iterate_extent_inodes() Filipe Manana <fdmanana(a)suse.com> Btrfs: do not start a transaction during fiemap Filipe Manana <fdmanana(a)suse.com> Btrfs: send, flush dellaloc in order to avoid data loss Nikolay Borisov <nborisov(a)suse.com> btrfs: Honour FITRIM range constraints during free space trim Nikolay Borisov <nborisov(a)suse.com> btrfs: Correctly free extent buffer in case btree_read_extent_buffer_pages fails Qu Wenruo <wqu(a)suse.com> btrfs: Check the first key and level for cached extent buffer Debabrata Banerjee <dbanerje(a)akamai.com> ext4: fix ext4_show_options for file systems w/o journal Kirill Tkhai <ktkhai(a)virtuozzo.com> ext4: actually request zeroing of inode table after grow Barret Rhoden <brho(a)google.com> ext4: fix use-after-free race with debug_want_extra_isize Pan Bian <bianpan2016(a)163.com> ext4: avoid drop reference to iloc.bh twice Theodore Ts'o <tytso(a)mit.edu> ext4: ignore e_value_offs for xattrs with value-in-ea-inode Theodore Ts'o <tytso(a)mit.edu> ext4: protect journal inode's blocks using block_validity Jan Kara <jack(a)suse.cz> ext4: make sanity check in mballoc more strict Jiufei Xue <jiufei.xue(a)linux.alibaba.com> jbd2: check superblock mapped prior to committing Sergei Trofimovich <slyfox(a)gentoo.org> tty/vt: fix write/write race in ioctl(KDSKBSENT) handler Yifeng Li <tomli(a)tomli.me> tty: vt.c: Fix TIOCL_BLANKSCREEN console blanking if blankinterval == 0 Alexander Sverdlin <alexander.sverdlin(a)nokia.com> mtd: spi-nor: intel-spi: Avoid crossing 4K address boundary on read/write Dmitry Osipenko <digetx(a)gmail.com> mfd: max77620: Fix swapped FPS_PERIOD_MAX_US values Steve Twiss <stwiss.opensource(a)diasemi.com> mfd: da9063: Fix OTP control register names to match datasheets for DA9063/63L Rajat Jain <rajatja(a)google.com> ACPI: PM: Set enable_for_wake for wakeup GPEs during suspend-to-idle Andrea Arcangeli <aarcange(a)redhat.com> userfaultfd: use RCU to free the task struct when fork fails Shuning Zhang <sunny.s.zhang(a)oracle.com> ocfs2: fix ocfs2 read inode data panic in ocfs2_iget Mike Kravetz <mike.kravetz(a)oracle.com> hugetlb: use same fault hash key for shared and private mappings Kai Shen <shenkai8(a)huawei.com> mm/hugetlb.c: don't put_page in lock of hugetlb_lock Dan Williams <dan.j.williams(a)intel.com> mm/huge_memory: fix vmf_insert_pfn_{pmd, pud}() crash, handle unaligned addresses Jiri Kosina <jkosina(a)suse.cz> mm/mincore.c: make mincore() more conservative Ofir Drang <ofir.drang(a)arm.com> crypto: ccree - handle tee fips error during power management resume Ofir Drang <ofir.drang(a)arm.com> crypto: ccree - add function to handle cryptocell tee fips error Ofir Drang <ofir.drang(a)arm.com> crypto: ccree - HOST_POWER_DOWN_EN should be the last CC access during suspend Ofir Drang <ofir.drang(a)arm.com> crypto: ccree - pm resume first enable the source clk Gilad Ben-Yossef <gilad(a)benyossef.com> crypto: ccree - don't map AEAD key and IV on stack Gilad Ben-Yossef <gilad(a)benyossef.com> crypto: ccree - use correct internal state sizes for export Gilad Ben-Yossef <gilad(a)benyossef.com> crypto: ccree - don't map MAC key on stack Gilad Ben-Yossef <gilad(a)benyossef.com> crypto: ccree - fix mem leak on error path Gilad Ben-Yossef <gilad(a)benyossef.com> crypto: ccree - remove special handling of chained sg Daniel Borkmann <daniel(a)iogearbox.net> bpf, arm64: remove prefetch insn in xadd mapping Libin Yang <libin.yang(a)intel.com> ASoC: codec: hdac_hdmi add device_link to card device S.j. Wang <shengjiu.wang(a)nxp.com> ASoC: fsl_esai: Fix missing break in switch statement Curtis Malainey <cujomalainey(a)chromium.org> ASoC: RT5677-SPI: Disable 16Bit SPI Transfers Jon Hunter <jonathanh(a)nvidia.com> ASoC: max98090: Fix restore of DAPM Muxes Jeremy Soller <jeremy(a)system76.com> ALSA: hdea/realtek - Headset fixup for System76 Gazelle (gaze14) Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - EAPD turn on later Hui Wang <hui.wang(a)canonical.com> ALSA: hda/hdmi - Consider eld_valid when reporting jack event Hui Wang <hui.wang(a)canonical.com> ALSA: hda/hdmi - Read the pin sense from register when repolling Wenwen Wang <wang6495(a)umn.edu> ALSA: usb-audio: Fix a memory leak bug Takashi Iwai <tiwai(a)suse.de> ALSA: line6: toneport: Fix broken usage of timer for delayed execution Raul E Rangel <rrangel(a)chromium.org> mmc: core: Fix tag set memory leak Eric Biggers <ebiggers(a)google.com> crypto: arm64/aes-neonbs - don't access already-freed walk.iv Eric Biggers <ebiggers(a)google.com> crypto: arm/aes-neonbs - don't access already-freed walk.iv Zhang Zhijie <zhangzj(a)rock-chips.com> crypto: rockchip - update IV buffer to contain the next IV Eric Biggers <ebiggers(a)google.com> crypto: gcm - fix incompatibility between "gcm" and "gcm_base" Eric Biggers <ebiggers(a)google.com> crypto: arm64/gcm-aes-ce - fix no-NEON fallback code Eric Biggers <ebiggers(a)google.com> crypto: x86/crct10dif-pcl - fix use via crypto_shash_digest() Eric Biggers <ebiggers(a)google.com> crypto: crct10dif-generic - fix use via crypto_shash_digest() Eric Biggers <ebiggers(a)google.com> crypto: skcipher - don't WARN on unprocessed data after slow walk step Daniel Axtens <dja(a)axtens.net> crypto: vmx - fix copy-paste error in CTR mode Singh, Brijesh <brijesh.singh(a)amd.com> crypto: ccp - Do not free psp_master when PLATFORM_INIT fails Eric Biggers <ebiggers(a)google.com> crypto: chacha20poly1305 - set cra_name correctly Eric Biggers <ebiggers(a)google.com> crypto: salsa20 - don't access already-freed walk.iv Christian Lamparter <chunkeey(a)gmail.com> crypto: crypto4xx - fix cfb and ofb "overran dst buffer" issues Christian Lamparter <chunkeey(a)gmail.com> crypto: crypto4xx - fix ctr-aes missing output IV Peter Zijlstra <peterz(a)infradead.org> sched/x86: Save [ER]FLAGS on context switch Jean-Philippe Brucker <jean-philippe.brucker(a)arm.com> arm64: Save and restore OSDLR_EL1 across suspend/resume Jean-Philippe Brucker <jean-philippe.brucker(a)arm.com> arm64: Clear OSDLR_EL1 on CPU boot Vincenzo Frascino <vincenzo.frascino(a)arm.com> arm64: compat: Reduce address limit Will Deacon <will.deacon(a)arm.com> arm64: arch_timer: Ensure counter register reads occur with seqlock held Boyang Zhou <zhouby_cn(a)126.com> arm64: mmap: Ensure file offset is treated as unsigned Hans de Goede <hdegoede(a)redhat.com> power: supply: axp288_fuel_gauge: Add ACEPC T8 and T11 mini PCs to the blacklist Gustavo A. R. Silva <gustavo(a)embeddedor.com> power: supply: axp288_charger: Fix unchecked return value Wen Yang <wen.yang99(a)zte.com.cn> ARM: exynos: Fix a leaked reference by adding missing of_node_put Christoph Muellner <christoph.muellner(a)theobroma-systems.com> mmc: sdhci-of-arasan: Add DTS property to disable DCMDs. Sylwester Nawrocki <s.nawrocki(a)samsung.com> ARM: dts: exynos: Fix audio (microphone) routing on Odroid XU3 Stuart Menefy <stuart.menefy(a)mathembedded.com> ARM: dts: exynos: Fix interrupt for shared EINTs on Exynos5260 Christoph Muellner <christoph.muellner(a)theobroma-systems.com> arm64: dts: rockchip: Disable DCMDs on RK3399's eMMC controller. Josh Poimboeuf <jpoimboe(a)redhat.com> objtool: Fix function fallthrough detection Andy Lutomirski <luto(a)kernel.org> x86/speculation/mds: Improve CPU buffer clear documentation Andy Lutomirski <luto(a)kernel.org> x86/speculation/mds: Revert CPU buffer clear on double fault exit Waiman Long <longman(a)redhat.com> locking/rwsem: Prevent decrement of reader count before increment ------------- Diffstat: Documentation/x86/mds.rst | 44 ++------ Makefile | 6 +- arch/arm/boot/dts/exynos5260.dtsi | 2 +- arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +- arch/arm/crypto/aes-neonbs-glue.c | 2 + arch/arm/mach-exynos/firmware.c | 1 + arch/arm/mach-exynos/suspend.c | 2 + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 + arch/arm64/crypto/aes-neonbs-glue.c | 2 + arch/arm64/crypto/ghash-ce-glue.c | 10 +- arch/arm64/include/asm/arch_timer.h | 33 +++++- arch/arm64/include/asm/processor.h | 8 ++ arch/arm64/kernel/debug-monitors.c | 1 + arch/arm64/kernel/sys.c | 2 +- arch/arm64/kernel/vdso/gettimeofday.S | 15 ++- arch/arm64/mm/proc.S | 34 ++++--- arch/arm64/net/bpf_jit.h | 6 -- arch/arm64/net/bpf_jit_comp.c | 1 - arch/x86/crypto/crct10dif-pclmul_glue.c | 13 +-- arch/x86/entry/entry_32.S | 2 + arch/x86/entry/entry_64.S | 2 + arch/x86/include/asm/switch_to.h | 1 + arch/x86/kernel/process_32.c | 7 ++ arch/x86/kernel/process_64.c | 8 ++ arch/x86/kernel/traps.c | 8 -- arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/x86.c | 37 ++++--- arch/x86/xen/enlighten_pvh.c | 1 + crypto/ccm.c | 44 ++++---- crypto/chacha20poly1305.c | 4 +- crypto/crct10dif_generic.c | 11 +- crypto/gcm.c | 34 ++----- crypto/salsa20_generic.c | 2 +- crypto/skcipher.c | 9 +- drivers/acpi/sleep.c | 4 + drivers/char/ipmi/ipmi_ssif.c | 6 +- drivers/crypto/amcc/crypto4xx_alg.c | 12 ++- drivers/crypto/amcc/crypto4xx_core.c | 31 ++++-- drivers/crypto/ccp/psp-dev.c | 2 +- drivers/crypto/ccree/cc_aead.c | 11 +- drivers/crypto/ccree/cc_buffer_mgr.c | 113 +++++++-------------- drivers/crypto/ccree/cc_driver.h | 1 + drivers/crypto/ccree/cc_fips.c | 23 +++-- drivers/crypto/ccree/cc_fips.h | 2 + drivers/crypto/ccree/cc_hash.c | 28 ++++- drivers/crypto/ccree/cc_ivgen.c | 9 +- drivers/crypto/ccree/cc_pm.c | 9 +- drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 25 +++-- drivers/crypto/vmx/aesp8-ppc.pl | 4 +- drivers/dax/device.c | 6 +- drivers/md/bcache/journal.c | 11 +- drivers/md/bcache/super.c | 2 +- drivers/mmc/core/queue.c | 1 + drivers/mmc/host/sdhci-of-arasan.c | 5 +- drivers/mtd/spi-nor/intel-spi.c | 8 ++ drivers/nvdimm/label.c | 29 +++--- drivers/nvdimm/namespace_devs.c | 15 +++ drivers/nvdimm/nd.h | 4 + drivers/power/supply/axp288_charger.c | 4 + drivers/power/supply/axp288_fuel_gauge.c | 20 ++++ drivers/tty/hvc/hvc_riscv_sbi.c | 1 - drivers/tty/vt/keyboard.c | 33 ++++-- drivers/tty/vt/vt.c | 2 - fs/btrfs/backref.c | 34 ++++--- fs/btrfs/ctree.c | 10 ++ fs/btrfs/disk-io.c | 27 +++-- fs/btrfs/disk-io.h | 3 + fs/btrfs/extent-tree.c | 25 +++-- fs/btrfs/send.c | 36 +++++++ fs/dax.c | 6 +- fs/ext4/block_validity.c | 54 ++++++++++ fs/ext4/ext4.h | 6 +- fs/ext4/extents.c | 17 +++- fs/ext4/file.c | 7 ++ fs/ext4/inode.c | 7 +- fs/ext4/ioctl.c | 2 +- fs/ext4/mballoc.c | 2 +- fs/ext4/namei.c | 5 +- fs/ext4/resize.c | 1 + fs/ext4/super.c | 63 +++++++----- fs/ext4/xattr.c | 2 +- fs/fs-writeback.c | 11 +- fs/hugetlbfs/inode.c | 7 +- fs/jbd2/journal.c | 53 ++++++---- fs/jbd2/revoke.c | 32 +++--- fs/jbd2/transaction.c | 8 +- fs/ocfs2/export.c | 30 +++++- fs/pstore/inode.c | 11 +- fs/pstore/internal.h | 5 +- fs/pstore/platform.c | 75 +++++++++++--- fs/pstore/ram.c | 2 +- include/linux/huge_mm.h | 6 +- include/linux/hugetlb.h | 4 +- include/linux/jbd2.h | 8 +- include/linux/mfd/da9063/registers.h | 6 +- include/linux/mfd/max77620.h | 4 +- kernel/fork.c | 31 +++++- kernel/locking/rwsem-xadd.c | 44 +++++--- lib/iov_iter.c | 17 +++- mm/huge_memory.c | 16 +-- mm/hugetlb.c | 25 ++--- mm/mincore.c | 23 ++++- mm/userfaultfd.c | 3 +- sound/pci/hda/patch_hdmi.c | 11 +- sound/pci/hda/patch_realtek.c | 68 ++++++++----- sound/soc/codecs/hdac_hdmi.c | 11 ++ sound/soc/codecs/max98090.c | 12 +-- sound/soc/codecs/rt5677-spi.c | 35 +++---- sound/soc/fsl/fsl_esai.c | 2 +- sound/usb/line6/toneport.c | 16 +-- sound/usb/mixer.c | 2 + tools/objtool/check.c | 3 +- 112 files changed, 1082 insertions(+), 584 deletions(-)

5 years, 9 months

10
130
0 0

FAILED: patch "[PATCH] RDMA/ipoib: Allow user space differentiate between valid" 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 b79656ed44c6865e17bcd93472ec39488bcc4984 Mon Sep 17 00:00:00 2001 From: Leon Romanovsky <leonro(a)mellanox.com> Date: Mon, 6 May 2019 14:23:04 +0300 Subject: [PATCH] RDMA/ipoib: Allow user space differentiate between valid dev_port Systemd triggers the following warning during IPoIB device load: mlx5_core 0000:00:0c.0 ib0: "systemd-udevd" wants to know my dev_id. Should it look at dev_port instead? See Documentation/ABI/testing/sysfs-class-net for more info. This is caused due to user space attempt to differentiate old systems without dev_port and new systems with dev_port. In case dev_port will be zero, the systemd will try to read dev_id instead. There is no need to print a warning in such case, because it is valid situation and it is needed to ensure systemd compatibility with old kernels. Link: https://github.com/systemd/systemd/blob/master/src/udev/udev-builtin-net_id… Cc: <stable(a)vger.kernel.org> # 4.19 Fixes: f6350da41dc7 ("IB/ipoib: Log sysfs 'dev_id' accesses from userspace") Signed-off-by: Leon Romanovsky <leonro(a)mellanox.com> Signed-off-by: Jason Gunthorpe <jgg(a)mellanox.com> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 48eda16db1a7..9b5e11d3fb85 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -2402,7 +2402,18 @@ static ssize_t dev_id_show(struct device *dev, { struct net_device *ndev = to_net_dev(dev); - if (ndev->dev_id == ndev->dev_port) + /* + * ndev->dev_port will be equal to 0 in old kernel prior to commit + * 9b8b2a323008 ("IB/ipoib: Use dev_port to expose network interface + * port numbers") Zero was chosen as special case for user space + * applications to fallback and query dev_id to check if it has + * different value or not. + * + * Don't print warning in such scenario. + * + * https://github.com/systemd/systemd/blob/master/src/udev/udev-builtin-net_id… + */ + if (ndev->dev_port && ndev->dev_id == ndev->dev_port) netdev_info_once(ndev, "\"%s\" wants to know my dev_id. Should it look at dev_port instead? See Documentation/ABI/testing/sysfs-class-net for more info.\n", current->comm);

5 years, 9 months

1
0
0 0

[PATCH 4.14 000/115] 4.14.120-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.120 release. There are 115 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 Fri 17 May 2019 09:04:39 AM UTC. 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.120-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.120-rc1 Laurentiu Tudor <laurentiu.tudor(a)nxp.com> powerpc/booke64: set RI in default MSR Russell Currey <ruscur(a)russell.cc> powerpc/powernv/idle: Restore IAMR after idle Dan Carpenter <dan.carpenter(a)oracle.com> drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl Dan Carpenter <dan.carpenter(a)oracle.com> drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan(a)gmail.com> tipc: fix hanging clients using poll with EPOLLOUT flag Stephen Suryaputra <ssuryaextr(a)gmail.com> vrf: sit mtu should not be updated when vrf netdev is the link Hangbin Liu <liuhangbin(a)gmail.com> vlan: disable SIOCSHWTSTAMP in container YueHaibing <yuehaibing(a)huawei.com> packet: Fix error path in packet_init Christophe Leroy <christophe.leroy(a)c-s.fr> net: ucc_geth - fix Oops when changing number of buffers in the ring Thomas Bogendoerfer <tbogendoerfer(a)suse.de> net: seeq: fix crash caused by not set dev.parent Corentin Labbe <clabbe(a)baylibre.com> net: ethernet: stmmac: dwmac-sun8i: enable support of unicast filtering YueHaibing <yuehaibing(a)huawei.com> net: dsa: Fix error cleanup path in dsa_init_module David Ahern <dsahern(a)gmail.com> ipv4: Fix raw socket lookup for local traffic Hangbin Liu <liuhangbin(a)gmail.com> fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied Laurentiu Tudor <laurentiu.tudor(a)nxp.com> dpaa_eth: fix SG frame cleanup Tobin C. Harding <tobin(a)kernel.org> bridge: Fix error path for kobject_init_and_add() Jarod Wilson <jarod(a)redhat.com> bonding: fix arp_validate toggling in active-backup mode Breno Leitao <leitao(a)debian.org> powerpc/64s: Include cpu header Nigel Croxon <ncroxon(a)redhat.com> Don't jump to compute_result state from check_result state Gustavo A. R. Silva <gustavo(a)embeddedor.com> rtlwifi: rtl8723ae: Fix missing break in switch statement Petr Štetiar <ynezz(a)true.cz> mwl8k: Fix rate_idx underflow Wei Yongjun <weiyongjun1(a)huawei.com> cw1200: fix missing unlock on error in cw1200_hw_scan() Masami Hiramatsu <mhiramat(a)kernel.org> x86/kprobes: Avoid kretprobe recursion bug Dan Carpenter <dan.carpenter(a)oracle.com> nfc: nci: Potential off by one in ->pipes[] array Dan Carpenter <dan.carpenter(a)oracle.com> NFC: nci: Add some bounds checking in nci_hci_cmd_received() Ido Schimmel <idosch(a)mellanox.com> mlxsw: core: Do not use WQ_MEM_RECLAIM for mlxsw workqueue Ido Schimmel <idosch(a)mellanox.com> mlxsw: core: Do not use WQ_MEM_RECLAIM for mlxsw ordered workqueue Ido Schimmel <idosch(a)mellanox.com> mlxsw: core: Do not use WQ_MEM_RECLAIM for EMAD workqueue Ido Schimmel <idosch(a)mellanox.com> mlxsw: spectrum_switchdev: Add MDB entries in prepare phase Andy Duan <fugang.duan(a)nxp.com> net: fec: manage ahb clock in runtime pm Jan Kara <jack(a)suse.cz> mm/memory.c: fix modifying of page protection by insert_pfn() Jun Xiao <xiaojun2(a)hisilicon.com> net: hns: Fix WARNING when hns modules installed Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> x86/fpu: Don't export __kernel_fpu_{begin,end}() Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: fix memory leak in SMB2_read Damian Kos <dkos(a)cadence.com> drm/rockchip: fix for mailbox read validation. Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: warn when expr implements only one of activate/deactivate KT Liao <kt.liao(a)emc.com.tw> Input: elan_i2c - add hardware ID for multiple Lenovo laptops Erik Schmauss <erik.schmauss(a)intel.com> ACPICA: Namespace: remove address node from global list after method termination Matteo Croce <mcroce(a)redhat.com> gtp: change NET_UDP_TUNNEL dependency to select Cong Wang <xiyou.wangcong(a)gmail.com> net_sched: fix two more memory leaks in cls_tcindex Max Filippov <jcmvbkbc(a)gmail.com> xtensa: xtfpga.dtsi: fix dtc warnings about SPI Alexey Brodkin <alexey.brodkin(a)synopsys.com> devres: Align data[] to ARCH_KMALLOC_MINALIGN Nicolas Pitre <nicolas.pitre(a)linaro.org> vt: always call notifier with the console lock held Heinrich Schuchardt <xypron.glpk(a)gmx.de> arm64: dts: marvell: armada-ap806: reserve PSCI area Adit Ranadive <aditr(a)vmware.com> RDMA/vmw_pvrdma: Return the correct opcode when creating WR Enric Balletbo i Serra <enric.balletbo(a)collabora.com> drm/rockchip: psr: do not dereference encoder before it is null checked. Jerome Brunet <jbrunet(a)baylibre.com> leds: pwm: silently error out on EPROBE_DEFER Nicholas Piggin <npiggin(a)gmail.com> powerpc: remove old GCC version checks Dmitry Eremin-Solenikov <dbaryshkov(a)gmail.com> crypto: testmgr - add AES-CFB tests Marc Zyngier <marc.zyngier(a)arm.com> arm64: KVM: Make VHE Stage-2 TLB invalidation operations non-interruptible Martin Schwidefsky <schwidefsky(a)de.ibm.com> mm: introduce mm_[p4d|pud|pmd]_folded Alistair Strachan <astrachan(a)google.com> x86/vdso: Pass --eh-frame-hdr to the linker Omar Sandoval <osandov(a)fb.com> Btrfs: fix missing delayed iputs on unmount Thierry Reding <treding(a)nvidia.com> net: stmmac: Move debugfs init/exit to ->probe()/->remove() Lubomir Rintel <lkundrak(a)v3.sk> staging: olpc_dcon: add a missing dependency Arnd Bergmann <arnd(a)arndb.de> scsi: raid_attrs: fix unused variable warning Chris Wilson <chris(a)chris-wilson.co.uk> drm/i915: Downgrade Gen9 Plane WM latency error Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing/fgraph: Fix set_graph_function from showing interrupts Paolo Abeni <pabeni(a)redhat.com> net: don't keep lonely packets forever in the gro hash Hugues Fruchet <hugues.fruchet(a)st.com> media: ov5640: fix auto controls values when switching to manual mode Hugues Fruchet <hugues.fruchet(a)st.com> media: ov5640: fix wrong binning value in exposure calculation Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Disable LP3 watermarks on all SNB machines Vignesh R <vigneshr(a)ti.com> i2c: omap: Enable for ARCH_K3 Miklos Szeredi <mszeredi(a)redhat.com> fuse: fix possibly missed wake-up after abort Hans Verkuil <hans.verkuil(a)cisco.com> media: adv7842: when the EDID is cleared, unconfigure CEC as well Hans Verkuil <hans.verkuil(a)cisco.com> media: adv7604: when the EDID is cleared, unconfigure CEC as well Hans Verkuil <hans.verkuil(a)cisco.com> media: cec: integrate cec_validate_phys_addr() in cec-api.c Hans Verkuil <hans.verkuil(a)cisco.com> media: cec: make cec_get_edid_spa_location() an inline function Punit Agrawal <punit.agrawal(a)arm.com> KVM: arm/arm64: Ensure only THP is candidate for adjustment Goldwyn Rodrigues <rgoldwyn(a)suse.de> ima: open a new file instance if no read permissions Jason Gunthorpe <jgg(a)mellanox.com> IB/rxe: Revise the ib_wr_opcode enum Erik Schmauss <erik.schmauss(a)intel.com> ACPICA: AML interpreter: add region addresses in global list during initialization Tang Junhui <tang.junhui.linux(a)gmail.com> bcache: correct dirty data statistics Huacai Chen <chenhc(a)lemote.com> MIPS: VDSO: Reduce VDSO_RANDOMIZE_SIZE to 64MB for 64bit David Miller <davem(a)redhat.com> sparc64: Make corrupted user stacks more debuggable. David S. Miller <davem(a)davemloft.net> sparc64: Export __node_distance. Pan Bian <bianpan2016(a)163.com> Input: synaptics-rmi4 - fix possible double free Daniel Gomez <dagmcr(a)gmail.com> spi: ST ST95HF NFC: declare missing of table Daniel Gomez <dagmcr(a)gmail.com> spi: Micrel eth switch: declare missing of table Lucas Stach <l.stach(a)pengutronix.de> drm/imx: don't skip DP channel disable for background plane Lucas Stach <l.stach(a)pengutronix.de> gpu: ipu-v3: dp: fix CSC handling Po-Hsu Lin <po-hsu.lin(a)canonical.com> selftests/net: correct the return value for run_netsocktests Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> drm/sun4i: Set device driver data at bind time for use in unbind Arnd Bergmann <arnd(a)arndb.de> s390: ctcm: fix ctcm_new_device error return code Petr Štetiar <ynezz(a)true.cz> MIPS: perf: ath79: Fix perfcount IRQ assignment Florian Westphal <fw(a)strlen.de> netfilter: ctnetlink: don't use conntrack/expect object addresses as id Julian Anastasov <ja(a)ssi.bg> ipvs: do not schedule icmp errors from tunnels Florian Westphal <fw(a)strlen.de> selftests: netfilter: check icmp pkttoobig errors are set as related Dan Williams <dan.j.williams(a)intel.com> init: initialize jump labels before command line option parsing Johannes Weiner <hannes(a)cmpxchg.org> mm: fix inactive list balancing between NUMA nodes and cgroups Rikard Falkeborn <rikard.falkeborn(a)gmail.com> tools lib traceevent: Fix missing equality check for strcmp Vitaly Kuznetsov <vkuznets(a)redhat.com> KVM: x86: avoid misreporting level-triggered irqs as edge-triggered in tracing Paolo Bonzini <pbonzini(a)redhat.com> KVM: fix spectrev1 gadgets Jian-Hong Pan <jian-hong(a)endlessm.com> x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T Harald Freudenberger <freude(a)linux.ibm.com> s390/pkey: add one more argument space for debug feature entry Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> mISDN: Check address length before reading address family Neil Armstrong <narmstrong(a)baylibre.com> clocksource/drivers/oxnas: Fix OX820 compatible Martin Schwidefsky <schwidefsky(a)de.ibm.com> s390/3270: fix lockdep false positive on view->lock Sunil Dutt <usdutt(a)codeaurora.org> nl80211: Add NL80211_FLAG_CLEAR_SKB flag for other NL commands Felix Fietkau <nbd(a)nbd.name> mac80211: fix memory accounting with A-MSDU aggregation Andrei Otcheretianski <andrei.otcheretianski(a)intel.com> mac80211: Increase MAX_MSG_LEN Felix Fietkau <nbd(a)nbd.name> mac80211: fix unaligned access in mesh table hash function Peter Oberparleiter <oberpar(a)linux.ibm.com> s390/dasd: Fix capacity calculation for large volumes Aditya Pakki <pakki001(a)umn.edu> libnvdimm/btt: Fix a kmemdup failure check Dmitry Torokhov <dmitry.torokhov(a)gmail.com> HID: input: add mapping for "Toggle Display" key Dmitry Torokhov <dmitry.torokhov(a)gmail.com> HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys Dmitry Torokhov <dmitry.torokhov(a)gmail.com> HID: input: add mapping for Expose/Overview key Kangjie Lu <kjlu(a)umn.edu> libnvdimm/namespace: Fix a potential NULL pointer dereference Sven Van Asbroeck <thesven73(a)gmail.com> iio: adc: xilinx: fix potential use-after-free on remove Johan Hovold <johan(a)kernel.org> USB: serial: fix unthrottle races Andrea Parri <andrea.parri(a)amarulasolutions.com> kernfs: fix barrier usage in __kernfs_new_node() Stefan Wahren <stefan.wahren(a)i2se.com> hwmon: (pwm-fan) Disable PWM if fetching cooling data fails Jiaxun Yang <jiaxun.yang(a)flygoat.com> platform/x86: thinkpad_acpi: Disable Bluetooth for some machines Gustavo A. R. Silva <gustavo(a)embeddedor.com> platform/x86: sony-laptop: Fix unintentional fall-through Francesco Ruggeri <fruggeri(a)arista.com> netfilter: compat: initialize all fields in xt_init ------------- Diffstat: Makefile | 4 +- arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 17 ++ arch/arm64/kvm/hyp/tlb.c | 35 ++- arch/mips/ath79/setup.c | 6 - arch/mips/include/asm/processor.h | 2 +- arch/powerpc/Makefile | 31 +-- arch/powerpc/include/asm/reg_booke.h | 2 +- arch/powerpc/kernel/idle_book3s.S | 20 ++ arch/powerpc/kernel/security.c | 1 + arch/sparc/include/asm/switch_to_64.h | 3 +- arch/sparc/kernel/process_64.c | 25 +- arch/sparc/kernel/rtrap_64.S | 1 + arch/sparc/kernel/signal32.c | 12 +- arch/sparc/kernel/signal_64.c | 6 +- arch/sparc/mm/init_64.c | 1 + arch/x86/entry/vdso/Makefile | 3 +- arch/x86/include/asm/efi.h | 6 +- arch/x86/include/asm/fpu/api.h | 15 +- arch/x86/kernel/fpu/core.c | 6 +- arch/x86/kernel/kprobes/core.c | 22 +- arch/x86/kernel/reboot.c | 21 ++ arch/x86/kvm/lapic.c | 4 +- arch/x86/kvm/trace.h | 4 +- arch/xtensa/boot/dts/xtfpga.dtsi | 2 +- crypto/tcrypt.c | 5 + crypto/testmgr.c | 7 + crypto/testmgr.h | 76 ++++++ drivers/acpi/acpica/dsopcode.c | 4 + drivers/acpi/acpica/nsobject.c | 4 + drivers/base/devres.c | 10 +- drivers/clocksource/timer-oxnas-rps.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 45 +++- drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 4 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 + drivers/gpu/ipu-v3/ipu-dp.c | 12 +- drivers/hid/hid-input.c | 14 + drivers/hwmon/pwm-fan.c | 2 +- drivers/i2c/busses/Kconfig | 2 +- drivers/iio/adc/xilinx-xadc-core.c | 2 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 35 ++- drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 6 + drivers/input/mouse/elan_i2c_core.c | 25 ++ drivers/input/rmi4/rmi_driver.c | 6 +- drivers/irqchip/irq-ath79-misc.c | 11 + drivers/isdn/mISDN/socket.c | 4 +- drivers/leds/leds-pwm.c | 5 +- drivers/md/bcache/super.c | 3 +- drivers/md/raid5.c | 19 +- drivers/media/cec/cec-api.c | 19 +- drivers/media/cec/cec-edid.c | 60 ----- drivers/media/i2c/adv7604.c | 4 +- drivers/media/i2c/adv7842.c | 4 +- drivers/media/i2c/ov5640.c | 12 +- drivers/net/Kconfig | 4 +- drivers/net/bonding/bond_options.c | 7 - drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- drivers/net/ethernet/freescale/fec_main.c | 30 ++- drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 8 +- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 6 +- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 +- drivers/net/ethernet/seeq/sgiseeq.c | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +- drivers/net/phy/spi_ks8995.c | 9 + drivers/net/wireless/marvell/mwl8k.c | 13 +- .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 1 + drivers/net/wireless/st/cw1200/scan.c | 5 +- drivers/nfc/st95hf/core.c | 7 + drivers/nvdimm/btt_devs.c | 18 +- drivers/nvdimm/namespace_devs.c | 5 +- drivers/platform/x86/sony-laptop.c | 8 +- drivers/platform/x86/thinkpad_acpi.c | 72 +++++- drivers/s390/block/dasd_eckd.c | 6 +- drivers/s390/char/con3270.c | 2 +- drivers/s390/char/fs3270.c | 3 +- drivers/s390/char/raw3270.c | 3 +- drivers/s390/char/raw3270.h | 4 +- drivers/s390/char/tty3270.c | 3 +- drivers/s390/crypto/pkey_api.c | 3 +- drivers/s390/net/ctcm_main.c | 1 + drivers/scsi/raid_class.c | 4 +- drivers/staging/olpc_dcon/Kconfig | 1 + drivers/tty/vt/vt.c | 2 +- drivers/usb/serial/generic.c | 39 ++- drivers/virt/fsl_hypervisor.c | 29 ++- fs/btrfs/disk-io.c | 51 ++-- fs/cifs/smb2pdu.c | 1 + fs/fuse/dev.c | 12 +- fs/kernfs/dir.c | 5 +- include/asm-generic/pgtable.h | 16 ++ include/linux/efi.h | 7 +- include/linux/kvm_host.h | 10 +- include/media/cec.h | 70 +++++ include/net/netfilter/nf_conntrack.h | 2 + include/net/nfc/nci_core.h | 2 +- include/rdma/ib_verbs.h | 34 ++- include/uapi/rdma/ib_user_verbs.h | 20 +- include/uapi/rdma/vmw_pvrdma-abi.h | 1 + init/main.c | 4 +- kernel/trace/trace.h | 57 ++++- kernel/trace/trace_functions_graph.c | 4 + kernel/trace/trace_irqsoff.c | 2 + kernel/trace/trace_sched_wakeup.c | 2 + mm/memory.c | 11 +- mm/vmscan.c | 29 +-- net/8021q/vlan_dev.c | 4 +- net/bridge/br_if.c | 13 +- net/core/dev.c | 7 +- net/core/fib_rules.c | 6 +- net/dsa/dsa.c | 11 +- net/ipv4/raw.c | 4 +- net/ipv6/sit.c | 2 +- net/mac80211/mesh_pathtbl.c | 2 +- net/mac80211/trace_msg.h | 7 +- net/mac80211/tx.c | 3 + net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/nf_conntrack_core.c | 35 +++ net/netfilter/nf_conntrack_netlink.c | 34 ++- net/netfilter/nf_tables_api.c | 19 ++ net/netfilter/x_tables.c | 2 +- net/nfc/nci/hci.c | 8 + net/packet/af_packet.c | 25 +- net/sched/cls_tcindex.c | 16 +- net/tipc/socket.c | 4 +- net/wireless/nl80211.c | 18 +- security/integrity/ima/ima_crypto.c | 54 ++-- tools/lib/traceevent/event-parse.c | 2 +- tools/testing/selftests/net/run_netsocktests | 2 +- tools/testing/selftests/netfilter/Makefile | 2 +- .../selftests/netfilter/conntrack_icmp_related.sh | 283 +++++++++++++++++++++ virt/kvm/arm/mmu.c | 8 +- virt/kvm/irqchip.c | 5 +- virt/kvm/kvm_main.c | 6 +- 136 files changed, 1457 insertions(+), 462 deletions(-)

5 years, 9 months

10
133
0 0

FAILED: patch "[PATCH] media: imx: Don't register IPU subdevs/links if CSI port" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-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 dee747f88167124884a918855c1f438e2f7f39e2 Mon Sep 17 00:00:00 2001 From: Steve Longerbeam <slongerbeam(a)gmail.com> Date: Wed, 20 Feb 2019 18:53:32 -0500 Subject: [PATCH] media: imx: Don't register IPU subdevs/links if CSI port missing The second IPU internal sub-devices were being registered and links to them created even when the second IPU is not present. This is wrong for i.MX6 S/DL and i.MX53 which have only a single IPU. Fixes: e130291212df5 ("[media] media: Add i.MX media core driver") Signed-off-by: Steve Longerbeam <slongerbeam(a)gmail.com> Reviewed-by: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: stable(a)vger.kernel.org Signed-off-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c index fc35508d9396..10a63a4fa90b 100644 --- a/drivers/staging/media/imx/imx-media-dev.c +++ b/drivers/staging/media/imx/imx-media-dev.c @@ -477,13 +477,6 @@ static int imx_media_probe(struct platform_device *pdev) goto cleanup; } - ret = imx_media_add_ipu_internal_subdevs(imxmd); - if (ret) { - v4l2_err(&imxmd->v4l2_dev, - "add_ipu_internal_subdevs failed with %d\n", ret); - goto cleanup; - } - ret = imx_media_dev_notifier_register(imxmd); if (ret) goto del_int; diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c index e620f4adb755..dc510dcfe160 100644 --- a/drivers/staging/media/imx/imx-media-internal-sd.c +++ b/drivers/staging/media/imx/imx-media-internal-sd.c @@ -298,13 +298,14 @@ static int add_internal_subdev(struct imx_media_dev *imxmd, } /* adds the internal subdevs in one ipu */ -static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id) +int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd, + int ipu_id) { enum isd_enum i; + int ret; for (i = 0; i < num_isd; i++) { const struct internal_subdev *isd = &int_subdev[i]; - int ret; /* * the CSIs are represented in the device-tree, so those @@ -322,25 +323,10 @@ static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id) } if (ret) - return ret; + goto remove; } return 0; -} - -int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd) -{ - int ret; - - ret = add_ipu_internal_subdevs(imxmd, 0); - if (ret) - goto remove; - - ret = add_ipu_internal_subdevs(imxmd, 1); - if (ret) - goto remove; - - return 0; remove: imx_media_remove_ipu_internal_subdevs(imxmd); diff --git a/drivers/staging/media/imx/imx-media-of.c b/drivers/staging/media/imx/imx-media-of.c index a26bdeb1af34..12383f4785ad 100644 --- a/drivers/staging/media/imx/imx-media-of.c +++ b/drivers/staging/media/imx/imx-media-of.c @@ -23,36 +23,25 @@ int imx_media_of_add_csi(struct imx_media_dev *imxmd, struct device_node *csi_np) { - int ret; - if (!of_device_is_available(csi_np)) { dev_dbg(imxmd->md.dev, "%s: %pOFn not enabled\n", __func__, csi_np); - /* unavailable is not an error */ - return 0; + return -ENODEV; } /* add CSI fwnode to async notifier */ - ret = imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np), NULL); - if (ret) { - if (ret == -EEXIST) { - /* already added, everything is fine */ - return 0; - } - - /* other error, can't continue */ - return ret; - } - - return 0; + return imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np), + NULL); } EXPORT_SYMBOL_GPL(imx_media_of_add_csi); int imx_media_add_of_subdevs(struct imx_media_dev *imxmd, struct device_node *np) { + bool ipu_found[2] = {false, false}; struct device_node *csi_np; int i, ret; + u32 ipu_id; for (i = 0; ; i++) { csi_np = of_parse_phandle(np, "ports", i); @@ -60,12 +49,43 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd, break; ret = imx_media_of_add_csi(imxmd, csi_np); - of_node_put(csi_np); - if (ret) - return ret; + if (ret) { + /* unavailable or already added is not an error */ + if (ret == -ENODEV || ret == -EEXIST) { + of_node_put(csi_np); + continue; + } + + /* other error, can't continue */ + goto err_out; + } + + ret = of_alias_get_id(csi_np->parent, "ipu"); + if (ret < 0) + goto err_out; + if (ret > 1) { + ret = -EINVAL; + goto err_out; + } + + ipu_id = ret; + + if (!ipu_found[ipu_id]) { + ret = imx_media_add_ipu_internal_subdevs(imxmd, + ipu_id); + if (ret) + goto err_out; + } + + ipu_found[ipu_id] = true; } return 0; + +err_out: + imx_media_remove_ipu_internal_subdevs(imxmd); + of_node_put(csi_np); + return ret; } /* diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h index ccbfc4438c85..dd603a6b3a70 100644 --- a/drivers/staging/media/imx/imx-media.h +++ b/drivers/staging/media/imx/imx-media.h @@ -252,7 +252,8 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd); void imx_media_fim_free(struct imx_media_fim *fim); /* imx-media-internal-sd.c */ -int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd); +int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd, + int ipu_id); int imx_media_create_ipu_internal_links(struct imx_media_dev *imxmd, struct v4l2_subdev *sd); void imx_media_remove_ipu_internal_subdevs(struct imx_media_dev *imxmd); diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 3fba7c27c0ec..1ba62fcdcae8 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -1271,7 +1271,7 @@ static int imx7_csi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, &csi->sd); ret = imx_media_of_add_csi(imxmd, node); - if (ret < 0) + if (ret < 0 && ret != -ENODEV && ret != -EEXIST) goto cleanup; ret = imx_media_dev_notifier_register(imxmd);

5 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] media: imx: Don't register IPU subdevs/links if CSI port" 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 dee747f88167124884a918855c1f438e2f7f39e2 Mon Sep 17 00:00:00 2001 From: Steve Longerbeam <slongerbeam(a)gmail.com> Date: Wed, 20 Feb 2019 18:53:32 -0500 Subject: [PATCH] media: imx: Don't register IPU subdevs/links if CSI port missing The second IPU internal sub-devices were being registered and links to them created even when the second IPU is not present. This is wrong for i.MX6 S/DL and i.MX53 which have only a single IPU. Fixes: e130291212df5 ("[media] media: Add i.MX media core driver") Signed-off-by: Steve Longerbeam <slongerbeam(a)gmail.com> Reviewed-by: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: stable(a)vger.kernel.org Signed-off-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c index fc35508d9396..10a63a4fa90b 100644 --- a/drivers/staging/media/imx/imx-media-dev.c +++ b/drivers/staging/media/imx/imx-media-dev.c @@ -477,13 +477,6 @@ static int imx_media_probe(struct platform_device *pdev) goto cleanup; } - ret = imx_media_add_ipu_internal_subdevs(imxmd); - if (ret) { - v4l2_err(&imxmd->v4l2_dev, - "add_ipu_internal_subdevs failed with %d\n", ret); - goto cleanup; - } - ret = imx_media_dev_notifier_register(imxmd); if (ret) goto del_int; diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c index e620f4adb755..dc510dcfe160 100644 --- a/drivers/staging/media/imx/imx-media-internal-sd.c +++ b/drivers/staging/media/imx/imx-media-internal-sd.c @@ -298,13 +298,14 @@ static int add_internal_subdev(struct imx_media_dev *imxmd, } /* adds the internal subdevs in one ipu */ -static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id) +int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd, + int ipu_id) { enum isd_enum i; + int ret; for (i = 0; i < num_isd; i++) { const struct internal_subdev *isd = &int_subdev[i]; - int ret; /* * the CSIs are represented in the device-tree, so those @@ -322,25 +323,10 @@ static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id) } if (ret) - return ret; + goto remove; } return 0; -} - -int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd) -{ - int ret; - - ret = add_ipu_internal_subdevs(imxmd, 0); - if (ret) - goto remove; - - ret = add_ipu_internal_subdevs(imxmd, 1); - if (ret) - goto remove; - - return 0; remove: imx_media_remove_ipu_internal_subdevs(imxmd); diff --git a/drivers/staging/media/imx/imx-media-of.c b/drivers/staging/media/imx/imx-media-of.c index a26bdeb1af34..12383f4785ad 100644 --- a/drivers/staging/media/imx/imx-media-of.c +++ b/drivers/staging/media/imx/imx-media-of.c @@ -23,36 +23,25 @@ int imx_media_of_add_csi(struct imx_media_dev *imxmd, struct device_node *csi_np) { - int ret; - if (!of_device_is_available(csi_np)) { dev_dbg(imxmd->md.dev, "%s: %pOFn not enabled\n", __func__, csi_np); - /* unavailable is not an error */ - return 0; + return -ENODEV; } /* add CSI fwnode to async notifier */ - ret = imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np), NULL); - if (ret) { - if (ret == -EEXIST) { - /* already added, everything is fine */ - return 0; - } - - /* other error, can't continue */ - return ret; - } - - return 0; + return imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np), + NULL); } EXPORT_SYMBOL_GPL(imx_media_of_add_csi); int imx_media_add_of_subdevs(struct imx_media_dev *imxmd, struct device_node *np) { + bool ipu_found[2] = {false, false}; struct device_node *csi_np; int i, ret; + u32 ipu_id; for (i = 0; ; i++) { csi_np = of_parse_phandle(np, "ports", i); @@ -60,12 +49,43 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd, break; ret = imx_media_of_add_csi(imxmd, csi_np); - of_node_put(csi_np); - if (ret) - return ret; + if (ret) { + /* unavailable or already added is not an error */ + if (ret == -ENODEV || ret == -EEXIST) { + of_node_put(csi_np); + continue; + } + + /* other error, can't continue */ + goto err_out; + } + + ret = of_alias_get_id(csi_np->parent, "ipu"); + if (ret < 0) + goto err_out; + if (ret > 1) { + ret = -EINVAL; + goto err_out; + } + + ipu_id = ret; + + if (!ipu_found[ipu_id]) { + ret = imx_media_add_ipu_internal_subdevs(imxmd, + ipu_id); + if (ret) + goto err_out; + } + + ipu_found[ipu_id] = true; } return 0; + +err_out: + imx_media_remove_ipu_internal_subdevs(imxmd); + of_node_put(csi_np); + return ret; } /* diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h index ccbfc4438c85..dd603a6b3a70 100644 --- a/drivers/staging/media/imx/imx-media.h +++ b/drivers/staging/media/imx/imx-media.h @@ -252,7 +252,8 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd); void imx_media_fim_free(struct imx_media_fim *fim); /* imx-media-internal-sd.c */ -int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd); +int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd, + int ipu_id); int imx_media_create_ipu_internal_links(struct imx_media_dev *imxmd, struct v4l2_subdev *sd); void imx_media_remove_ipu_internal_subdevs(struct imx_media_dev *imxmd); diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 3fba7c27c0ec..1ba62fcdcae8 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -1271,7 +1271,7 @@ static int imx7_csi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, &csi->sd); ret = imx_media_of_add_csi(imxmd, node); - if (ret < 0) + if (ret < 0 && ret != -ENODEV && ret != -EEXIST) goto cleanup; ret = imx_media_dev_notifier_register(imxmd);

5 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] media: imx: Don't register IPU subdevs/links if CSI port" failed to apply to 5.0-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.0-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 dee747f88167124884a918855c1f438e2f7f39e2 Mon Sep 17 00:00:00 2001 From: Steve Longerbeam <slongerbeam(a)gmail.com> Date: Wed, 20 Feb 2019 18:53:32 -0500 Subject: [PATCH] media: imx: Don't register IPU subdevs/links if CSI port missing The second IPU internal sub-devices were being registered and links to them created even when the second IPU is not present. This is wrong for i.MX6 S/DL and i.MX53 which have only a single IPU. Fixes: e130291212df5 ("[media] media: Add i.MX media core driver") Signed-off-by: Steve Longerbeam <slongerbeam(a)gmail.com> Reviewed-by: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: stable(a)vger.kernel.org Signed-off-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c index fc35508d9396..10a63a4fa90b 100644 --- a/drivers/staging/media/imx/imx-media-dev.c +++ b/drivers/staging/media/imx/imx-media-dev.c @@ -477,13 +477,6 @@ static int imx_media_probe(struct platform_device *pdev) goto cleanup; } - ret = imx_media_add_ipu_internal_subdevs(imxmd); - if (ret) { - v4l2_err(&imxmd->v4l2_dev, - "add_ipu_internal_subdevs failed with %d\n", ret); - goto cleanup; - } - ret = imx_media_dev_notifier_register(imxmd); if (ret) goto del_int; diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c index e620f4adb755..dc510dcfe160 100644 --- a/drivers/staging/media/imx/imx-media-internal-sd.c +++ b/drivers/staging/media/imx/imx-media-internal-sd.c @@ -298,13 +298,14 @@ static int add_internal_subdev(struct imx_media_dev *imxmd, } /* adds the internal subdevs in one ipu */ -static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id) +int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd, + int ipu_id) { enum isd_enum i; + int ret; for (i = 0; i < num_isd; i++) { const struct internal_subdev *isd = &int_subdev[i]; - int ret; /* * the CSIs are represented in the device-tree, so those @@ -322,25 +323,10 @@ static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id) } if (ret) - return ret; + goto remove; } return 0; -} - -int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd) -{ - int ret; - - ret = add_ipu_internal_subdevs(imxmd, 0); - if (ret) - goto remove; - - ret = add_ipu_internal_subdevs(imxmd, 1); - if (ret) - goto remove; - - return 0; remove: imx_media_remove_ipu_internal_subdevs(imxmd); diff --git a/drivers/staging/media/imx/imx-media-of.c b/drivers/staging/media/imx/imx-media-of.c index a26bdeb1af34..12383f4785ad 100644 --- a/drivers/staging/media/imx/imx-media-of.c +++ b/drivers/staging/media/imx/imx-media-of.c @@ -23,36 +23,25 @@ int imx_media_of_add_csi(struct imx_media_dev *imxmd, struct device_node *csi_np) { - int ret; - if (!of_device_is_available(csi_np)) { dev_dbg(imxmd->md.dev, "%s: %pOFn not enabled\n", __func__, csi_np); - /* unavailable is not an error */ - return 0; + return -ENODEV; } /* add CSI fwnode to async notifier */ - ret = imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np), NULL); - if (ret) { - if (ret == -EEXIST) { - /* already added, everything is fine */ - return 0; - } - - /* other error, can't continue */ - return ret; - } - - return 0; + return imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np), + NULL); } EXPORT_SYMBOL_GPL(imx_media_of_add_csi); int imx_media_add_of_subdevs(struct imx_media_dev *imxmd, struct device_node *np) { + bool ipu_found[2] = {false, false}; struct device_node *csi_np; int i, ret; + u32 ipu_id; for (i = 0; ; i++) { csi_np = of_parse_phandle(np, "ports", i); @@ -60,12 +49,43 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd, break; ret = imx_media_of_add_csi(imxmd, csi_np); - of_node_put(csi_np); - if (ret) - return ret; + if (ret) { + /* unavailable or already added is not an error */ + if (ret == -ENODEV || ret == -EEXIST) { + of_node_put(csi_np); + continue; + } + + /* other error, can't continue */ + goto err_out; + } + + ret = of_alias_get_id(csi_np->parent, "ipu"); + if (ret < 0) + goto err_out; + if (ret > 1) { + ret = -EINVAL; + goto err_out; + } + + ipu_id = ret; + + if (!ipu_found[ipu_id]) { + ret = imx_media_add_ipu_internal_subdevs(imxmd, + ipu_id); + if (ret) + goto err_out; + } + + ipu_found[ipu_id] = true; } return 0; + +err_out: + imx_media_remove_ipu_internal_subdevs(imxmd); + of_node_put(csi_np); + return ret; } /* diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h index ccbfc4438c85..dd603a6b3a70 100644 --- a/drivers/staging/media/imx/imx-media.h +++ b/drivers/staging/media/imx/imx-media.h @@ -252,7 +252,8 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd); void imx_media_fim_free(struct imx_media_fim *fim); /* imx-media-internal-sd.c */ -int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd); +int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd, + int ipu_id); int imx_media_create_ipu_internal_links(struct imx_media_dev *imxmd, struct v4l2_subdev *sd); void imx_media_remove_ipu_internal_subdevs(struct imx_media_dev *imxmd); diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 3fba7c27c0ec..1ba62fcdcae8 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -1271,7 +1271,7 @@ static int imx7_csi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, &csi->sd); ret = imx_media_of_add_csi(imxmd, node); - if (ret < 0) + if (ret < 0 && ret != -ENODEV && ret != -EEXIST) goto cleanup; ret = imx_media_dev_notifier_register(imxmd);

5 years, 9 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror May 2019