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

[PATCH v2] mm: shmem: Correctly annotate new inodes for lockdep

by Joel Fernandes

From: "Joel Fernandes (Google)" <joel(a)joelfernandes.org> Directories and inodes don't necessarily need to be in the same lockdep class. For ex, hugetlbfs splits them out too to prevent false positives in lockdep. Annotate correctly after new inode creation. If its a directory inode, it will be put into a different class. This should fix a lockdep splat reported by syzbot: > ====================================================== > WARNING: possible circular locking dependency detected > 4.18.0-rc8-next-20180810+ #36 Not tainted > ------------------------------------------------------ > syz-executor900/4483 is trying to acquire lock: > 00000000d2bfc8fe (&sb->s_type->i_mutex_key#9){++++}, at: inode_lock > include/linux/fs.h:765 [inline] > 00000000d2bfc8fe (&sb->s_type->i_mutex_key#9){++++}, at: > shmem_fallocate+0x18b/0x12e0 mm/shmem.c:2602 > > but task is already holding lock: > 0000000025208078 (ashmem_mutex){+.+.}, at: ashmem_shrink_scan+0xb4/0x630 > drivers/staging/android/ashmem.c:448 > > which lock already depends on the new lock. > > -> #2 (ashmem_mutex){+.+.}: > __mutex_lock_common kernel/locking/mutex.c:925 [inline] > __mutex_lock+0x171/0x1700 kernel/locking/mutex.c:1073 > mutex_lock_nested+0x16/0x20 kernel/locking/mutex.c:1088 > ashmem_mmap+0x55/0x520 drivers/staging/android/ashmem.c:361 > call_mmap include/linux/fs.h:1844 [inline] > mmap_region+0xf27/0x1c50 mm/mmap.c:1762 > do_mmap+0xa10/0x1220 mm/mmap.c:1535 > do_mmap_pgoff include/linux/mm.h:2298 [inline] > vm_mmap_pgoff+0x213/0x2c0 mm/util.c:357 > ksys_mmap_pgoff+0x4da/0x660 mm/mmap.c:1585 > __do_sys_mmap arch/x86/kernel/sys_x86_64.c:100 [inline] > __se_sys_mmap arch/x86/kernel/sys_x86_64.c:91 [inline] > __x64_sys_mmap+0xe9/0x1b0 arch/x86/kernel/sys_x86_64.c:91 > do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290 > entry_SYSCALL_64_after_hwframe+0x49/0xbe > > -> #1 (&mm->mmap_sem){++++}: > __might_fault+0x155/0x1e0 mm/memory.c:4568 > _copy_to_user+0x30/0x110 lib/usercopy.c:25 > copy_to_user include/linux/uaccess.h:155 [inline] > filldir+0x1ea/0x3a0 fs/readdir.c:196 > dir_emit_dot include/linux/fs.h:3464 [inline] > dir_emit_dots include/linux/fs.h:3475 [inline] > dcache_readdir+0x13a/0x620 fs/libfs.c:193 > iterate_dir+0x48b/0x5d0 fs/readdir.c:51 > __do_sys_getdents fs/readdir.c:231 [inline] > __se_sys_getdents fs/readdir.c:212 [inline] > __x64_sys_getdents+0x29f/0x510 fs/readdir.c:212 > do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290 > entry_SYSCALL_64_after_hwframe+0x49/0xbe > > -> #0 (&sb->s_type->i_mutex_key#9){++++}: > lock_acquire+0x1e4/0x540 kernel/locking/lockdep.c:3924 > down_write+0x8f/0x130 kernel/locking/rwsem.c:70 > inode_lock include/linux/fs.h:765 [inline] > shmem_fallocate+0x18b/0x12e0 mm/shmem.c:2602 > ashmem_shrink_scan+0x236/0x630 drivers/staging/android/ashmem.c:455 > ashmem_ioctl+0x3ae/0x13a0 drivers/staging/android/ashmem.c:797 > vfs_ioctl fs/ioctl.c:46 [inline] > file_ioctl fs/ioctl.c:501 [inline] > do_vfs_ioctl+0x1de/0x1720 fs/ioctl.c:685 > ksys_ioctl+0xa9/0xd0 fs/ioctl.c:702 > __do_sys_ioctl fs/ioctl.c:709 [inline] > __se_sys_ioctl fs/ioctl.c:707 [inline] > __x64_sys_ioctl+0x73/0xb0 fs/ioctl.c:707 > do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290 > entry_SYSCALL_64_after_hwframe+0x49/0xbe > > other info that might help us debug this: > > Chain exists of: > &sb->s_type->i_mutex_key#9 --> &mm->mmap_sem --> ashmem_mutex > > Possible unsafe locking scenario: > > CPU0 CPU1 > ---- ---- > lock(ashmem_mutex); > lock(&mm->mmap_sem); > lock(ashmem_mutex); > lock(&sb->s_type->i_mutex_key#9); > > *** DEADLOCK *** > > 1 lock held by syz-executor900/4483: > #0: 0000000025208078 (ashmem_mutex){+.+.}, at: > ashmem_shrink_scan+0xb4/0x630 drivers/staging/android/ashmem.c:448 Reported-by: syzbot <syzkaller(a)googlegroups.com> Cc: willy(a)infradead.org Cc: stable(a)vger.kernel.org Cc: peterz(a)infradead.org Cc: Andrew Morton <akpm(a)linux-foundation.org> Reviewed-by: NeilBrown <neilb(a)suse.com> Suggested-by: NeilBrown <neilb(a)suse.com> Signed-off-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> --- v1->v2: Added Reviewed-by of NeilBrown and CC Andrew. mm/shmem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/shmem.c b/mm/shmem.c index 41b9bbf24e16..8264bbdbb6a5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2226,6 +2226,8 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode mpol_shared_policy_init(&info->policy, NULL); break; } + + lockdep_annotate_inode_mutex_key(inode); } else shmem_free_inode(sb); return inode; -- 2.18.0.1017.ga543ac7ca45-goog

