1. 27 May, 2020 27 commits
    • Thomas Gleixner's avatar
      x86/apic: Move TSC deadline timer debug printk · 3c525647
      Thomas Gleixner authored
      [ Upstream commit c84cb373 ]
      
      Leon reported that the printk_once() in __setup_APIC_LVTT() triggers a
      lockdep splat due to a lock order violation between hrtimer_base::lock and
      console_sem, when the 'once' condition is reset via
      /sys/kernel/debug/clear_warn_once after boot.
      
      The initial printk cannot trigger this because that happens during boot
      when the local APIC timer is set up on the boot CPU.
      
      Prevent it by moving the printk to a place which is guaranteed to be only
      called once during boot.
      
      Mark the deadline timer check related functions and data __init while at
      it.
      Reported-by: default avatarLeon Romanovsky <leon@kernel.org>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Link: https://lkml.kernel.org/r/87y2qhoshi.fsf@nanos.tec.linutronix.deSigned-off-by: default avatarSasha Levin <sashal@kernel.org>
      3c525647
    • Daniel Playfair Cal's avatar
      HID: i2c-hid: reset Synaptics SYNA2393 on resume · 467926e4
      Daniel Playfair Cal authored
      [ Upstream commit 538f6740 ]
      
      On the Dell XPS 9570, the Synaptics SYNA2393 touchpad generates spurious
      interrupts after resuming from suspend until it receives some input or
      is reset. Add it to the quirk I2C_HID_QUIRK_RESET_ON_RESUME so that it
      is reset when resuming from suspend.
      
      More information about the bug can be found in this mailing list
      discussion: https://www.spinics.net/lists/linux-input/msg59530.htmlSigned-off-by: default avatarDaniel Playfair Cal <daniel.playfair.cal@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      467926e4
    • Tyrel Datwyler's avatar
      scsi: ibmvscsi: Fix WARN_ON during event pool release · 62fe53c2
      Tyrel Datwyler authored
      [ Upstream commit b3652215 ]
      
      While removing an ibmvscsi client adapter a WARN_ON like the following is
      seen in the kernel log:
      
      drmgr: drmgr: -r -c slot -s U9080.M9S.783AEC8-V11-C11 -w 5 -d 1
      WARNING: CPU: 9 PID: 24062 at ../kernel/dma/mapping.c:311 dma_free_attrs+0x78/0x110
      Supported: No, Unreleased kernel
      CPU: 9 PID: 24062 Comm: drmgr Kdump: loaded Tainted: G               X 5.3.18-12-default
      NIP:  c0000000001fa758 LR: c0000000001fa744 CTR: c0000000001fa6e0
      REGS: c0000002173375d0 TRAP: 0700   Tainted: G               X (5.3.18-12-default)
      MSR:  8000000000029033 <SF,EE,ME,IR,DR,RI,LE>  CR: 28088282  XER: 20000000
      CFAR: c0000000001fbf0c IRQMASK: 1
      GPR00: c0000000001fa744 c000000217337860 c00000000161ab00 0000000000000000
      GPR04: 0000000000000000 c000011e12250000 0000000018010000 0000000000000000
      GPR08: 0000000000000000 0000000000000001 0000000000000001 c0080000190f4fa8
      GPR12: c0000000001fa6e0 c000000007fc2a00 0000000000000000 0000000000000000
      GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
      GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
      GPR24: 000000011420e310 0000000000000000 0000000000000000 0000000018010000
      GPR28: c00000000159de50 c000011e12250000 0000000000006600 c000011e5c994848
      NIP [c0000000001fa758] dma_free_attrs+0x78/0x110
      LR [c0000000001fa744] dma_free_attrs+0x64/0x110
      Call Trace:
      [c000000217337860] [000000011420e310] 0x11420e310 (unreliable)
      [c0000002173378b0] [c0080000190f0280] release_event_pool+0xd8/0x120 [ibmvscsi]
      [c000000217337930] [c0080000190f3f74] ibmvscsi_remove+0x6c/0x160 [ibmvscsi]
      [c000000217337960] [c0000000000f3cac] vio_bus_remove+0x5c/0x100
      [c0000002173379a0] [c00000000087a0a4] device_release_driver_internal+0x154/0x280
      [c0000002173379e0] [c0000000008777cc] bus_remove_device+0x11c/0x220
      [c000000217337a60] [c000000000870fc4] device_del+0x1c4/0x470
      [c000000217337b10] [c0000000008712a0] device_unregister+0x30/0xa0
      [c000000217337b80] [c0000000000f39ec] vio_unregister_device+0x2c/0x60
      [c000000217337bb0] [c00800001a1d0964] dlpar_remove_slot+0x14c/0x250 [rpadlpar_io]
      [c000000217337c50] [c00800001a1d0bcc] remove_slot_store+0xa4/0x110 [rpadlpar_io]
      [c000000217337cd0] [c000000000c091a0] kobj_attr_store+0x30/0x50
      [c000000217337cf0] [c00000000057c934] sysfs_kf_write+0x64/0x90
      [c000000217337d10] [c00000000057be10] kernfs_fop_write+0x1b0/0x290
      [c000000217337d60] [c000000000488c4c] __vfs_write+0x3c/0x70
      [c000000217337d80] [c00000000048c648] vfs_write+0xd8/0x260
      [c000000217337dd0] [c00000000048ca8c] ksys_write+0xdc/0x130
      [c000000217337e20] [c00000000000b488] system_call+0x5c/0x70
      Instruction dump:
      7c840074 f8010010 f821ffb1 20840040 eb830218 7c8407b4 48002019 60000000
      2fa30000 409e003c 892d0988 792907e0 <0b090000> 2fbd0000 419e0028 2fbc0000
      ---[ end trace 5955b3c0cc079942 ]---
      rpadlpar_io: slot U9080.M9S.783AEC8-V11-C11 removed
      
      This is tripped as a result of irqs being disabled during the call to
      dma_free_coherent() by release_event_pool(). At this point in the code path
      we have quiesced the adapter and it is overly paranoid to be holding the
      host lock.
      
      [mkp: fixed build warning reported by sfr]
      
      Link: https://lore.kernel.org/r/1588027793-17952-1-git-send-email-tyreld@linux.ibm.comSigned-off-by: default avatarTyrel Datwyler <tyreld@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      62fe53c2
    • James Hilliard's avatar
      component: Silence bind error on -EPROBE_DEFER · f8dacda9
      James Hilliard authored
      [ Upstream commit 7706b0a7 ]
      
      If a component fails to bind due to -EPROBE_DEFER we should not log an
      error as this is not a real failure.
      
      Fixes messages like:
      vc4-drm soc:gpu: failed to bind 3f902000.hdmi (ops vc4_hdmi_ops): -517
      vc4-drm soc:gpu: master bind failed: -517
      Signed-off-by: default avatarJames Hilliard <james.hilliard1@gmail.com>
      Link: https://lore.kernel.org/r/20200411190241.89404-1-james.hilliard1@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      f8dacda9
    • Richard Clark's avatar
      aquantia: Fix the media type of AQC100 ethernet controller in the driver · 297a69f4
      Richard Clark authored
      [ Upstream commit 6de556c3 ]
      
      The Aquantia AQC100 controller enables a SFP+ port, so the driver should
      configure the media type as '_TYPE_FIBRE' instead of '_TYPE_TP'.
      Signed-off-by: default avatarRichard Clark <richard.xnu.clark@gmail.com>
      Cc: Igor Russkikh <irusskikh@marvell.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Acked-by: default avatarIgor Russkikh <irusskikh@marvell.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      297a69f4
    • Stefano Garzarella's avatar
      vhost/vsock: fix packet delivery order to monitoring devices · b6067828
      Stefano Garzarella authored
      [ Upstream commit 107bc076 ]
      
      We want to deliver packets to monitoring devices before it is
      put in the virtqueue, to avoid that replies can appear in the
      packet capture before the transmitted packet.
      Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      b6067828
    • Xiyu Yang's avatar
      configfs: fix config_item refcnt leak in configfs_rmdir() · 96fc3559
      Xiyu Yang authored
      [ Upstream commit 8aebfffa ]
      
      configfs_rmdir() invokes configfs_get_config_item(), which returns a
      reference of the specified config_item object to "parent_item" with
      increased refcnt.
      
      When configfs_rmdir() returns, local variable "parent_item" becomes
      invalid, so the refcount should be decreased to keep refcount balanced.
      
      The reference counting issue happens in one exception handling path of
      configfs_rmdir(). When down_write_killable() fails, the function forgets
      to decrease the refcnt increased by configfs_get_config_item(), causing
      a refcnt leak.
      
      Fix this issue by calling config_item_put() when down_write_killable()
      fails.
      Signed-off-by: default avatarXiyu Yang <xiyuyang19@fudan.edu.cn>
      Signed-off-by: default avatarXin Tan <tanxin.ctf@gmail.com>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      96fc3559
    • Quinn Tran's avatar
      scsi: qla2xxx: Delete all sessions before unregister local nvme port · 19bba553
      Quinn Tran authored
      [ Upstream commit c48f849d ]
      
      Delete all sessions before unregistering local nvme port.  This allows nvme
      layer to decrement all active rport count down to zero.  Once the count is
      down to zero, nvme would call qla to continue with the npiv port deletion.
      
      PID: 27448  TASK: ffff9e34b777c1c0  CPU: 0   COMMAND: "qaucli"
       0 [ffff9e25e84abbd8] __schedule at ffffffff977858ca
       1 [ffff9e25e84abc68] schedule at ffffffff97785d79
       2 [ffff9e25e84abc78] schedule_timeout at ffffffff97783881
       3 [ffff9e25e84abd28] wait_for_completion at ffffffff9778612d
       4 [ffff9e25e84abd88] qla_nvme_delete at ffffffffc0e3024e [qla2xxx]
       5 [ffff9e25e84abda8] qla24xx_vport_delete at ffffffffc0e024b9 [qla2xxx]
       6 [ffff9e25e84abdf0] fc_vport_terminate at ffffffffc011c247 [scsi_transport_fc]
       7 [ffff9e25e84abe28] store_fc_host_vport_delete at ffffffffc011cd94 [scsi_transport_fc]
       8 [ffff9e25e84abe70] dev_attr_store at ffffffff974b376b
       9 [ffff9e25e84abe80] sysfs_kf_write at ffffffff972d9a92
      10 [ffff9e25e84abe90] kernfs_fop_write at ffffffff972d907b
      11 [ffff9e25e84abec8] vfs_write at ffffffff9724c790
      12 [ffff9e25e84abf08] sys_write at ffffffff9724d55f
      13 [ffff9e25e84abf50] system_call_fastpath at ffffffff97792ed2
          RIP: 00007fc0bd81a6fd  RSP: 00007ffff78d9648  RFLAGS: 00010202
          RAX: 0000000000000001  RBX: 0000000000000022  RCX: 00007ffff78d96e0
          RDX: 0000000000000022  RSI: 00007ffff78d94e0  RDI: 0000000000000008
          RBP: 00007ffff78d9440   R8: 0000000000000000   R9: 00007fc0bd48b2cd
          R10: 0000000000000017  R11: 0000000000000293  R12: 0000000000000000
          R13: 00005624e4dac840  R14: 00005624e4da9a10  R15: 0000000000000000
          ORIG_RAX: 0000000000000001  CS: 0033  SS: 002b
      
      Link: https://lore.kernel.org/r/20200331104015.24868-4-njavali@marvell.comReviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
      Signed-off-by: default avatarQuinn Tran <qutran@marvell.com>
      Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      19bba553
    • Arun Easi's avatar
      scsi: qla2xxx: Fix hang when issuing nvme disconnect-all in NPIV · b1cd543e
      Arun Easi authored
      [ Upstream commit 45a76264 ]
      
      In NPIV environment, a NPIV host may use a queue pair created by base host
      or other NPIVs, so the check for a queue pair created by this NPIV is not
      correct, and can cause an abort to fail, which in turn means the NVME
      command not returned.  This leads to hang in nvme_fc layer in
      nvme_fc_delete_association() which waits for all I/Os to be returned, which
      is seen as hang in the application.
      
      Link: https://lore.kernel.org/r/20200331104015.24868-3-njavali@marvell.comReviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
      Signed-off-by: default avatarArun Easi <aeasi@marvell.com>
      Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      b1cd543e
    • Jiri Kosina's avatar
      HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead · 10c03403
      Jiri Kosina authored
      [ Upstream commit 185af3e7 ]
      
      HID_DEVICE_ID_ALPS_1657 PID is too specific, as there are many other
      ALPS hardware IDs using this particular touchpad.
      
      Rename the identifier to HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY in order
      to describe reality better.
      
      Fixes: 640e403b ("HID: alps: Add AUI1657 device ID")
      Reported-by: default avatarXiaojian Cao <xiaojian.cao@cn.alps.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      10c03403
    • Artem Borisov's avatar
      HID: alps: Add AUI1657 device ID · afdc3083
      Artem Borisov authored
      [ Upstream commit 640e403b ]
      
      This device is used on Lenovo V130-15IKB variants and uses
      the same registers as U1.
      Signed-off-by: default avatarArtem Borisov <dedsa2002@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      afdc3083
    • Sebastian Reichel's avatar
      HID: multitouch: add eGalaxTouch P80H84 support · 0faf568d
      Sebastian Reichel authored
      [ Upstream commit f9e82295 ]
      
      Add support for P80H84 touchscreen from eGalaxy:
      
        idVendor           0x0eef D-WAV Scientific Co., Ltd
        idProduct          0xc002
        iManufacturer           1 eGalax Inc.
        iProduct                2 eGalaxTouch P80H84 2019 vDIVA_1204_T01 k4.02.146
      Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      0faf568d
    • Frédéric Pierret (fepitre)'s avatar
      gcc-common.h: Update for GCC 10 · 3704132a
      Frédéric Pierret (fepitre) authored
      [ Upstream commit c7527373 ]
      
      Remove "params.h" include, which has been dropped in GCC 10.
      
      Remove is_a_helper() macro, which is now defined in gimple.h, as seen
      when running './scripts/gcc-plugin.sh g++ g++ gcc':
      
      In file included from <stdin>:1:
      ./gcc-plugins/gcc-common.h:852:13: error: redefinition of ‘static bool is_a_helper<T>::test(U*) [with U = const gimple; T = const ggoto*]’
        852 | inline bool is_a_helper<const ggoto *>::test(const_gimple gs)
            |             ^~~~~~~~~~~~~~~~~~~~~~~~~~
      In file included from ./gcc-plugins/gcc-common.h:125,
                       from <stdin>:1:
      /usr/lib/gcc/x86_64-redhat-linux/10/plugin/include/gimple.h:1037:1: note: ‘static bool is_a_helper<T>::test(U*) [with U = const gimple; T = const ggoto*]’ previously declared here
       1037 | is_a_helper <const ggoto *>::test (const gimple *gs)
            | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      Add -Wno-format-diag to scripts/gcc-plugins/Makefile to avoid
      meaningless warnings from error() formats used by plugins:
      
      scripts/gcc-plugins/structleak_plugin.c: In function ‘int plugin_init(plugin_name_args*, plugin_gcc_version*)’:
      scripts/gcc-plugins/structleak_plugin.c:253:12: warning: unquoted sequence of 2 consecutive punctuation characters ‘'-’ in format [-Wformat-diag]
        253 |   error(G_("unknown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
            |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      Signed-off-by: default avatarFrédéric Pierret (fepitre) <frederic.pierret@qubes-os.org>
      Link: https://lore.kernel.org/r/20200407113259.270172-1-frederic.pierret@qubes-os.org
      [kees: include -Wno-format-diag for plugin builds]
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      3704132a
    • Richard Weinberger's avatar
      ubi: Fix seq_file usage in detailed_erase_block_info debugfs file · 3251a074
      Richard Weinberger authored
      [ Upstream commit 0e7572cf ]
      
      3bfa7e14 ("fs/seq_file.c: seq_read(): add info message about buggy .next functions")
      showed that we don't use seq_file correctly.
      So make sure that our ->next function always updates the position.
      
      Fixes: 7bccd12d ("ubi: Add debugfs file for tracking PEB state")
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      3251a074
    • Christophe JAILLET's avatar
      i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()' · c3c1cf3d
      Christophe JAILLET authored
      [ Upstream commit e9d1a0a4 ]
      
      A call to 'i2c_demux_deactivate_master()' is missing in the error handling
      path, as already done in the remove function.
      
      Fixes: 50a5ba87 ("i2c: mux: demux-pinctrl: add driver")
      Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
      Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      c3c1cf3d
    • Alexander Monakov's avatar
      iommu/amd: Fix over-read of ACPI UID from IVRS table · 0c673a09
      Alexander Monakov authored
      [ Upstream commit e461b8c9 ]
      
      IVRS parsing code always tries to read 255 bytes from memory when
      retrieving ACPI device path, and makes an assumption that firmware
      provides a zero-terminated string. Both of those are bugs: the entry
      is likely to be shorter than 255 bytes, and zero-termination is not
      guaranteed.
      
      With Acer SF314-42 firmware these issues manifest visibly in dmesg:
      
      AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR0\xf0\xa5, rdevid:160
      AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR1\xf0\xa5, rdevid:160
      AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR2\xf0\xa5, rdevid:160
      AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR3>\x83e\x8d\x9a\xd1...
      
      The first three lines show how the code over-reads adjacent table
      entries into the UID, and in the last line it even reads garbage data
      beyond the end of the IVRS table itself.
      
      Since each entry has the length of the UID (uidl member of ivhd_entry
      struct), use that for memcpy, and manually add a zero terminator.
      
      Avoid zero-filling hid and uid arrays up front, and instead ensure
      the uid array is always zero-terminated. No change needed for the hid
      array, as it was already properly zero-terminated.
      
      Fixes: 2a0cb4e2 ("iommu/amd: Add new map for storing IVHD dev entry type HID")
      Signed-off-by: default avatarAlexander Monakov <amonakov@ispras.ru>
      Cc: Joerg Roedel <joro@8bytes.org>
      Cc: iommu@lists.linux-foundation.org
      Link: https://lore.kernel.org/r/20200511102352.1831-1-amonakov@ispras.ruSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      0c673a09
    • Christoph Hellwig's avatar
      ubifs: remove broken lazytime support · e0fdf46a
      Christoph Hellwig authored
      [ Upstream commit ecf84096 ]
      
      When "ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs" introduced atime
      support to ubifs, it also added lazytime support.  As far as I can tell
      the lazytime support is terminally broken, as it causes
      mark_inode_dirty_sync to be called from __writeback_single_inode, which
      will then trigger the locking assert in ubifs_dirty_inode.  Just remove
      the broken lazytime support for now, it can be added back later,
      especially as some infrastructure changes should make that easier soon.
      
      Fixes: 8c1c5f26 ("ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs")
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      e0fdf46a
    • Al Viro's avatar
      fix multiplication overflow in copy_fdtable() · b23af87a
      Al Viro authored
      [ Upstream commit 4e89b721 ]
      
      cpy and set really should be size_t; we won't get an overflow on that,
      since sysctl_nr_open can't be set above ~(size_t)0 / sizeof(void *),
      so nr that would've managed to overflow size_t on that multiplication
      won't get anywhere near copy_fdtable() - we'll fail with EMFILE
      before that.
      
      Cc: stable@kernel.org # v2.6.25+
      Fixes: 9cfe015a (get rid of NR_OPEN and introduce a sysctl_nr_open)
      Reported-by: default avatarThiago Macieira <thiago.macieira@intel.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      b23af87a
    • Miquel Raynal's avatar
      mtd: spinand: Propagate ECC information to the MTD structure · e7a71903
      Miquel Raynal authored
      [ Upstream commit 3507273d ]
      
      This is done by default in the raw NAND core (nand_base.c) but was
      missing in the SPI-NAND core. Without these two lines the ecc_strength
      and ecc_step_size values are not exported to the user through sysfs.
      
      Fixes: 7529df46 ("mtd: nand: Add core infrastructure to support SPI NANDs")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
      Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      e7a71903
    • Roberto Sassu's avatar
      ima: Fix return value of ima_write_policy() · 657a03ff
      Roberto Sassu authored
      [ Upstream commit 2e3a34e9 ]
      
      This patch fixes the return value of ima_write_policy() when a new policy
      is directly passed to IMA and the current policy requires appraisal of the
      file containing the policy. Currently, if appraisal is not in ENFORCE mode,
      ima_write_policy() returns 0 and leads user space applications to an
      endless loop. Fix this issue by denying the operation regardless of the
      appraisal mode.
      
      Cc: stable@vger.kernel.org # 4.10.x
      Fixes: 19f8a847 ("ima: measure and appraise the IMA policy itself")
      Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
      Reviewed-by: default avatarKrzysztof Struczynski <krzysztof.struczynski@huawei.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      657a03ff
    • Roberto Sassu's avatar
      evm: Check also if *tfm is an error pointer in init_desc() · 4c7a2e76
      Roberto Sassu authored
      [ Upstream commit 53de3b08 ]
      
      This patch avoids a kernel panic due to accessing an error pointer set by
      crypto_alloc_shash(). It occurs especially when there are many files that
      require an unsupported algorithm, as it would increase the likelihood of
      the following race condition:
      
      Task A: *tfm = crypto_alloc_shash() <= error pointer
      Task B: if (*tfm == NULL) <= *tfm is not NULL, use it
      Task B: rc = crypto_shash_init(desc) <= panic
      Task A: *tfm = NULL
      
      This patch uses the IS_ERR_OR_NULL macro to determine whether or not a new
      crypto context must be created.
      
      Cc: stable@vger.kernel.org
      Fixes: d46eb369 ("evm: crypto hash replaced by shash")
      Co-developed-by: default avatarKrzysztof Struczynski <krzysztof.struczynski@huawei.com>
      Signed-off-by: default avatarKrzysztof Struczynski <krzysztof.struczynski@huawei.com>
      Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      4c7a2e76
    • Roberto Sassu's avatar
      ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash() · 904de138
      Roberto Sassu authored
      [ Upstream commit 0014cc04 ]
      
      Commit a408e4a8 ("ima: open a new file instance if no read
      permissions") tries to create a new file descriptor to calculate a file
      digest if the file has not been opened with O_RDONLY flag. However, if a
      new file descriptor cannot be obtained, it sets the FMODE_READ flag to
      file->f_flags instead of file->f_mode.
      
      This patch fixes this issue by replacing f_flags with f_mode as it was
      before that commit.
      
      Cc: stable@vger.kernel.org # 4.20.x
      Fixes: a408e4a8 ("ima: open a new file instance if no read permissions")
      Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
      Reviewed-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      904de138
    • Vincent Chen's avatar
      riscv: set max_pfn to the PFN of the last page · 512f9837
      Vincent Chen authored
      commit c749bb2d upstream.
      
      The current max_pfn equals to zero. In this case, I found it caused users
      cannot get some page information through /proc such as kpagecount in v5.6
      kernel because of new sanity checks. The following message is displayed by
      stress-ng test suite with the command "stress-ng --verbose --physpage 1 -t
      1" on HiFive unleashed board.
      
       # stress-ng --verbose --physpage 1 -t 1
       stress-ng: debug: [109] 4 processors online, 4 processors configured
       stress-ng: info: [109] dispatching hogs: 1 physpage
       stress-ng: debug: [109] cache allocate: reducing cache level from L3 (too high) to L0
       stress-ng: debug: [109] get_cpu_cache: invalid cache_level: 0
       stress-ng: info: [109] cache allocate: using built-in defaults as no suitable cache found
       stress-ng: debug: [109] cache allocate: default cache size: 2048K
       stress-ng: debug: [109] starting stressors
       stress-ng: debug: [109] 1 stressor spawned
       stress-ng: debug: [110] stress-ng-physpage: started [110] (instance 0)
       stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd34de000 in /proc/kpagecount, errno=0 (Success)
       stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd32db078 in /proc/kpagecount, errno=0 (Success)
       ...
       stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd32db078 in /proc/kpagecount, errno=0 (Success)
       stress-ng: debug: [110] stress-ng-physpage: exited [110] (instance 0)
       stress-ng: debug: [109] process [110] terminated
       stress-ng: info: [109] successful run completed in 1.00s
       #
      
      After applying this patch, the kernel can pass the test.
      
       # stress-ng --verbose --physpage 1 -t 1
       stress-ng: debug: [104] 4 processors online, 4 processors configured stress-ng: info: [104] dispatching hogs: 1 physpage
       stress-ng: info: [104] cache allocate: using defaults, can't determine cache details from sysfs
       stress-ng: debug: [104] cache allocate: default cache size: 2048K
       stress-ng: debug: [104] starting stressors
       stress-ng: debug: [104] 1 stressor spawned
       stress-ng: debug: [105] stress-ng-physpage: started [105] (instance 0) stress-ng: debug: [105] stress-ng-physpage: exited [105] (instance 0) stress-ng: debug: [104] process [105] terminated
       stress-ng: info: [104] successful run completed in 1.01s
       #
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarVincent Chen <vincent.chen@sifive.com>
      Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
      Reviewed-by: default avatarYash Shah <yash.shah@sifive.com>
      Tested-by: default avatarYash Shah <yash.shah@sifive.com>
      Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      [Palmer: back-ported to 4.19]
      Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      512f9837
    • Miaohe Lin's avatar
      KVM: SVM: Fix potential memory leak in svm_cpu_init() · 00870815
      Miaohe Lin authored
      commit d80b64ff upstream.
      
      When kmalloc memory for sd->sev_vmcbs failed, we forget to free the page
      held by sd->save_area. Also get rid of the var r as '-ENOMEM' is actually
      the only possible outcome here.
      Reviewed-by: default avatarLiran Alon <liran.alon@oracle.com>
      Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
      Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      00870815
    • Kevin Hao's avatar
      i2c: dev: Fix the race between the release of i2c_dev and cdev · a612c4ec
      Kevin Hao authored
      commit 1413ef63 upstream.
      
      The struct cdev is embedded in the struct i2c_dev. In the current code,
      we would free the i2c_dev struct directly in put_i2c_dev(), but the
      cdev is manged by a kobject, and the release of it is not predictable.
      So it is very possible that the i2c_dev is freed before the cdev is
      entirely released. We can easily get the following call trace with
      CONFIG_DEBUG_KOBJECT_RELEASE and CONFIG_DEBUG_OBJECTS_TIMERS enabled.
        ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x38
        WARNING: CPU: 19 PID: 1 at lib/debugobjects.c:325 debug_print_object+0xb0/0xf0
        Modules linked in:
        CPU: 19 PID: 1 Comm: swapper/0 Tainted: G        W         5.2.20-yocto-standard+ #120
        Hardware name: Marvell OcteonTX CN96XX board (DT)
        pstate: 80c00089 (Nzcv daIf +PAN +UAO)
        pc : debug_print_object+0xb0/0xf0
        lr : debug_print_object+0xb0/0xf0
        sp : ffff00001292f7d0
        x29: ffff00001292f7d0 x28: ffff800b82151788
        x27: 0000000000000001 x26: ffff800b892c0000
        x25: ffff0000124a2558 x24: 0000000000000000
        x23: ffff00001107a1d8 x22: ffff0000116b5088
        x21: ffff800bdc6afca8 x20: ffff000012471ae8
        x19: ffff00001168f2c8 x18: 0000000000000010
        x17: 00000000fd6f304b x16: 00000000ee79de43
        x15: ffff800bc0e80568 x14: 79616c6564203a74
        x13: 6e6968207473696c x12: 5f72656d6974203a
        x11: ffff0000113f0018 x10: 0000000000000000
        x9 : 000000000000001f x8 : 0000000000000000
        x7 : ffff0000101294cc x6 : 0000000000000000
        x5 : 0000000000000000 x4 : 0000000000000001
        x3 : 00000000ffffffff x2 : 0000000000000000
        x1 : 387fc15c8ec0f200 x0 : 0000000000000000
        Call trace:
         debug_print_object+0xb0/0xf0
         __debug_check_no_obj_freed+0x19c/0x228
         debug_check_no_obj_freed+0x1c/0x28
         kfree+0x250/0x440
         put_i2c_dev+0x68/0x78
         i2cdev_detach_adapter+0x60/0xc8
         i2cdev_notifier_call+0x3c/0x70
         notifier_call_chain+0x8c/0xe8
         blocking_notifier_call_chain+0x64/0x88
         device_del+0x74/0x380
         device_unregister+0x54/0x78
         i2c_del_adapter+0x278/0x2d0
         unittest_i2c_bus_remove+0x3c/0x80
         platform_drv_remove+0x30/0x50
         device_release_driver_internal+0xf4/0x1c0
         driver_detach+0x58/0xa0
         bus_remove_driver+0x84/0xd8
         driver_unregister+0x34/0x60
         platform_driver_unregister+0x20/0x30
         of_unittest_overlay+0x8d4/0xbe0
         of_unittest+0xae8/0xb3c
         do_one_initcall+0xac/0x450
         do_initcall_level+0x208/0x224
         kernel_init_freeable+0x2d8/0x36c
         kernel_init+0x18/0x108
         ret_from_fork+0x10/0x1c
        irq event stamp: 3934661
        hardirqs last  enabled at (3934661): [<ffff00001009fa04>] debug_exception_exit+0x4c/0x58
        hardirqs last disabled at (3934660): [<ffff00001009fb14>] debug_exception_enter+0xa4/0xe0
        softirqs last  enabled at (3934654): [<ffff000010081d94>] __do_softirq+0x46c/0x628
        softirqs last disabled at (3934649): [<ffff0000100b4a1c>] irq_exit+0x104/0x118
      
      This is a common issue when using cdev embedded in a struct.
      Fortunately, we already have a mechanism to solve this kind of issue.
      Please see commit 233ed09d ("chardev: add helper function to
      register char devs with a struct device") for more detail.
      
      In this patch, we choose to embed the struct device into the i2c_dev,
      and use the API provided by the commit 233ed09d to make sure that
      the release of i2c_dev and cdev are in sequence.
      Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      a612c4ec
    • Arnd Bergmann's avatar
      ubsan: build ubsan.c more conservatively · f5a8138c
      Arnd Bergmann authored
      commit af700eae upstream.
      
      objtool points out several conditions that it does not like, depending
      on the combination with other configuration options and compiler
      variants:
      
      stack protector:
        lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch()+0xbf: call to __stack_chk_fail() with UACCESS enabled
        lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch_v1()+0xbe: call to __stack_chk_fail() with UACCESS enabled
      
      stackleak plugin:
        lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch()+0x4a: call to stackleak_track_stack() with UACCESS enabled
        lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch_v1()+0x4a: call to stackleak_track_stack() with UACCESS enabled
      
      kasan:
        lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch()+0x25: call to memcpy() with UACCESS enabled
        lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch_v1()+0x25: call to memcpy() with UACCESS enabled
      
      The stackleak and kasan options just need to be disabled for this file
      as we do for other files already.  For the stack protector, we already
      attempt to disable it, but this fails on clang because the check is
      mixed with the gcc specific -fno-conserve-stack option.  According to
      Andrey Ryabinin, that option is not even needed, dropping it here fixes
      the stackprotector issue.
      
      Link: http://lkml.kernel.org/r/20190722125139.1335385-1-arnd@arndb.de
      Link: https://lore.kernel.org/lkml/20190617123109.667090-1-arnd@arndb.de/t/
      Link: https://lore.kernel.org/lkml/20190722091050.2188664-1-arnd@arndb.de/t/
      Fixes: d08965a2 ("x86/uaccess, ubsan: Fix UBSAN vs. SMAP")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Reviewed-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
      Cc: Josh Poimboeuf <jpoimboe@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Dmitry Vyukov <dvyukov@google.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Kees Cook <keescook@chromium.org>
      Cc: Matthew Wilcox <willy@infradead.org>
      Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
      Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      f5a8138c
    • Peter Zijlstra's avatar
      x86/uaccess, ubsan: Fix UBSAN vs. SMAP · ce1cc0d8
      Peter Zijlstra authored
      commit d08965a2 upstream.
      
      UBSAN can insert extra code in random locations; including AC=1
      sections. Typically this code is not safe and needs wrapping.
      
      So far, only __ubsan_handle_type_mismatch* have been observed in AC=1
      sections and therefore only those are annotated.
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Dmitry Vyukov <dvyukov@google.com>
      Cc: Josh Poimboeuf <jpoimboe@redhat.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      [stable backport: only take the lib/Makefile change to resolve gcc-10
       build issues]
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      ce1cc0d8
  2. 20 May, 2020 13 commits