New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 894058 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Oct 12
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 1
Type: Bug



Sign in to add a comment

Merge v4.14.75 into chromeos-4.14

Project Member Reported by groeck@chromium.org, Oct 10

Issue description

Merge v4.14.75 into chromeos-4.14
 
Project Member

Comment 1 by bugdroid1@chromium.org, Oct 12

Labels: merge-merged-chromeos-4.14
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/2bc4bd0908cedda0be470a38f5ca822ef32261b2

commit 2bc4bd0908cedda0be470a38f5ca822ef32261b2
Author: Guenter Roeck <groeck@chromium.org>
Date: Wed Oct 10 15:20:26 2018

CHROMIUM: Merge 'v4.14.75' into chromeos-4.14

Merge of v4.14.75 into chromeos-4.14

Changelog:
----------------------------------------------------------------
Alex Deucher (1):
      drm/amdgpu: add another ATPX quirk for TOPAZ

Amir Goldstein (2):
      ovl: fix access beyond unterminated strings
      ovl: fix memory leak on unlink of indexed file

Anand Jain (1):
      btrfs: btrfs_shrink_device should call commit transaction at the end

Andreas Gruenbacher (1):
      sysfs: Do not return POSIX ACL xattrs via listxattr

Andy Shevchenko (1):
      gpiolib: acpi: Switch to cansleep version of GPIO library call

Anton Vasilyev (1):
      usb: gadget: fotg210-udc: Fix memory leak of fotg210->ep[i]

Arunk Khandavalli (1):
      cfg80211: nl80211_update_ft_ies() to validate NL80211_ATTR_IE

Ashish Samant (1):
      ocfs2: fix locking for res->tracking and dlm->tracking_list

Aurelien Aptel (1):
      smb2: fix missing files in root share directory listing

Ben Hutchings (1):
      USB: yurex: Check for truncation in yurex_read()

Ben Skeggs (2):
      drm/nouveau/TBDdevinit: don't fail when PMU/PRE_OS is missing from VBIOS
      drm/nouveau/disp: fix DP disable race

Chris Phlipot (1):
      perf util: Fix bad memory access in trace info.

Christian König (1):
      drm/amdgpu: fix error handling in amdgpu_cs_user_fence_chunk

Colin Ian King (1):
      drm/amd/pp: initialize result to before or'ing in data

Dan Carpenter (2):
      cfg80211: fix a type issue in ieee80211_chandef_to_operating_class()
      cifs: read overflow in is_valid_oplock_break()

Danek Duvall (2):
      mac80211: correct use of IEEE80211_VHT_CAP_RXSTBC_X
      mac80211_hwsim: correct use of IEEE80211_VHT_CAP_RXSTBC_X

Daniel Black (1):
      mm: madvise(MADV_DODUMP): allow hugetlbfs pages

Daniel Jurgens (1):
      net/mlx5: Consider PCI domain in search for next dev

Dexuan Cui (1):
      Drivers: hv: vmbus: Use get/put_cpu() in vmbus_connect()

Emmanuel Grumbach (3):
      mac80211: fix a race between restart and CSA flows
      mac80211: don't Tx a deauth frame if the AP forbade Tx
      mac80211: shorten the IBSS debug messages

Greg Kroah-Hartman (1):
      Linux 4.14.75

Guenter Roeck (1):
      Merge remote-tracking branch 'origin/linux/v4.14.75' into merge/chromeos-4.14-v4.14.75

Hans de Goede (2):
      gpiolib-acpi: Register GpioInt ACPI event handlers from a late_initcall
      HID: sensor-hub: Restore fixup for Lenovo ThinkPad Helix 2 sensor hub report

Harry Mallon (1):
      HID: hid-saitek: Add device ID for RAT 7 Contagion

Heinz Mauelshagen (1):
      dm raid: fix rebuild of specific devices by updating superblock

Hisao Tanabe (1):
      perf evsel: Fix potential null pointer dereference in perf_evsel__new_idx()

Horia Geantă (1):
      crypto: caam/jr - fix ablkcipher_edesc pointer arithmetic

Ilan Peer (1):
      mac80211: Fix station bandwidth setting after channel switch