6 years, 11 months

1
0
0 0

[PATCH] mm: shmem: Correctly annotate new inodes

by Joel Fernandes (Google)

Directories and inodes don't necessarily need to be in the same lockdep class. For ex, hugetlbfs splits them out too to prevent false positives in lockdep. Annotate correctly after new inode creation. If its a directory inode, it will be put into a different class. This should fix a lockdep splat reported by syzbot: > ====================================================== > WARNING: possible circular locking dependency detected > 4.18.0-rc8-next-20180810+ #36 Not tainted > ------------------------------------------------------ > syz-executor900/4483 is trying to acquire lock: > 00000000d2bfc8fe (&sb->s_type->i_mutex_key#9){++++}, at: inode_lock > include/linux/fs.h:765 [inline] > 00000000d2bfc8fe (&sb->s_type->i_mutex_key#9){++++}, at: > shmem_fallocate+0x18b/0x12e0 mm/shmem.c:2602 > > but task is already holding lock: > 0000000025208078 (ashmem_mutex){+.+.}, at: ashmem_shrink_scan+0xb4/0x630 > drivers/staging/android/ashmem.c:448 > > which lock already depends on the new lock. > > -> #2 (ashmem_mutex){+.+.}: > __mutex_lock_common kernel/locking/mutex.c:925 [inline] > __mutex_lock+0x171/0x1700 kernel/locking/mutex.c:1073 > mutex_lock_nested+0x16/0x20 kernel/locking/mutex.c:1088 > ashmem_mmap+0x55/0x520 drivers/staging/android/ashmem.c:361 > call_mmap include/linux/fs.h:1844 [inline] > mmap_region+0xf27/0x1c50 mm/mmap.c:1762 > do_mmap+0xa10/0x1220 mm/mmap.c:1535 > do_mmap_pgoff include/linux/mm.h:2298 [inline] > vm_mmap_pgoff+0x213/0x2c0 mm/util.c:357 > ksys_mmap_pgoff+0x4da/0x660 mm/mmap.c:1585 > __do_sys_mmap arch/x86/kernel/sys_x86_64.c:100 [inline] > __se_sys_mmap arch/x86/kernel/sys_x86_64.c:91 [inline] > __x64_sys_mmap+0xe9/0x1b0 arch/x86/kernel/sys_x86_64.c:91 > do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290 > entry_SYSCALL_64_after_hwframe+0x49/0xbe > > -> #1 (&mm->mmap_sem){++++}: > __might_fault+0x155/0x1e0 mm/memory.c:4568 > _copy_to_user+0x30/0x110 lib/usercopy.c:25 > copy_to_user include/linux/uaccess.h:155 [inline] > filldir+0x1ea/0x3a0 fs/readdir.c:196 > dir_emit_dot include/linux/fs.h:3464 [inline] > dir_emit_dots include/linux/fs.h:3475 [inline] > dcache_readdir+0x13a/0x620 fs/libfs.c:193 > iterate_dir+0x48b/0x5d0 fs/readdir.c:51 > __do_sys_getdents fs/readdir.c:231 [inline] > __se_sys_getdents fs/readdir.c:212 [inline] > __x64_sys_getdents+0x29f/0x510 fs/readdir.c:212 > do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290 > entry_SYSCALL_64_after_hwframe+0x49/0xbe > > -> #0 (&sb->s_type->i_mutex_key#9){++++}: > lock_acquire+0x1e4/0x540 kernel/locking/lockdep.c:3924 > down_write+0x8f/0x130 kernel/locking/rwsem.c:70 > inode_lock include/linux/fs.h:765 [inline] > shmem_fallocate+0x18b/0x12e0 mm/shmem.c:2602 > ashmem_shrink_scan+0x236/0x630 drivers/staging/android/ashmem.c:455 > ashmem_ioctl+0x3ae/0x13a0 drivers/staging/android/ashmem.c:797 > vfs_ioctl fs/ioctl.c:46 [inline] > file_ioctl fs/ioctl.c:501 [inline] > do_vfs_ioctl+0x1de/0x1720 fs/ioctl.c:685 > ksys_ioctl+0xa9/0xd0 fs/ioctl.c:702 > __do_sys_ioctl fs/ioctl.c:709 [inline] > __se_sys_ioctl fs/ioctl.c:707 [inline] > __x64_sys_ioctl+0x73/0xb0 fs/ioctl.c:707 > do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290 > entry_SYSCALL_64_after_hwframe+0x49/0xbe > > other info that might help us debug this: > > Chain exists of: > &sb->s_type->i_mutex_key#9 --> &mm->mmap_sem --> ashmem_mutex > > Possible unsafe locking scenario: > > CPU0 CPU1 > ---- ---- > lock(ashmem_mutex); > lock(&mm->mmap_sem); > lock(ashmem_mutex); > lock(&sb->s_type->i_mutex_key#9); > > *** DEADLOCK *** > > 1 lock held by syz-executor900/4483: > #0: 0000000025208078 (ashmem_mutex){+.+.}, at: > ashmem_shrink_scan+0xb4/0x630 drivers/staging/android/ashmem.c:448 Reported-by: syzbot <syzkaller(a)googlegroups.com> Cc: willy(a)infradead.org Cc: stable(a)vger.kernel.org Cc: peterz(a)infradead.org Suggested-by: Neil Brown <neilb(a)suse.com> Signed-off-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> --- mm/shmem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/shmem.c b/mm/shmem.c index 2cab84403055..4429a8fd932d 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2225,6 +2225,8 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode mpol_shared_policy_init(&info->policy, NULL); break; } + + lockdep_annotate_inode_mutex_key(inode); } else shmem_free_inode(sb); return inode; -- 2.18.0.597.ga71716f1ad-goog

