This is the start of the stable review cycle for the 5.15.74 release.
There are 33 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 Sun, 16 Oct 2022 08:25:00 +0000.
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/v5.x/stable-review/patch-5.15.74-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.15.74-rc2
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: fix MBSSID parsing use-after-free
Johannes Berg <johannes.berg(a)intel.com>
mac80211: fix memory leaks with element parsing
Johannes Berg <johannes.berg(a)intel.com>
mac80211: always allocate struct ieee802_11_elems
Johannes Berg <johannes.berg(a)intel.com>
mac80211: mlme: find auth challenge directly
Johannes Berg <johannes.berg(a)intel.com>
mac80211: move CRC into struct ieee802_11_elems
Johannes Berg <johannes.berg(a)intel.com>
mac80211: mesh: clean up rx_bcn_presp API
Shunsuke Mie <mie(a)igel.co.jp>
misc: pci_endpoint_test: Fix pci_endpoint_test_{copy,write,read}() panic
Shunsuke Mie <mie(a)igel.co.jp>
misc: pci_endpoint_test: Aggregate params checking for xfer
Cameron Gutman <aicommander(a)gmail.com>
Input: xpad - fix wireless 360 controller breaking after suspend
Pavel Rojtberg <rojtberg(a)gmail.com>
Input: xpad - add supported devices as contributed on github
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: update hidden BSSes to avoid WARN_ON
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: fix crash in beacon protection for P2P-device
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: avoid nontransmitted BSS list corruption
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: fix BSS refcounting bugs
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: ensure length byte is present before access
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211/mac80211: reject bad MBSSID elements
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: use expired timer rather than wq for mixing fast pool
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: avoid reading two cache lines on irq randomness
Giovanni Cabiddu <giovanni.cabiddu(a)intel.com>
Revert "crypto: qat - reduce size of mapped region"
Nathan Lynch <nathanl(a)linux.ibm.com>
Revert "powerpc/rtas: Implement reentrant rtas call"
Frank Wunderlich <frank-w(a)public-files.de>
USB: serial: qcserial: add new usb-id for Dell branded EM7455
Linus Torvalds <torvalds(a)linux-foundation.org>
scsi: stex: Properly zero out the passthrough command structure
Orlando Chamberlain <redecorating(a)protonmail.com>
efi: Correct Macmini DMI match in uefi cert quirk
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda: Fix position reporting on Poulsbo
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: clamp credited irq bits to maximum mixed
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: restore O_NONBLOCK support
Hu Weiwen <sehuww(a)mail.scut.edu.cn>
ceph: don't truncate file in atomic_open
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: fix leak of nilfs_root in case of writer thread creation failure
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: fix use-after-free bug of struct nilfs_root
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level()
-------------
Diffstat:
Makefile | 4 +-
arch/powerpc/include/asm/paca.h | 1 -
arch/powerpc/include/asm/rtas.h | 1 -
arch/powerpc/kernel/paca.c | 32 ----
arch/powerpc/kernel/rtas.c | 54 -------
arch/powerpc/sysdev/xics/ics-rtas.c | 22 +--
drivers/char/mem.c | 4 +-
drivers/char/random.c | 25 ++-
drivers/crypto/qat/qat_common/qat_asym_algs.c | 12 +-
drivers/input/joystick/xpad.c | 20 ++-
drivers/misc/pci_endpoint_test.c | 34 +++-
drivers/net/wireless/mac80211_hwsim.c | 2 +
drivers/scsi/stex.c | 17 +-
drivers/usb/serial/qcserial.c | 1 +
fs/ceph/file.c | 10 +-
fs/nilfs2/inode.c | 19 ++-
fs/nilfs2/segment.c | 21 ++-
include/scsi/scsi_cmnd.h | 2 +-
net/mac80211/agg-rx.c | 14 +-
net/mac80211/ibss.c | 33 ++--
net/mac80211/ieee80211_i.h | 40 +++--
net/mac80211/mesh.c | 87 +++++-----
net/mac80211/mesh_hwmp.c | 44 +++---
net/mac80211/mesh_plink.c | 11 +-
net/mac80211/mesh_sync.c | 26 ++-
net/mac80211/mlme.c | 218 ++++++++++++++------------
net/mac80211/rx.c | 12 +-
net/mac80211/scan.c | 16 +-
net/mac80211/tdls.c | 63 +++++---
net/mac80211/util.c | 53 ++++---
net/wireless/scan.c | 77 +++++----
security/integrity/platform_certs/load_uefi.c | 2 +-
sound/pci/hda/hda_intel.c | 3 +-
33 files changed, 536 insertions(+), 444 deletions(-)
This is the start of the stable review cycle for the 6.0.2 release.
There are 34 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 Sat, 15 Oct 2022 17:51:33 +0000.
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/v6.x/stable-review/patch-6.0.2-rc1.…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.0.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.0.2-rc1
Shunsuke Mie <mie(a)igel.co.jp>
misc: pci_endpoint_test: Fix pci_endpoint_test_{copy,write,read}() panic
Shunsuke Mie <mie(a)igel.co.jp>
misc: pci_endpoint_test: Aggregate params checking for xfer
Cameron Gutman <aicommander(a)gmail.com>
Input: xpad - fix wireless 360 controller breaking after suspend
Pavel Rojtberg <rojtberg(a)gmail.com>
Input: xpad - add supported devices as contributed on github
Jeremy Kerr <jk(a)codeconstruct.com.au>
mctp: prevent double key removal and unref
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: update hidden BSSes to avoid WARN_ON
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: fix crash in beacon protection for P2P-device
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: avoid nontransmitted BSS list corruption
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: fix BSS refcounting bugs
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: ensure length byte is present before access
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: fix MBSSID parsing use-after-free
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211/mac80211: reject bad MBSSID elements
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: use expired timer rather than wq for mixing fast pool
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: avoid reading two cache lines on irq randomness
Giovanni Cabiddu <giovanni.cabiddu(a)intel.com>
Revert "crypto: qat - reduce size of mapped region"
Nathan Lynch <nathanl(a)linux.ibm.com>
Revert "powerpc/rtas: Implement reentrant rtas call"
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
Revert "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present""
Frank Wunderlich <frank-w(a)public-files.de>
USB: serial: qcserial: add new usb-id for Dell branded EM7455
Linus Torvalds <torvalds(a)linux-foundation.org>
scsi: stex: Properly zero out the passthrough command structure
Arun Easi <aeasi(a)marvell.com>
scsi: qla2xxx: Fix response queue handler reading stale packets
Arun Easi <aeasi(a)marvell.com>
scsi: qla2xxx: Revert "scsi: qla2xxx: Fix response queue handler reading stale packets"
Orlando Chamberlain <redecorating(a)protonmail.com>
efi: Correct Macmini DMI match in uefi cert quirk
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/realtek: Add quirk for HP Zbook Firefly 14 G9 model
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda: Fix position reporting on Poulsbo
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: clamp credited irq bits to maximum mixed
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: restore O_NONBLOCK support
Rishabh Bhatnagar <risbhat(a)amazon.com>
nvme-pci: set min_align_mask before calculating max_hw_sectors
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: fix leak of nilfs_root in case of writer thread creation failure
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: fix use-after-free bug of struct nilfs_root
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level()
-------------
Diffstat:
Makefile | 4 +-
arch/powerpc/include/asm/paca.h | 1 -
arch/powerpc/include/asm/rtas.h | 1 -
arch/powerpc/kernel/paca.c | 32 -----------
arch/powerpc/kernel/rtas.c | 54 -------------------
arch/powerpc/sysdev/xics/ics-rtas.c | 22 ++++----
drivers/char/mem.c | 4 +-
drivers/char/random.c | 25 ++++++---
drivers/crypto/qat/qat_common/qat_asym_algs.c | 12 ++---
drivers/input/joystick/xpad.c | 20 ++++++-
drivers/misc/pci_endpoint_test.c | 34 +++++++++---
drivers/net/wireless/mac80211_hwsim.c | 2 +
drivers/nvme/host/pci.c | 3 +-
drivers/scsi/qla2xxx/qla_gbl.h | 2 -
drivers/scsi/qla2xxx/qla_isr.c | 22 +++-----
drivers/scsi/qla2xxx/qla_os.c | 10 ----
drivers/scsi/stex.c | 17 +++---
drivers/usb/dwc3/core.c | 50 +----------------
drivers/usb/dwc3/drd.c | 50 +++++++++++++++++
drivers/usb/serial/qcserial.c | 1 +
fs/nilfs2/inode.c | 19 ++++++-
fs/nilfs2/segment.c | 21 +++++---
include/scsi/scsi_cmnd.h | 2 +-
net/mac80211/ieee80211_i.h | 8 +++
net/mac80211/rx.c | 12 +++--
net/mac80211/util.c | 32 +++++------
net/mctp/af_mctp.c | 23 +++++---
net/mctp/route.c | 10 ++--
net/wireless/scan.c | 77 +++++++++++++++++----------
security/integrity/platform_certs/load_uefi.c | 2 +-
sound/pci/hda/hda_intel.c | 3 +-
sound/pci/hda/patch_realtek.c | 18 +++++++
32 files changed, 313 insertions(+), 280 deletions(-)
This is the start of the stable review cycle for the 5.19.16 release.
There are 33 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 Sat, 15 Oct 2022 17:51:33 +0000.
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/v5.x/stable-review/patch-5.19.16-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.19.16-rc1
Shunsuke Mie <mie(a)igel.co.jp>
misc: pci_endpoint_test: Fix pci_endpoint_test_{copy,write,read}() panic
Shunsuke Mie <mie(a)igel.co.jp>
misc: pci_endpoint_test: Aggregate params checking for xfer
Cameron Gutman <aicommander(a)gmail.com>
Input: xpad - fix wireless 360 controller breaking after suspend
Pavel Rojtberg <rojtberg(a)gmail.com>
Input: xpad - add supported devices as contributed on github
Jeremy Kerr <jk(a)codeconstruct.com.au>
mctp: prevent double key removal and unref
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: update hidden BSSes to avoid WARN_ON
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: fix crash in beacon protection for P2P-device
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: avoid nontransmitted BSS list corruption
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: fix BSS refcounting bugs
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: ensure length byte is present before access
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: fix MBSSID parsing use-after-free
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211/mac80211: reject bad MBSSID elements
Johannes Berg <johannes.berg(a)intel.com>
wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: use expired timer rather than wq for mixing fast pool
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: avoid reading two cache lines on irq randomness
Giovanni Cabiddu <giovanni.cabiddu(a)intel.com>
Revert "crypto: qat - reduce size of mapped region"
Nathan Lynch <nathanl(a)linux.ibm.com>
Revert "powerpc/rtas: Implement reentrant rtas call"
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
Revert "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present""
Frank Wunderlich <frank-w(a)public-files.de>
USB: serial: qcserial: add new usb-id for Dell branded EM7455
Linus Torvalds <torvalds(a)linux-foundation.org>
scsi: stex: Properly zero out the passthrough command structure
Orlando Chamberlain <redecorating(a)protonmail.com>
efi: Correct Macmini DMI match in uefi cert quirk
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/realtek: Add quirk for HP Zbook Firefly 14 G9 model
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda: Fix position reporting on Poulsbo
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: clamp credited irq bits to maximum mixed
Jason A. Donenfeld <Jason(a)zx2c4.com>
random: restore O_NONBLOCK support
Rishabh Bhatnagar <risbhat(a)amazon.com>
nvme-pci: set min_align_mask before calculating max_hw_sectors
Hu Weiwen <sehuww(a)mail.scut.edu.cn>
ceph: don't truncate file in atomic_open
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: fix leak of nilfs_root in case of writer thread creation failure
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: fix use-after-free bug of struct nilfs_root
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level()
-------------
Diffstat:
Makefile | 4 +-
arch/powerpc/include/asm/paca.h | 1 -
arch/powerpc/include/asm/rtas.h | 1 -
arch/powerpc/kernel/paca.c | 32 -----------
arch/powerpc/kernel/rtas.c | 54 -------------------
arch/powerpc/sysdev/xics/ics-rtas.c | 22 ++++----
drivers/char/mem.c | 4 +-
drivers/char/random.c | 25 ++++++---
drivers/crypto/qat/qat_common/qat_asym_algs.c | 12 ++---
drivers/input/joystick/xpad.c | 20 ++++++-
drivers/misc/pci_endpoint_test.c | 34 +++++++++---
drivers/net/wireless/mac80211_hwsim.c | 2 +
drivers/nvme/host/pci.c | 3 +-
drivers/scsi/stex.c | 17 +++---
drivers/usb/dwc3/core.c | 50 +----------------
drivers/usb/dwc3/drd.c | 50 +++++++++++++++++
drivers/usb/serial/qcserial.c | 1 +
fs/ceph/file.c | 10 ++--
fs/nilfs2/inode.c | 19 ++++++-
fs/nilfs2/segment.c | 21 +++++---
include/scsi/scsi_cmnd.h | 2 +-
net/mac80211/ieee80211_i.h | 8 +++
net/mac80211/rx.c | 12 +++--
net/mac80211/util.c | 35 ++++++------
net/mctp/af_mctp.c | 23 +++++---
net/mctp/route.c | 10 ++--
net/wireless/scan.c | 77 +++++++++++++++++----------
security/integrity/platform_certs/load_uefi.c | 2 +-
sound/pci/hda/hda_intel.c | 3 +-
sound/pci/hda/patch_realtek.c | 18 +++++++
30 files changed, 315 insertions(+), 257 deletions(-)
From: Paolo Bonzini <pbonzini(a)redhat.com>
commit c3c28d24d910a746b02f496d190e0e8c6560224b upstream.
Commit 7e2175ebd695 ("KVM: x86: Fix recording of guest steal time
/ preempted status", 2021-11-11) open coded the previous call to
kvm_map_gfn, but in doing so it dropped the comparison between the cached
guest physical address and the one in the MSR. This cause an incorrect
cache hit if the guest modifies the steal time address while the memslots
remain the same. This can happen with kexec, in which case the preempted
bit is written at the address used by the old kernel instead of
the old one.
Cc: David Woodhouse <dwmw(a)amazon.co.uk>
Cc: stable(a)vger.kernel.org
Fixes: 7e2175ebd695 ("KVM: x86: Fix recording of guest steal time / preempted status")
Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com>
Signed-off-by: Rishabh Bhatnagar <risbhat(a)amazon.com>
---
arch/x86/kvm/x86.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 111aa95f3de3..9e9298c333c8 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4089,6 +4089,7 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)
struct kvm_steal_time __user *st;
struct kvm_memslots *slots;
static const u8 preempted = KVM_VCPU_PREEMPTED;
+ gpa_t gpa = vcpu->arch.st.msr_val & KVM_STEAL_VALID_BITS;
/*
* The vCPU can be marked preempted if and only if the VM-Exit was on
@@ -4116,6 +4117,7 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)
slots = kvm_memslots(vcpu->kvm);
if (unlikely(slots->generation != ghc->generation ||
+ gpa != ghc->gpa ||
kvm_is_error_hva(ghc->hva) || !ghc->memslot))
return;
--
2.37.1
From: Paolo Bonzini <pbonzini(a)redhat.com>
commit 901d3765fa804ce42812f1d5b1f3de2dfbb26723 upstream.
Commit 7e2175ebd695 ("KVM: x86: Fix recording of guest steal time
/ preempted status", 2021-11-11) open coded the previous call to
kvm_map_gfn, but in doing so it dropped the comparison between the cached
guest physical address and the one in the MSR. This cause an incorrect
cache hit if the guest modifies the steal time address while the memslots
remain the same. This can happen with kexec, in which case the steal
time data is written at the address used by the old kernel instead of
the old one.
While at it, rename the variable from gfn to gpa since it is a plain
physical address and not a right-shifted one.
Reported-by: Dave Young <ruyang(a)redhat.com>
Reported-by: Xiaoying Yan <yiyan(a)redhat.com>
Analyzed-by: Dr. David Alan Gilbert <dgilbert(a)redhat.com>
Cc: David Woodhouse <dwmw(a)amazon.co.uk>
Cc: stable(a)vger.kernel.org
Fixes: 7e2175ebd695 ("KVM: x86: Fix recording of guest steal time / preempted status")
Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com>
Signed-off-by: Rishabh Bhatnagar <risbhat(a)amazon.com>
---
arch/x86/kvm/x86.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 75494b3c2d1e..111aa95f3de3 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3018,6 +3018,7 @@ static void record_steal_time(struct kvm_vcpu *vcpu)
struct gfn_to_hva_cache *ghc = &vcpu->arch.st.cache;
struct kvm_steal_time __user *st;
struct kvm_memslots *slots;
+ gpa_t gpa = vcpu->arch.st.msr_val & KVM_STEAL_VALID_BITS;
u64 steal;
u32 version;
@@ -3030,13 +3031,12 @@ static void record_steal_time(struct kvm_vcpu *vcpu)
slots = kvm_memslots(vcpu->kvm);
if (unlikely(slots->generation != ghc->generation ||
+ gpa != ghc->gpa ||
kvm_is_error_hva(ghc->hva) || !ghc->memslot)) {
- gfn_t gfn = vcpu->arch.st.msr_val & KVM_STEAL_VALID_BITS;
-
/* We rely on the fact that it fits in a single page. */
BUILD_BUG_ON((sizeof(*st) - 1) & KVM_STEAL_VALID_BITS);
- if (kvm_gfn_to_hva_cache_init(vcpu->kvm, ghc, gfn, sizeof(*st)) ||
+ if (kvm_gfn_to_hva_cache_init(vcpu->kvm, ghc, gpa, sizeof(*st)) ||
kvm_is_error_hva(ghc->hva) || !ghc->memslot)
return;
}
--
2.37.1