Jacek Tomaka (1):
      perf/x86/intel: Add support/quirk for the MISPREDICT bit on Knights Landing CPUs

Jan Kiszka (1):
      serial: mvebu-uart: Fix reporting of effective CSIZE to userspace

Jann Horn (3):
      bpf: 32-bit RSH verification must truncate input before the ALU op
      RDMA/ucma: check fd type in ucma_migrate_id()
      proc: restrict kernel stack dumps to root

Jia-Ju Bai (1):
      net: cadence: Fix a sleep-in-atomic-context bug in macb_halt_tx()

Joe Thornber (1):
      dm thin metadata: try to avoid ever aborting transactions

Johannes Berg (2):
      mac80211_hwsim: require at least one channel
      mac80211: always account for A-MSDU header changes

Jon Kuhn (1):
      fs/cifs: don't translate SFM_SLASH (U+F026) to backslash

Josh Abraham (1):
      xen: fix GCC warning and remove duplicate EVTCHN_ROW/EVTCHN_COL usage

Julian Wiedmann (1):
      s390/qeth: don't dump past end of unknown HW header

Kai-Heng Feng (2):
      r8169: Clear RTL_FLAG_TASK_*_PENDING when clearing RTL_FLAG_TASK_ENABLED
      ALSA: hda/realtek - Cannot adjust speaker's volume on Dell XPS 27 7760

Len Brown (1):
      tools/power turbostat: fix possible sprintf buffer overflow

Leonard Crestez (1):
      crypto: mxs-dcp - Fix wait logic on chan threads

Lorenzo Bianconi (2):
      mac80211: do not convert to A-MSDU if frag/subframe limited
      mac80211: fix an off-by-one issue in A-MSDU max_subframe computation

Martin Willi (1):
      netfilter: xt_cluster: add dependency on conntrack module

Masahiro Yamada (2):
      i2c: uniphier: issue STOP only for last message or I2C_M_STOP
      i2c: uniphier-f: issue STOP only for last message or I2C_M_STOP

Matt Ranostay (1):
      Revert "iio: temperature: maxim_thermocouple: add MAX31856 part"

Michael Hennerich (1):
      gpio: adp5588: Fix sleep-in-atomic-context bug

Miguel Ojeda (1):
      arm64: jump_label.h: use asm_volatile_goto macro instead of "asm goto"

Mike Snitzer (1):
      dm thin metadata: fix __udivdi3 undefined on 32-bit

Miklos Szeredi (1):
      ovl: fix format of setxattr debug

Naoya Horiguchi (2):
      tools/vm/slabinfo.c: fix sign-compare warning
      tools/vm/page-types.c: fix "defined but not used" warning

Netanel Belgazal (2):
      net: ena: fix driver when PAGE_SIZE == 64kB
      net: ena: fix missing calls to READ_ONCE

Nilesh Javali (1):
      scsi: qedi: Add the CRC size within iSCSI NVM image

Olaf Hering (1):
      xen: avoid crash in disable_hotplug_cpu

Paul Mackerras (1):
      KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function

Peng Li (2):
      net: hns: add the code for cleaning pkt in chip
      net: hns: add netif_carrier_off before change speed and duplex

Randy Dunlap (2):
      arch/hexagon: fix kernel/dma.c build warning
      hexagon: modify ffs() and fls() to return int

Ricardo Ribalda Delgado (1):
      gpiolib: Free the last requested descriptor

Sagi Grimberg (1):
      nvmet-rdma: fix possible bogus dereference under heavy load

Sandipan Das (1):
      perf probe powerpc: Ignore SyS symbols irrespective of endianness

Sara Sharon (1):
      mac80211: avoid kernel panic when building AMSDU from non-linear SKB

Sean O'Brien (1):
      HID: add support for Apple Magic Keyboards

Shaohua Li (1):
      md/raid5-cache: disable reshape completely

Singh, Brijesh (1):
      iommu/amd: Clear memory encryption mask from physical address

Song Liu (1):
      ixgbe: check return value of napi_complete_done()

Stefan Raspl (2):
      tools/kvm_stat: fix python3 issues
      tools/kvm_stat: fix handling of invalid paths in debugfs provider

Stephen Rothwell (1):
      fs/cifs: suppress a string overflow warning