6 years, 11 months

2
1
0 0

[PATCH 4.4 00/22] 4.4.151-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.151 release. There are 22 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 Thu Aug 23 05:51:31 UTC 2018. 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.4.151-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.4.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.4.151-rc1 Kees Cook <keescook(a)chromium.org> isdn: Disable IIOCDBGVAR Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> Bluetooth: avoid killing an already killed socket Tom Lendacky <thomas.lendacky(a)amd.com> x86/mm: Simplify p[g4um]d_page() macros Chen Hu <hu1.chen(a)intel.com> serial: 8250_dw: always set baud rate in dw8250_set_termios Willy Tarreau <w(a)1wt.eu> ACPI / PM: save NVS memory for ASUS 1025C laptop Zhang Rui <rui.zhang(a)intel.com> ACPI: save NVS memory for Lenovo G50-45 Aleksander Morgado <aleksander(a)aleksander.es> USB: option: add support for DW5821e John Ogness <john.ogness(a)linutronix.de> USB: serial: sierra: fix potential deadlock at close Takashi Iwai <tiwai(a)suse.de> ALSA: vxpocket: Fix invalid endian conversions Takashi Iwai <tiwai(a)suse.de> ALSA: memalloc: Don't exceed over the requested size Hans de Goede <hdegoede(a)redhat.com> ALSA: hda: Correct Asrock B85M-ITX power_save blacklist entry Takashi Iwai <tiwai(a)suse.de> ALSA: cs5535audio: Fix invalid endian conversion Takashi Iwai <tiwai(a)suse.de> ALSA: virmidi: Fix too long output trigger loop Takashi Iwai <tiwai(a)suse.de> ALSA: vx222: Fix invalid endian conversions Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Turn CX8200 into D3 as well upon reboot Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs Hangbin Liu <liuhangbin(a)gmail.com> net_sched: fix NULL pointer dereference when delete tcindex filter Cong Wang <xiyou.wangcong(a)gmail.com> vsock: split dwork to avoid reinitializations Hangbin Liu <liuhangbin(a)gmail.com> net_sched: Fix missing res info when create new tc_index filter Cong Wang <xiyou.wangcong(a)gmail.com> llc: use refcount_inc_not_zero() for llc_sap_find() Wei Wang <weiwan(a)google.com> l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache Alexey Kodanev <alexey.kodanev(a)oracle.com> dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart() ------------- Diffstat: Makefile | 4 ++-- arch/x86/include/asm/pgtable.h | 13 ++++++++----- drivers/acpi/sleep.c | 27 +++++++++++++++++++++++++++ drivers/isdn/i4l/isdn_common.c | 8 +------- drivers/tty/serial/8250/8250_dw.c | 2 +- drivers/usb/serial/option.c | 4 ++++ drivers/usb/serial/sierra.c | 4 ++-- include/net/af_vsock.h | 4 ++-- include/net/llc.h | 5 +++++ net/bluetooth/sco.c | 3 ++- net/dccp/ccids/ccid2.c | 6 ++++-- net/l2tp/l2tp_core.c | 2 +- net/llc/llc_core.c | 4 ++-- net/sched/cls_tcindex.c | 8 +++----- net/vmw_vsock/af_vsock.c | 15 ++++++++------- net/vmw_vsock/vmci_transport.c | 3 +-- sound/core/memalloc.c | 8 ++------ sound/core/seq/seq_virmidi.c | 10 ++++++++++ sound/pci/cs5535audio/cs5535audio.h | 6 +++--- sound/pci/cs5535audio/cs5535audio_pcm.c | 4 ++-- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/patch_conexant.c | 4 +++- sound/pci/vx222/vx222_ops.c | 8 ++++---- sound/pcmcia/vx/vxp_ops.c | 10 +++++----- 24 files changed, 103 insertions(+), 61 deletions(-)

6 years, 11 months

4
24
0 0

[PATCH 4.9 00/25] 4.9.123-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.123 release. There are 25 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 Thu Aug 23 05:51:15 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.123-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.9.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.9.123-rc1 Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> Bluetooth: avoid killing an already killed socket Tom Lendacky <thomas.lendacky(a)amd.com> x86/mm: Simplify p[g4um]d_page() macros Srinath Mannam <srinath.mannam(a)broadcom.com> serial: 8250_dw: Add ACPI support for uart on Broadcom SoC Chen Hu <hu1.chen(a)intel.com> serial: 8250_dw: always set baud rate in dw8250_set_termios Mark <dmarkh(a)cfl.rr.com> tty: serial: 8250: Revert NXP SC16C2552 workaround Willy Tarreau <w(a)1wt.eu> ACPI / PM: save NVS memory for ASUS 1025C laptop Aleksander Morgado <aleksander(a)aleksander.es> USB: option: add support for DW5821e John Ogness <john.ogness(a)linutronix.de> USB: serial: sierra: fix potential deadlock at close Hangbin Liu <liuhangbin(a)gmail.com> cls_matchall: fix tcf_unbind_filter missing Kees Cook <keescook(a)chromium.org> isdn: Disable IIOCDBGVAR Takashi Iwai <tiwai(a)suse.de> ALSA: vxpocket: Fix invalid endian conversions Takashi Iwai <tiwai(a)suse.de> ALSA: memalloc: Don't exceed over the requested size Hans de Goede <hdegoede(a)redhat.com> ALSA: hda: Correct Asrock B85M-ITX power_save blacklist entry Takashi Iwai <tiwai(a)suse.de> ALSA: cs5535audio: Fix invalid endian conversion Takashi Iwai <tiwai(a)suse.de> ALSA: virmidi: Fix too long output trigger loop Takashi Iwai <tiwai(a)suse.de> ALSA: vx222: Fix invalid endian conversions Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Turn CX8200 into D3 as well upon reboot Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs Hangbin Liu <liuhangbin(a)gmail.com> net_sched: fix NULL pointer dereference when delete tcindex filter Hangbin Liu <liuhangbin(a)gmail.com> net_sched: Fix missing res info when create new tc_index filter Xin Long <lucien.xin(a)gmail.com> ip6_tunnel: use the right value for ipv4 min mtu check in ip6_tnl_xmit Cong Wang <xiyou.wangcong(a)gmail.com> vsock: split dwork to avoid reinitializations Cong Wang <xiyou.wangcong(a)gmail.com> llc: use refcount_inc_not_zero() for llc_sap_find() Wei Wang <weiwan(a)google.com> l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache Alexey Kodanev <alexey.kodanev(a)oracle.com> dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart() ------------- Diffstat: Makefile | 4 ++-- arch/x86/include/asm/pgtable.h | 13 ++++++++----- drivers/acpi/sleep.c | 8 ++++++++ drivers/isdn/i4l/isdn_common.c | 8 +------- drivers/tty/serial/8250/8250_dw.c | 3 ++- drivers/tty/serial/8250/8250_port.c | 3 +-- drivers/usb/serial/option.c | 4 ++++ drivers/usb/serial/sierra.c | 4 ++-- include/net/af_vsock.h | 4 ++-- include/net/llc.h | 5 +++++ net/bluetooth/sco.c | 3 ++- net/dccp/ccids/ccid2.c | 6 ++++-- net/ipv6/ip6_tunnel.c | 8 ++------ net/l2tp/l2tp_core.c | 2 +- net/llc/llc_core.c | 4 ++-- net/sched/cls_matchall.c | 2 ++ net/sched/cls_tcindex.c | 8 +++----- net/vmw_vsock/af_vsock.c | 15 ++++++++------- net/vmw_vsock/vmci_transport.c | 3 +-- sound/core/memalloc.c | 8 ++------ sound/core/seq/seq_virmidi.c | 10 ++++++++++ sound/pci/cs5535audio/cs5535audio.h | 6 +++--- sound/pci/cs5535audio/cs5535audio_pcm.c | 4 ++-- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/patch_conexant.c | 4 +++- sound/pci/vx222/vx222_ops.c | 8 ++++---- sound/pcmcia/vx/vxp_ops.c | 10 +++++----- 27 files changed, 90 insertions(+), 69 deletions(-)

6 years, 11 months

5
29
0 0

[BUG] madvise05 leads kernel panic on 4.9.122

by Yang Shi