Taehee Yoo (1):
      netfilter: nf_tables: release chain in flushing set

Toke Høiland-Jørgensen (1):
      mac80211: Run TXQ teardown code before de-registering interfaces

Varun Prakash (1):
      scsi: csiostor: add a check for NULL pointer after kmalloc()

Vincent Pelletier (1):
      scsi: iscsi: target: Set conn->sess to NULL when iscsi_login_set_conn_values fails

Vincent Whitchurch (1):
      gpio: Fix crash due to registration race

Vitaly Kuznetsov (2):
      xen/manage: don't complain about an empty value in control/sysrq node
      tools: hv: fcopy: set 'error' in case an unknown operation was requested

Waiman Long (1):
      crypto: qat - Fix KASAN stack-out-of-bounds bug in adf_probe()

Wenjia Zhang (1):
      s390/qeth: use vzalloc for QUERY OAT buffer

Will Deacon (1):
      ARC: atomics: unbork atomic_fetch_##op()

Xiao Ni (1):
      RAID10 BUG_ON in raise_barrier when force is true and conf->barrier is 0

Yuan-Chi Pang (1):
      mac80211: mesh: fix HWMP sequence numbering to follow standard

 Makefile                                           |  2 +-
 arch/arc/include/asm/atomic.h                      |  2 +-
 arch/arm64/include/asm/jump_label.h                |  4 +-
 arch/hexagon/include/asm/bitops.h                  |  4 +-
 arch/hexagon/kernel/dma.c                          |  2 +-
 arch/powerpc/kvm/book3s_64_mmu_hv.c                |  2 +-
 arch/x86/events/intel/lbr.c                        |  4 +
 drivers/crypto/caam/caamalg.c                      |  8 +-
 drivers/crypto/mxs-dcp.c                           | 53 +++++++------
 drivers/crypto/qat/qat_c3xxx/adf_drv.c             |  6 +-
 drivers/crypto/qat/qat_c3xxxvf/adf_drv.c           |  6 +-
 drivers/crypto/qat/qat_c62x/adf_drv.c              |  6 +-
 drivers/crypto/qat/qat_c62xvf/adf_drv.c            |  6 +-
 drivers/crypto/qat/qat_dh895xcc/adf_drv.c          |  6 +-
 drivers/crypto/qat/qat_dh895xccvf/adf_drv.c        |  6 +-
 drivers/gpio/gpio-adp5588.c                        | 24 +++++-
 drivers/gpio/gpiolib-acpi.c                        | 86 +++++++++++++---------
 drivers/gpio/gpiolib-of.c                          |  1 +
 drivers/gpio/gpiolib.c                             |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c   |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             | 23 ++++--
 .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c |  2 +-
 drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c      | 17 +++--
 drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c    |  6 +-
 drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c    |  2 +
 drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h    |  3 +-
 .../gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c    |  3 +-
 drivers/hid/hid-ids.h                              |  1 +
 drivers/hid/hid-saitek.c                           |  2 +
 drivers/hid/hid-sensor-hub.c                       | 23 ++++++
 drivers/hv/connection.c                            |  8 +-
 drivers/i2c/busses/i2c-uniphier-f.c                |  7 +-
 drivers/i2c/busses/i2c-uniphier.c                  |  7 +-
 drivers/iio/temperature/maxim_thermocouple.c       |  1 -
 drivers/infiniband/core/ucma.c                     |  6 ++
 drivers/iommu/amd_iommu.c                          |  2 +-
 drivers/md/dm-raid.c                               |  5 ++
 drivers/md/dm-thin-metadata.c                      | 34 ++++++++-
 drivers/md/dm-thin.c                               | 73 ++++++++++++++++--
 drivers/md/raid10.c                                |  5 +-
 drivers/md/raid5-log.h                             |  5 ++
 drivers/md/raid5.c                                 |  6 +-
 drivers/net/ethernet/amazon/ena/ena_com.c          |  8 +-
 drivers/net/ethernet/amazon/ena/ena_netdev.c       | 10 +--
 drivers/net/ethernet/amazon/ena/ena_netdev.h       | 11 +++
 drivers/net/ethernet/cadence/macb_main.c           |  2 +-
 drivers/net/ethernet/hisilicon/hns/hnae.h          |  2 +
 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c  | 67 ++++++++++++++++-
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 36 +++++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c  | 44 +++++++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h  |  8 ++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 29 ++++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h |  3 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c  | 23 ++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h  |  1 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c  | 23 ++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h  |  1 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h  |  1 +
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      | 21 +++++-
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c   |  2 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      | 12 +--
 drivers/net/ethernet/mellanox/mlx5/core/dev.c      |  7 +-
 drivers/net/ethernet/realtek/r8169.c               |  9 ++-
 drivers/net/wireless/mac80211_hwsim.c              |  8 +-
 drivers/nvme/target/rdma.c                         | 27 ++++++-
 drivers/s390/net/qeth_core_main.c                  |  5 +-
 drivers/s390/net/qeth_l2_main.c                    |  2 +-
 drivers/s390/net/qeth_l3_main.c                    |  2 +-
 drivers/scsi/csiostor/csio_hw.c                    | 16 ++--
 drivers/scsi/qedi/qedi.h                           |  7 +-
 drivers/scsi/qedi/qedi_main.c                      | 28 +++----
 drivers/target/iscsi/iscsi_target_login.c          |  8 +-
 drivers/tty/serial/mvebu-uart.c                    |  4 +-
 drivers/usb/gadget/udc/fotg210-udc.c               | 15 ++--
 drivers/usb/misc/yurex.c                           |  3 +
 drivers/xen/cpu_hotplug.c                          | 15 ++--
 drivers/xen/events/events_base.c                   |  2 +-
 drivers/xen/manage.c                               |  6 +-
 fs/btrfs/volumes.c                                 |  7 +-
 fs/cifs/cifs_unicode.c                             |  3 -
 fs/cifs/cifssmb.c                                  | 11 ++-
 fs/cifs/misc.c                                     |  8 ++
 fs/cifs/smb2ops.c                                  |  2 +-
 fs/ocfs2/dlm/dlmmaster.c                           |  4 +-
 fs/overlayfs/namei.c                               |  2 +-
 fs/overlayfs/overlayfs.h                           |  4 +-
 fs/overlayfs/util.c                                |  3 +-
 fs/proc/base.c                                     | 14 ++++
 fs/xattr.c                                         | 24 +++---
 kernel/bpf/verifier.c                              | 10 ++-
 mm/madvise.c                                       |  2 +-
 net/mac80211/ibss.c                                | 22 +++---
 net/mac80211/main.c                                | 28 +++++--
 net/mac80211/mesh_hwmp.c                           |  4 +
 net/mac80211/mlme.c                                | 70 +++++++++++++++++-
 net/mac80211/tx.c                                  | 54 ++++++++------
 net/netfilter/nf_tables_api.c                      |  1 +
 net/netfilter/xt_cluster.c                         | 14 +++-
 net/wireless/nl80211.c                             |  1 +
 net/wireless/util.c                                |  2 +-
 sound/pci/hda/patch_realtek.c                      |  1 +
 tools/hv/hv_fcopy_daemon.c                         |  1 +
 tools/kvm/kvm_stat/kvm_stat                        | 14 +++-
 tools/perf/arch/powerpc/util/sym-handling.c        |  4 +-
 tools/perf/util/evsel.c                            |  5 +-
 tools/perf/util/trace-event-info.c                 |  2 +-
 tools/power/x86/turbostat/turbostat.c              |  2 +-
 tools/vm/page-types.c                              |  6 --
 tools/vm/slabinfo.c                                |  4 +-
 109 files changed, 964 insertions(+), 305 deletions(-)

BUG= chromium:894058 
TEST=Build and test on various affected systems

Change-Id: Id0e66ebae7bc1ea34d9cce1201be9d0e6de24678
Signed-off-by: Guenter Roeck <groeck@chromium.org>


Status: Fixed (was: Assigned)

Comment 3 Deleted

Merge requested for at least the following patches that came in with the v4.14.75 merge:

06f93e40	brijesh.singh@amd.com	iommu/amd: Clear memory encryption mask from physical address
f7b86faf	Mon Sep 10 13:52:55 2018	christian.koenig@amd.com	drm/amdgpu: fix error handling in amdgpu_cs_user_fence_chunk
Labels: -Pri-3 Pri-1
"at least" is vague. Let's declare that the merge request from #4 is for the two mentioned patches, and nothing else. Additional patches will trigger a separate merge request.
Project Member

Comment 7 by sheriffbot@chromium.org, Oct 18

Labels: -Merge-Request-71 Hotlist-Merge-Approved Merge-Approved-71
Your change meets the bar and is auto-approved for M71. Please go ahead and merge the CL to branch 3578 manually. Please contact milestone owner if you have questions.
Owners: benmason@(Android), kariahda@(iOS), kbleicher@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Project Member

Comment 8 by sheriffbot@chromium.org, Oct 22

Cc: djkurtz@google.com
This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Labels: -Merge-Approved-71
Can we get the patches mentioned in #4 cherry-pick'd onto release-R71-11151.B-chromeos-4.14 branch?
Let me know you if i will have to do it manually.
#10: Hmm, I thought I did that. Something went wrong. Let me have another look.

Project Member

Comment 12 by bugdroid1@chromium.org, Nov 3

Labels: merge-merged-release-R71-11151.B-chromeos-4.14
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/b3cee8d9a02195d8d95c3ca7c9c9e41591564123

commit b3cee8d9a02195d8d95c3ca7c9c9e41591564123
Author: Singh, Brijesh <brijesh.singh@amd.com>
Date: Sat Nov 03 01:35:50 2018

UPSTREAM: iommu/amd: Clear memory encryption mask from physical address

commit b3e9b515b08e407ab3a026dc2e4d935c48d05f69 upstream.

Boris Ostrovsky reported a memory leak with device passthrough when SME
is active.

The VFIO driver uses iommu_iova_to_phys() to get the physical address for
an iova. This physical address is later passed into vfio_unmap_unpin() to
unpin the memory. The vfio_unmap_unpin() uses pfn_valid() before unpinning
the memory. The pfn_valid() check was failing because encryption mask was
part of the physical address returned. This resulted in the memory not
being unpinned and therefore leaked after the guest terminates.

The memory encryption mask must be cleared from the physical address in
iommu_iova_to_phys().

Fixes: 2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to work with memory encryption")
Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: <iommu@lists.linux-foundation.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: kvm@vger.kernel.org
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: <stable@vger.kernel.org> # 4.14+
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

BUG= chromium:894058 
TEST=None

(cherry picked from commit 06f93e40f939f4df9efa57467f1bf195ce50d138)
Signed-off-by: Guenter Roeck <groeck@chromium.org>

Change-Id: Iaf49fc3c7eca4837a189c93bf073238cd0b87e2e
Reviewed-on: https://chromium-review.googlesource.com/c/1315509
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Commit-Queue: Guenter Roeck <groeck@chromium.org>
Tested-by: Guenter Roeck <groeck@chromium.org>

[modify] https://crrev.com/b3cee8d9a02195d8d95c3ca7c9c9e41591564123/drivers/iommu/amd_iommu.c

Project Member

Comment 13 by bugdroid1@chromium.org, Nov 3

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/1597eb7c5f89bc094d4be74f26f7e3bf98b564f7

commit 1597eb7c5f89bc094d4be74f26f7e3bf98b564f7
Author: Christian König <christian.koenig@amd.com>
Date: Sat Nov 03 01:35:54 2018

UPSTREAM: drm/amdgpu: fix error handling in amdgpu_cs_user_fence_chunk

[ Upstream commit 0165de983272d1fae0809ed9db47c46a412279bc ]

Slowly leaking memory one page at a time :)

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

BUG= chromium:894058 
TEST=None

(cherry picked from commit f7b86faf0bd11ae44d009d7d68ec8af5491119fe)
Signed-off-by: Guenter Roeck <groeck@chromium.org>

Change-Id: Ie0ccc5ab381cd4d662d2d3b03330fcb8c257246d
Reviewed-on: https://chromium-review.googlesource.com/c/1315510
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Queue: Guenter Roeck <groeck@chromium.org>
Tested-by: Guenter Roeck <groeck@chromium.org>

[modify] https://crrev.com/1597eb7c5f89bc094d4be74f26f7e3bf98b564f7/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

Sign in to add a comment