Hi folks, I just ran some regression test on stable 4.9.122 with LTP. madvise05 triggers the below kernel panic: [ 6785.089994] BUG: unable to handle kernel paging request at ffffeaff44488020 [ 6785.097952] IP: [] page_remove_rmap+0x27/0x580 [ 6785.104810] PGD 0 [ 6785.106859] [ 6785.108526] Oops: 0000 [#1] SMP [ 6785.112029] Modules linked in: mptctl(E) mptbase(E) tun(E) fuse(E) vfat(E) fat(E) btrfs(E) xor(E) raid6_pq(E) xfs(E) [ 6785.123905] CPU: 14 PID: 77983 Comm: madvise05 Tainted: G E 4.9.122-001.ali3000_nightly_cov_20180820_193.test.alios7.x86_64 #1 [ 6785.137880] Hardware name: Dell Inc. PowerEdge R720xd/0X6FFV, BIOS 1.3.6 09/11/2012 [ 6785.146425] task: ffff882daeb78000 task.stack: ffffc9001b438000 [ 6785.153031] RIP: 0010:[] [] page_remove_rmap+0x27/0x580 [ 6785.162461] RSP: 0018:ffffc9001b43bc50 EFLAGS: 00010246 [ 6785.168388] RAX: 0000000000000000 RBX: ffffeaff44488000 RCX: 0000000000000080 [ 6785.176351] RDX: ffffeaff44488000 RSI: 0000000000000001 RDI: ffffeaff44488000 [ 6785.184315] RBP: ffffc9001b43bc80 R08: ffff882f9d4a6540 R09: ffffffff84bcdf60 [ 6785.192277] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000001 [ 6785.200241] R13: ffff882db6996910 R14: ffffea00b6da65b0 R15: 00003fffffe00000 [ 6785.208205] FS: 00002ae5a3dfbb80(0000) GS:ffff882fbf180000(0000) knlGS:0000000000000000 [ 6785.217234] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 6785.223646] CR2: ffffeaff44488020 CR3: 0000002f9d51c000 CR4: 00000000000606f0 [ 6785.231610] Stack: [ 6785.233851] 0000000000000000 00003ffffd6b3320 0434f9415ac47f2c ffffeaff44488000 [ 6785.242143] ffffc9001b43bdd8 ffff882db6996910 ffffc9001b43bcc0 ffffffff81355aaa [ 6785.250438] ffff882f9d4a6540 00002ae5a4400000 00002ae5a4600000 ffffffff84bcd7a0 [ 6785.258728] Call Trace: [ 6785.261460] [] zap_huge_pmd+0x28a/0x640 [ 6785.267585] [] unmap_page_range+0x532/0x630 [ 6785.274087] [] unmap_single_vma+0xa9/0x160 [ 6785.280501] [] unmap_vmas+0x5f/0xe0 [ 6785.286236] [] unmap_region+0xe4/0x1e0 [ 6785.292263] [] ? blk_finish_plug+0x3c/0x60 [ 6785.298669] [] ? SYSC_madvise+0x69b/0xed0 [ 6785.304985] [] do_munmap+0x39b/0x5b0 [ 6785.310818] [] SyS_munmap+0x78/0xb0 [ 6785.316552] [] do_syscall_64+0xf4/0x350 [ 6785.322676] [] entry_SYSCALL_64_after_swapgs+0x58/0xca [ 6785.330244] Code: 00 00 00 00 66 66 66 66 90 55 <48> 8b 57 20 48 89 f8 f6 c2 01 0f [ 6785.339011] RIP [] page_remove_rmap+0x27/0x580 [ 6785.345825] RSP [ 6785.349715] CR2: ffffeaff44488020 The same test case works well on both 4.9.119 and the latest Linus's tree. So, it looks it is caused by the L1TF patches on the stable tree. And, the madvise05 test case can be simplified to the below test program: #include <sys/mman.h> #include <stdio.h> void main() { void *addr; int err; addr = mmap(NULL, 32 * 1024 * 1024, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0); if (addr == MAP_FAILED) { printf("mmap failed\n"); return; } err = mprotect(addr, 32 * 1024 * 1024, PROT_NONE); if (err < 0) { printf("mprotect failed\n"); return; } munmap(addr, 32 * 1024 * 1024); } You may be already aware of this problem or any hint is appreciated. Thanks, Yang

6 years, 11 months

3
4
0 0

[PATCH v2] staging: android: ion: check for kref overflow

by Daniel Rosenberg

Userspace can cause the kref to handles to increment arbitrarily high. Ensure it does not overflow. Signed-off-by: Daniel Rosenberg <drosen(a)google.com> --- v2: Fixed patch corruption :( This patch is against 4.4. It does not apply to master due to a large rework of ion in 4.12 which removed the affected functions altogther. 4c23cbff073f3b9b ("staging: android: ion: Remove import interface") It applies from 3.18 to 4.11, although with a trivial conflict resolution for the later branches. drivers/staging/android/ion/ion.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 374f840f31a48..47cb163da9a07 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -15,6 +15,7 @@ * */ +#include <linux/atomic.h> #include <linux/device.h> #include <linux/err.h> #include <linux/file.h> @@ -387,6 +388,16 @@ static void ion_handle_get(struct ion_handle *handle) kref_get(&handle->ref); } +/* Must hold the client lock */ +static struct ion_handle *ion_handle_get_check_overflow( + struct ion_handle *handle) +{ + if (atomic_read(&handle->ref.refcount) + 1 == 0) + return ERR_PTR(-EOVERFLOW); + ion_handle_get(handle); + return handle; +} + static int ion_handle_put_nolock(struct ion_handle *handle) { int ret; @@ -433,9 +444,9 @@ static struct ion_handle *ion_handle_get_by_id_nolock(struct ion_client *client, handle = idr_find(&client->idr, id); if (handle) - ion_handle_get(handle); + return ion_handle_get_check_overflow(handle); - return handle ? handle : ERR_PTR(-EINVAL); + return ERR_PTR(-EINVAL); } struct ion_handle *ion_handle_get_by_id(struct ion_client *client, @@ -1202,7 +1213,7 @@ struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd) /* if a handle exists for this buffer just take a reference to it */ handle = ion_handle_lookup(client, buffer); if (!IS_ERR(handle)) { - ion_handle_get(handle); + handle = ion_handle_get_check_overflow(handle); mutex_unlock(&client->lock); goto end; } -- 2.18.0.865.gffc8e1a3cd6-goog

6 years, 11 months

1
0
0 0

[PATCH 4.18 00/35] 4.18.4-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.18.4 release. There are 35 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 Thu Aug 23 05:50:07 UTC 2018. 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.18.4-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.18.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.18.4-rc1 Hangbin Liu <liuhangbin(a)gmail.com> cls_matchall: fix tcf_unbind_filter missing Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> net: mvneta: fix mvneta_config_rss on armada 3700 Andrew Lunn <andrew(a)lunn.ch> net: ethernet: mvneta: Fix napi structure mixup on armada 3700 Haishuang Yan <yanhaishuang(a)cmss.chinamobile.com> ip_vti: fix a null pointer deferrence when create vti fallback tunnel Jian-Hong Pan <jian-hong(a)endlessm.com> r8169: don't use MSI-X on RTL8106e Takashi Iwai <tiwai(a)suse.de> hv/netvsc: Fix NULL dereference at single queue mode fallback Jeremy Cline <jcline(a)redhat.com> net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd() Kees Cook <keescook(a)chromium.org> isdn: Disable IIOCDBGVAR Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> Bluetooth: avoid killing an already killed socket Xiubo Li <xiubli(a)redhat.com> Revert "uio: use request_threaded_irq instead" Johan Hovold <johan(a)kernel.org> misc: sram: fix resource leaks in probe error path Hailong Liu <liu.hailong6(a)zte.com.cn> uio: fix wrong return value from uio_mmap() Srinath Mannam <srinath.mannam(a)broadcom.com> serial: 8250_dw: Add ACPI support for uart on Broadcom SoC Chen Hu <hu1.chen(a)intel.com> serial: 8250_dw: always set baud rate in dw8250_set_termios Aaron Sierra <asierra(a)xes-inc.com> serial: 8250_exar: Read INT0 from slave device, too Mark <dmarkh(a)cfl.rr.com> tty: serial: 8250: Revert NXP SC16C2552 workaround Willy Tarreau <w(a)1wt.eu> ACPI / PM: save NVS memory for ASUS 1025C laptop Aleksander Morgado <aleksander(a)aleksander.es> USB: option: add support for DW5821e Movie Song <MovieSong(a)aten-itlab.cn> USB: serial: pl2303: add a new device id for ATEN John Ogness <john.ogness(a)linutronix.de> USB: serial: sierra: fix potential deadlock at close Mika Båtsman <mika.batsman(a)gmail.com> media: gl861: fix probe of dvb_usb_gl861 Takashi Iwai <tiwai(a)suse.de> ALSA: seq: Fix poll() error return Takashi Iwai <tiwai(a)suse.de> ALSA: vxpocket: Fix invalid endian conversions Takashi Iwai <tiwai(a)suse.de> ALSA: memalloc: Don't exceed over the requested size Hans de Goede <hdegoede(a)redhat.com> ALSA: hda: Correct Asrock B85M-ITX power_save blacklist entry Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: dice: fix wrong copy to rx parameters for Alesis iO26 Takashi Iwai <tiwai(a)suse.de> ALSA: cs5535audio: Fix invalid endian conversion Takashi Iwai <tiwai(a)suse.de> ALSA: virmidi: Fix too long output trigger loop Takashi Iwai <tiwai(a)suse.de> ALSA: vx222: Fix invalid endian conversions Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Turn CX8200 into D3 as well upon reboot Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs Heiner Kallweit <hkallweit1(a)gmail.com> r8169: don't use MSI-X on RTL8168g Hangbin Liu <liuhangbin(a)gmail.com> net_sched: Fix missing res info when create new tc_index filter Hangbin Liu <liuhangbin(a)gmail.com> net_sched: fix NULL pointer dereference when delete tcindex filter Wei Wang <weiwan(a)google.com> l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache ------------- Diffstat: Makefile | 4 +-- drivers/acpi/sleep.c | 8 +++++ drivers/isdn/i4l/isdn_common.c | 8 +---- drivers/media/usb/dvb-usb-v2/gl861.c | 21 +++++++------ drivers/misc/sram.c | 9 +++++- drivers/net/ethernet/marvell/mvneta.c | 53 ++++++++++++++++++++------------- drivers/net/ethernet/realtek/r8169.c | 12 ++++++-- drivers/net/hyperv/rndis_filter.c | 2 +- drivers/tty/serial/8250/8250_dw.c | 3 +- drivers/tty/serial/8250/8250_exar.c | 6 +++- drivers/tty/serial/8250/8250_port.c | 3 +- drivers/uio/uio.c | 10 ++----- drivers/usb/serial/option.c | 4 +++ drivers/usb/serial/pl2303.c | 2 ++ drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/sierra.c | 4 +-- net/bluetooth/sco.c | 3 +- net/core/sock_diag.c | 2 ++ net/ipv4/ip_vti.c | 3 +- net/l2tp/l2tp_core.c | 2 +- net/sched/cls_matchall.c | 2 ++ net/sched/cls_tcindex.c | 8 ++--- net/socket.c | 3 +- sound/core/memalloc.c | 8 ++--- sound/core/seq/oss/seq_oss.c | 2 +- sound/core/seq/seq_clientmgr.c | 2 +- sound/core/seq/seq_virmidi.c | 10 +++++++ sound/firewire/dice/dice-alesis.c | 2 +- sound/pci/cs5535audio/cs5535audio.h | 6 ++-- sound/pci/cs5535audio/cs5535audio_pcm.c | 4 +-- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/patch_conexant.c | 4 ++- sound/pci/vx222/vx222_ops.c | 8 ++--- sound/pcmcia/vx/vxp_ops.c | 10 +++---- 34 files changed, 138 insertions(+), 93 deletions(-)

6 years, 11 months

4
40
0 0

[PATCH 4.14 00/29] 4.14.66-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.66 release. There are 29 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 Thu Aug 23 05:50:58 UTC 2018. 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.66-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.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.66-rc1 Hangbin Liu <liuhangbin(a)gmail.com> cls_matchall: fix tcf_unbind_filter missing Kees Cook <keescook(a)chromium.org> isdn: Disable IIOCDBGVAR Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> Bluetooth: avoid killing an already killed socket Johan Hovold <johan(a)kernel.org> misc: sram: fix resource leaks in probe error path Srinath Mannam <srinath.mannam(a)broadcom.com> serial: 8250_dw: Add ACPI support for uart on Broadcom SoC Chen Hu <hu1.chen(a)intel.com> serial: 8250_dw: always set baud rate in dw8250_set_termios Aaron Sierra <asierra(a)xes-inc.com> serial: 8250_exar: Read INT0 from slave device, too Mark <dmarkh(a)cfl.rr.com> tty: serial: 8250: Revert NXP SC16C2552 workaround Willy Tarreau <w(a)1wt.eu> ACPI / PM: save NVS memory for ASUS 1025C laptop Aleksander Morgado <aleksander(a)aleksander.es> USB: option: add support for DW5821e Movie Song <MovieSong(a)aten-itlab.cn> USB: serial: pl2303: add a new device id for ATEN John Ogness <john.ogness(a)linutronix.de> USB: serial: sierra: fix potential deadlock at close Takashi Iwai <tiwai(a)suse.de> ALSA: vxpocket: Fix invalid endian conversions Takashi Iwai <tiwai(a)suse.de> ALSA: memalloc: Don't exceed over the requested size Hans de Goede <hdegoede(a)redhat.com> ALSA: hda: Correct Asrock B85M-ITX power_save blacklist entry Takashi Iwai <tiwai(a)suse.de> ALSA: cs5535audio: Fix invalid endian conversion Takashi Iwai <tiwai(a)suse.de> ALSA: virmidi: Fix too long output trigger loop Takashi Iwai <tiwai(a)suse.de> ALSA: vx222: Fix invalid endian conversions Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Turn CX8200 into D3 as well upon reboot Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs Dmitry Bogdanov <dmitry.bogdanov(a)aquantia.com> net: aquantia: Fix IFF_ALLMULTI flag functionality Xin Long <lucien.xin(a)gmail.com> ip6_tunnel: use the right value for ipv4 min mtu check in ip6_tnl_xmit Jason Wang <jasowang(a)redhat.com> vhost: reset metadata cache when initializing new IOTLB Hangbin Liu <liuhangbin(a)gmail.com> net_sched: Fix missing res info when create new tc_index filter Cong Wang <xiyou.wangcong(a)gmail.com> vsock: split dwork to avoid reinitializations Hangbin Liu <liuhangbin(a)gmail.com> net_sched: fix NULL pointer dereference when delete tcindex filter Cong Wang <xiyou.wangcong(a)gmail.com> llc: use refcount_inc_not_zero() for llc_sap_find() Wei Wang <weiwan(a)google.com> l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache Alexey Kodanev <alexey.kodanev(a)oracle.com> dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart() ------------- Diffstat: Makefile | 4 ++-- drivers/acpi/sleep.c | 8 ++++++++ drivers/isdn/i4l/isdn_common.c | 8 +------- drivers/misc/sram.c | 9 ++++++++- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +- drivers/tty/serial/8250/8250_dw.c | 3 ++- drivers/tty/serial/8250/8250_exar.c | 6 +++++- drivers/tty/serial/8250/8250_port.c | 3 +-- drivers/usb/serial/option.c | 4 ++++ drivers/usb/serial/pl2303.c | 2 ++ drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/sierra.c | 4 ++-- drivers/vhost/vhost.c | 9 ++++++--- include/net/af_vsock.h | 4 ++-- include/net/llc.h | 5 +++++ net/bluetooth/sco.c | 3 ++- net/dccp/ccids/ccid2.c | 6 ++++-- net/ipv6/ip6_tunnel.c | 8 ++------ net/l2tp/l2tp_core.c | 2 +- net/llc/llc_core.c | 4 ++-- net/sched/cls_matchall.c | 2 ++ net/sched/cls_tcindex.c | 8 +++----- net/vmw_vsock/af_vsock.c | 15 ++++++++------- net/vmw_vsock/vmci_transport.c | 3 +-- sound/core/memalloc.c | 8 ++------ sound/core/seq/seq_virmidi.c | 10 ++++++++++ sound/pci/cs5535audio/cs5535audio.h | 6 +++--- sound/pci/cs5535audio/cs5535audio_pcm.c | 4 ++-- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/patch_conexant.c | 4 +++- sound/pci/vx222/vx222_ops.c | 8 ++++---- sound/pcmcia/vx/vxp_ops.c | 10 +++++----- 32 files changed, 105 insertions(+), 70 deletions(-)

6 years, 11 months

4
32
0 0

[PATCH 4.17 00/42] 4.17.18-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.17.18 release. There are 42 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 Thu Aug 23 05:50:04 UTC 2018. 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.17.18-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.17.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.17.18-rc1 Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> net: mvneta: fix mvneta_config_rss on armada 3700 Andrew Lunn <andrew(a)lunn.ch> net: ethernet: mvneta: Fix napi structure mixup on armada 3700 Hangbin Liu <liuhangbin(a)gmail.com> cls_matchall: fix tcf_unbind_filter missing Haishuang Yan <yanhaishuang(a)cmss.chinamobile.com> ip_vti: fix a null pointer deferrence when create vti fallback tunnel Jian-Hong Pan <jian-hong(a)endlessm.com> r8169: don't use MSI-X on RTL8106e Jeremy Cline <jcline(a)redhat.com> net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd() Kees Cook <keescook(a)chromium.org> isdn: Disable IIOCDBGVAR Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> Bluetooth: avoid killing an already killed socket Johan Hovold <johan(a)kernel.org> misc: sram: fix resource leaks in probe error path Srinath Mannam <srinath.mannam(a)broadcom.com> serial: 8250_dw: Add ACPI support for uart on Broadcom SoC Chen Hu <hu1.chen(a)intel.com> serial: 8250_dw: always set baud rate in dw8250_set_termios Aaron Sierra <asierra(a)xes-inc.com> serial: 8250_exar: Read INT0 from slave device, too Mark <dmarkh(a)cfl.rr.com> tty: serial: 8250: Revert NXP SC16C2552 workaround Willy Tarreau <w(a)1wt.eu> ACPI / PM: save NVS memory for ASUS 1025C laptop Aleksander Morgado <aleksander(a)aleksander.es> USB: option: add support for DW5821e Movie Song <MovieSong(a)aten-itlab.cn> USB: serial: pl2303: add a new device id for ATEN John Ogness <john.ogness(a)linutronix.de> USB: serial: sierra: fix potential deadlock at close Takashi Iwai <tiwai(a)suse.de> ALSA: seq: Fix poll() error return Takashi Iwai <tiwai(a)suse.de> ALSA: vxpocket: Fix invalid endian conversions Takashi Iwai <tiwai(a)suse.de> ALSA: memalloc: Don't exceed over the requested size Hans de Goede <hdegoede(a)redhat.com> ALSA: hda: Correct Asrock B85M-ITX power_save blacklist entry Takashi Iwai <tiwai(a)suse.de> ALSA: cs5535audio: Fix invalid endian conversion Takashi Iwai <tiwai(a)suse.de> ALSA: virmidi: Fix too long output trigger loop Takashi Iwai <tiwai(a)suse.de> ALSA: vx222: Fix invalid endian conversions Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Turn CX8200 into D3 as well upon reboot Park Ju Hyung <qkrwngud825(a)gmail.com> ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs David Howells <dhowells(a)redhat.com> rxrpc: Fix the keepalive generator [ver #2] Heiner Kallweit <hkallweit1(a)gmail.com> r8169: don't use MSI-X on RTL8168g Or Gerlitz <ogerlitz(a)mellanox.com> net/mlx5e: Properly check if hairpin is possible between two functions Nir Dotan <nird(a)mellanox.com> mlxsw: core_acl_flex_actions: Remove redundant mirror resource destruction Nir Dotan <nird(a)mellanox.com> mlxsw: core_acl_flex_actions: Remove redundant counter destruction Nir Dotan <nird(a)mellanox.com> mlxsw: core_acl_flex_actions: Remove redundant resource destruction Xin Long <lucien.xin(a)gmail.com> ip6_tunnel: use the right value for ipv4 min mtu check in ip6_tnl_xmit Dmitry Bogdanov <dmitry.bogdanov(a)aquantia.com> net: aquantia: Fix IFF_ALLMULTI flag functionality Nir Dotan <nird(a)mellanox.com> mlxsw: core_acl_flex_actions: Return error for conflicting actions Jason Wang <jasowang(a)redhat.com> vhost: reset metadata cache when initializing new IOTLB Hangbin Liu <liuhangbin(a)gmail.com> net_sched: Fix missing res info when create new tc_index filter Cong Wang <xiyou.wangcong(a)gmail.com> vsock: split dwork to avoid reinitializations Hangbin Liu <liuhangbin(a)gmail.com> net_sched: fix NULL pointer dereference when delete tcindex filter Cong Wang <xiyou.wangcong(a)gmail.com> llc: use refcount_inc_not_zero() for llc_sap_find() Wei Wang <weiwan(a)google.com> l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache Alexey Kodanev <alexey.kodanev(a)oracle.com> dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart() ------------- Diffstat: Makefile | 4 +- drivers/acpi/sleep.c | 8 ++ drivers/isdn/i4l/isdn_common.c | 8 +- drivers/misc/sram.c | 9 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +- drivers/net/ethernet/marvell/mvneta.c | 53 ++++--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 +- .../mellanox/mlxsw/core_acl_flex_actions.c | 51 ++++--- drivers/net/ethernet/realtek/r8169.c | 12 +- drivers/tty/serial/8250/8250_dw.c | 3 +- drivers/tty/serial/8250/8250_exar.c | 6 +- drivers/tty/serial/8250/8250_port.c | 3 +- drivers/usb/serial/option.c | 4 + drivers/usb/serial/pl2303.c | 2 + drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/sierra.c | 4 +- drivers/vhost/vhost.c | 9 +- include/net/af_vsock.h | 4 +- include/net/llc.h | 5 + net/bluetooth/sco.c | 3 +- net/core/sock_diag.c | 2 + net/dccp/ccids/ccid2.c | 6 +- net/ipv4/ip_vti.c | 3 +- net/ipv6/ip6_tunnel.c | 8 +- net/l2tp/l2tp_core.c | 2 +- net/llc/llc_core.c | 4 +- net/rxrpc/ar-internal.h | 8 +- net/rxrpc/conn_event.c | 4 +- net/rxrpc/net_ns.c | 6 +- net/rxrpc/output.c | 12 +- net/rxrpc/peer_event.c | 156 ++++++++++++--------- net/rxrpc/peer_object.c | 8 +- net/rxrpc/rxkad.c | 4 +- net/sched/cls_matchall.c | 2 + net/sched/cls_tcindex.c | 8 +- net/socket.c | 3 +- net/vmw_vsock/af_vsock.c | 15 +- net/vmw_vsock/vmci_transport.c | 3 +- sound/core/memalloc.c | 8 +- sound/core/seq/oss/seq_oss.c | 2 +- sound/core/seq/seq_clientmgr.c | 2 +- sound/core/seq/seq_virmidi.c | 10 ++ sound/pci/cs5535audio/cs5535audio.h | 6 +- sound/pci/cs5535audio/cs5535audio_pcm.c | 4 +- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/patch_conexant.c | 4 +- sound/pci/vx222/vx222_ops.c | 8 +- sound/pcmcia/vx/vxp_ops.c | 10 +- 48 files changed, 296 insertions(+), 213 deletions(-)

6 years, 11 months

4
45
0 0

[PATCH] MIPS: lib: Provide MIPS64r6 __multi3() for GCC < 7

by Paul Burton

Some versions of GCC suboptimally generate calls to the __multi3() intrinsic for MIPS64r6 builds, resulting in link failures due to the missing function: LD vmlinux.o MODPOST vmlinux.o kernel/bpf/verifier.o: In function `kmalloc_array': include/linux/slab.h:631: undefined reference to `__multi3' fs/select.o: In function `kmalloc_array': include/linux/slab.h:631: undefined reference to `__multi3' ... We already have a workaround for this in which we provide the instrinsic, but we do so selectively for GCC 7 only. Unfortunately the issue occurs with older GCC versions too - it has been observed with both GCC 5.4.0 & GCC 6.4.0. MIPSr6 support was introduced in GCC 5, so all major GCC versions prior to GCC 8 are affected and we extend our workaround accordingly to all MIPS64r6 builds using GCC versions older than GCC 8. Signed-off-by: Paul Burton <paul.burton(a)mips.com> Reported-by: Vladimir Kondratiev <vladimir.kondratiev(a)intel.com> Fixes: ebabcf17bcd7 ("MIPS: Implement __multi3 for GCC7 MIPS64r6 builds") Cc: James Hogan <jhogan(a)kernel.org> Cc: Ralf Baechle <ralf(a)linux-mips.org> Cc: linux-mips(a)linux-mips.org Cc: stable(a)vger.kernel.org # 4.15+ --- arch/mips/lib/multi3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/lib/multi3.c b/arch/mips/lib/multi3.c index 111ad475aa0c..4c2483f410c2 100644 --- a/arch/mips/lib/multi3.c +++ b/arch/mips/lib/multi3.c @@ -4,12 +4,12 @@ #include "libgcc.h" /* - * GCC 7 suboptimally generates __multi3 calls for mips64r6, so for that - * specific case only we'll implement it here. + * GCC 7 & older can suboptimally generate __multi3 calls for mips64r6, so for + * that specific case only we implement that intrinsic here. * * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82981 */ -#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPSR6) && (__GNUC__ == 7) +#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPSR6) && (__GNUC__ < 8) /* multiply 64-bit values, low 64-bits returned */ static inline long long notrace dmulu(long long a, long long b) -- 2.18.0

6 years, 11 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror