5.4.101-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.4.101-rc1 review
This is the start of the stable review cycle for the 5.4.101 release. There are 17 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, 27 Feb 2021 09:25:06 +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.4.101-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.101-rc1
Rong Chen <[email protected]>
scripts/recordmcount.pl: support big endian for ARCH sh
Shyam Prasad N <[email protected]>
cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath.
Raju Rangoju <[email protected]>
cxgb4: Add new T6 PCI device id 0x6092
Christoph Schemmel <[email protected]>
NET: usb: qmi_wwan: Adding support for Cinterion MV31
Sean Christopherson <[email protected]>
KVM: Use kvm_pfn_t for local PFN variable in hva_to_pfn_remapped()
Paolo Bonzini <[email protected]>
mm: provide a saner PTE walking API for modules
Paolo Bonzini <[email protected]>
KVM: do not assume PTE is writable after follow_pfn
Christoph Hellwig <[email protected]>
mm: simplify follow_pte{,pmd}Christoph Hellwig <[email protected]>
mm: unexport follow_pte_pmd
Rolf Eike Beer <[email protected]>
scripts: set proper OpenSSL include dir also for sign-file
Rolf Eike Beer <[email protected]>
scripts: use pkg-config to locate libcrypto
Sameer Pujar <[email protected]>
arm64: tegra: Add power-domain for Tegra210 HDA
Rustam Kovhaev <[email protected]>
ntfs: check for valid standard information attribute
Stefan Ursella <[email protected]>
usb: quirks: add quirk to start video capture on ELMO L-12F document camera reliable
Johan Hovold <[email protected]>
USB: quirks: sort quirk entries
Will McVicker <[email protected]>
HID: make arrays usage and value to be the same
Daniel Borkmann <[email protected]>
bpf: Fix truncation handling for mod32 dst reg wrt zero
-------------
Diffstat:
Makefile | 4 +- arch/arm64/boot/dts/nvidia/tegra210.dtsi | 1 + drivers/hid/hid-core.c | 6 +-- drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + drivers/net/usb/qmi_wwan.c | 1 + drivers/usb/core/quirks.c | 9 ++-- fs/cifs/connect.c | 1 + fs/dax.c | 10 ++-- fs/ntfs/inode.c | 6 +++ include/linux/mm.h | 8 +-- kernel/bpf/verifier.c | 10 ++-- mm/memory.c | 57 ++++++++++++---------- scripts/Makefile | 9 +++- scripts/recordmcount.pl | 6 ++- virt/kvm/kvm_main.c | 17 +++++-- 15 files changed, 93 insertions(+), 53 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/17 bpf: Fix truncation handling for mod32 dst reg wrt zero
From: Daniel Borkmann <[email protected]>
commit 9b00f1b78809309163dda2d044d9e94a3c0248a3 upstream.
Recently noticed that when mod32 with a known src reg of 0 is performed, then the dst register is 32-bit truncated in verifier:
0: R1=ctx(id=0,off=0,imm=0) R10=fp0
0: (b7) r0 = 0
1: R0_w=inv0 R1=ctx(id=0,off=0,imm=0) R10=fp0
1: (b7) r1 = -1
2: R0_w=inv0 R1_w=inv-1 R10=fp0
2: (b4) w2 = -1
3: R0_w=inv0 R1_w=inv-1 R2_w=inv4294967295 R10=fp0
3: (9c) w1 %= w0
4: R0_w=inv0 R1_w=inv(id=0,umax_value=4294967295,var_off=(0x0; 0xffffffff)) R2_w=inv4294967295 R10=fp0 4: (b7) r0 = 1
5: R0_w=inv1 R1_w=inv(id=0,umax_value=4294967295,var_off=(0x0; 0xffffffff)) R2_w=inv4294967295 R10=fp0 5: (1d) if r1 == r2 goto pc+1
R0_w=inv1 R1_w=inv(id=0,umax_value=4294967295,var_off=(0x0; 0xffffffff)) R2_w=inv4294967295 R10=fp0
6: R0_w=inv1 R1_w=inv(id=0,umax_value=4294967295,var_off=(0x0; 0xffffffff)) R2_w=inv4294967295 R10=fp0 6: (b7) r0 = 2
7: R0_w=inv2 R1_w=inv(id=0,umax_value=4294967295,var_off=(0x0; 0xffffffff)) R2_w=inv4294967295 R10=fp0 7: (95) exit
7: R0=inv1 R1=inv(id=0,umin_value=4294967295,umax_value=4294967295,var_off=(0x0; 0xffffffff)) R2=inv4294967295 R10=fp0 7: (95) exit
However, as a runtime result, we get 2 instead of 1, meaning the dst register does not contain (u32)-1 in this case. The reason is fairly straight forward given the 0 test leaves the dst register as-is:
# ./bpftool p d x i 23 0: (b7) r0 = 0 1: (b7) r1 = -1 2: (b4) w2 = -1 3: (16) if w0 == 0x0 goto pc+1 4: (9c) w1 %= w0 5: (b7) r0 = 1 6: (1d) if r1 == r2 goto pc+1 7: (b7) r0 = 2 8: (95) exit
This was originally not an issue given the dst register was marked as completely unknown (aka 64 bit unknown). However, after 468f6eafa6c4 ("bpf: fix 32-bit ALU op verification") the verifier casts the register output to 32 bit, and hence it becomes 32 bit unknown. Note that for the case where the src register is unknown, the dst register is marked 64 bit unknown. After the fix, the register is truncated by the runtime and the test passes:
# ./bpftool p d x i 23 0: (b7) r0 = 0 1: (b7) r1 = -1 2: (b4) w2 = -1 3: (16) if w0 == 0x0 goto pc+2 4: (9c) w1 %= w0 5: (05) goto pc+1 6: (bc) w1 = w1 7: (b7) r0 = 1 8: (1d) if r1 == r2 goto pc+1 9: (b7) r0 = 2 10: (95) exit
Semantics also match with {R,W}x mod{64,32} 0 -> {R,W}x. Invalid div has always been {R,W}x div{64,32} 0 -> 0. Rewrites are as follows:
mod32: mod64:
(16) if w0 == 0x0 goto pc+2 (15) if r0 == 0x0 goto pc+1
(9c) w1 %= w0 (9f) r1 %= r0
(05) goto pc+1
(bc) w1 = w1
--- kernel/bpf/verifier.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/bpf/verifier.c +6 -4
@@ -9005,7 +9005,7 @@ static int fixup_bpf_calls(struct bpf_vebool isdiv =BPF_OP (insn->code) ==BPF_DIV ;struct bpf_insn *patchlet;struct bpf_insn chk_and_div[] = { -/* Rx div 0 -> 0 */ +/* [R,W]x div 0 -> 0 */ BPF_RAW_INSN ((is64 ?BPF_JMP :BPF_JMP32 ) |BPF_JNE |BPF_K , insn->src_reg,0 ,2 ,0 ),
@@ -9014,16 +9014,18 @@ static int fixup_bpf_calls(struct bpf_ve *insn, };struct bpf_insn chk_and_mod[] = { -/* Rx mod 0 -> Rx */ +/* [R,W]x mod 0 -> [R,W]x */ BPF_RAW_INSN ((is64 ?BPF_JMP :BPF_JMP32 ) |BPF_JEQ |BPF_K , insn->src_reg, -0 ,1 ,0 ), +0 ,1 + (is64 ?0 :1 ),0 ), *insn, +BPF_JMP_IMM (BPF_JA ,0 ,0 ,1 ), +BPF_MOV32_REG (insn->dst_reg, insn->dst_reg), }; patchlet = isdiv ? chk_and_div : chk_and_mod; cnt = isdiv ?ARRAY_SIZE (chk_and_div) : -ARRAY_SIZE (chk_and_mod); +ARRAY_SIZE (chk_and_mod) - (is64 ?2 :0 ); new_prog =bpf_patch_insn_data (env, i + delta, patchlet, cnt);if (!new_prog)
Greg Kroah-Hartman
maintainerPATCH 2/17 HID: make arrays usage and value to be the same
In reply to Greg Kroah-HartmanFrom: Will McVicker <[email protected]>
commit ed9be64eefe26d7d8b0b5b9fa3ffdf425d87a01f upstream.
The HID subsystem allows an "HID report field" to have a different number of "values" and "usages" when it is allocated. When a field struct is created, the size of the usage array is guaranteed to be at least as large as the values array, but it may be larger. This leads to a potential out-of-bounds write in __hidinput_change_resolution_multipliers() and an out-of-bounds read in hidinput_count_leds().
To fix this, let's make sure that both the usage and value arrays are the same size.
--- drivers/hid/hid-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hid/hid-core.c +3 -3
@@ -90,7 +90,7 @@ EXPORT_SYMBOL_GPL(hid_register_report);* Register a new field for this report. */ -static struct hid_field *hid_register_field (struct hid_report *report,unsigned usages,unsigned values) +static struct hid_field *hid_register_field (struct hid_report *report,unsigned usages) {struct hid_field *field;
@@ -101,7 +101,7 @@ static struct hid_field *hid_register_fi field =kzalloc ((sizeof (struct hid_field ) + usages *sizeof (struct hid_usage ) + - values *sizeof (unsigned )),GFP_KERNEL ); + usages *sizeof (unsigned )),GFP_KERNEL );if (!field)return NULL ;
@@ -300,7 +300,7 @@ static int hid_add_field(struct hid_pars usages =max_t (unsigned, parser->local.usage_index, parser->global.report_count); - field =hid_register_field (report, usages, parser->global.report_count); + field =hid_register_field (report, usages);if (!field)return 0 ;
Greg Kroah-Hartman
maintainerPATCH 3/17 USB: quirks: sort quirk entries
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 43861d29c0810a70792bf69d37482efb7bb6677d upstream.
Move the last entry to its proper place to maintain the VID/PID sort order.
--- drivers/usb/core/quirks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/core/quirks.c +3 -3
@@ -415,6 +415,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255 }, + /* novation SoundControl XL */ + { USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Huawei 4G LTE module */ { USB_DEVICE(0x12d1, 0x15bb), .driver_info = USB_QUIRK_DISCONNECT_SUSPEND },
@@ -495,9 +498,6 @@ static const struct usb_device_id usb_qu/* INTEL VALUE SSD */ { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME }, - /* novation SoundControl XL */ - { USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME }, - { }/* terminating entry must be last */ };
Greg Kroah-Hartman
maintainerPATCH 4/17 usb: quirks: add quirk to start video capture on ELMO L-12F document camera reliable
In reply to Greg Kroah-HartmanFrom: Stefan Ursella <[email protected]>
commit 1ebe718bb48278105816ba03a0408ecc2d6cf47f upstream.
Without this quirk starting a video capture from the device often fails with
kernel: uvcvideo: Failed to set UVC probe control : -110 (exp. 34).
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -391,6 +391,9 @@ static const struct usb_device_id usb_qu/* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */ { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF }, + /* ELMO L-12F document camera */ + { USB_DEVICE(0x09a1, 0x0028), .driver_info = USB_QUIRK_DELAY_CTRL_MSG }, + /* Broadcom BCM92035DGROM BT dongle */ { USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME },
Greg Kroah-Hartman
maintainerPATCH 5/17 ntfs: check for valid standard information attribute
In reply to Greg Kroah-HartmanFrom: Rustam Kovhaev <[email protected]>
commit 4dfe6bd94959222e18d512bdf15f6bf9edb9c27c upstream.
Mounting a corrupted filesystem with NTFS resulted in a kernel crash.
We should check for valid STANDARD_INFORMATION attribute offset and length before trying to access it
--- fs/ntfs/inode.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/ntfs/inode.c +6 -0
@@ -628,6 +628,12 @@ static int ntfs_read_locked_inode(struct } a = ctx->attr;/* Get the standard information attribute value. */ +if ((u8 *)a +le16_to_cpu (a->data.resident.value_offset) + +le32_to_cpu (a->data.resident.value_length) > + (u8 *)ctx->mrec + vol->mft_record_size) { +ntfs_error (vi->i_sb,"Corrupt standard information attribute in inode." ); + goto unm_err_out; + } si = (STANDARD_INFORMATION *)((u8 *)a +le16_to_cpu (a->data.resident.value_offset));
Greg Kroah-Hartman
maintainerPATCH 6/17 arm64: tegra: Add power-domain for Tegra210 HDA
In reply to Greg Kroah-HartmanFrom: Sameer Pujar <[email protected]>
commit 1e0ca5467445bc1f41a9e403d6161a22f313dae7 upstream.
HDA initialization is failing occasionally on Tegra210 and following print is observed in the boot log. Because of this probe() fails and no sound card is registered.
[16.800802] tegra-hda 70030000.hda: no codecs found!
Codecs request a state change and enumeration by the controller. In failure cases this does not seem to happen as STATETS register reads 0.
The problem seems to be related to the HDA codec dependency on SOR power domain. If it is gated during HDA probe then the failure is observed. Building Tegra HDA driver into kernel image avoids this failure but does not completely address the dependency part. Fix this problem by adding 'power-domains' DT property for Tegra210 HDA. Note that Tegra186 and Tegra194 HDA do this already.
Depends-on: 96d1f078ff0 ("arm64: tegra: Add SOR power-domain for Tegra210")
--- arch/arm64/boot/dts/nvidia/tegra210.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/nvidia/tegra210.dtsi +1 -0
@@ -917,6 +917,7 @@ <&tegra_car 128>, /* hda2hdmi */ <&tegra_car 111>; /* hda2codec_2x */ reset-names = "hda", "hda2hdmi", "hda2codec_2x"; + power-domains = <&pd_sor>; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 7/17 scripts: use pkg-config to locate libcrypto
In reply to Greg Kroah-HartmanFrom: Rolf Eike Beer <[email protected]>
commit 2cea4a7a1885bd0c765089afc14f7ff0eb77864e upstream.
Otherwise build fails if the headers are not in the default location. While at it also ask pkg-config for the libs, with fallback to the existing value.
--- scripts/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
scripts/Makefile +6 -2
@@ -10,6 +10,9 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include +CRYPTO_LIBS = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) +CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null) + hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-$(CONFIG_LOGO) += pnmtologo
@@ -23,8 +26,9 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFIC HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include -HOSTLDLIBS_sign-file = -lcrypto -HOSTLDLIBS_extract-cert = -lcrypto +HOSTLDLIBS_sign-file = $(CRYPTO_LIBS) +HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS) +HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS) always := $(hostprogs-y) $(hostprogs-m)
Greg Kroah-Hartman
maintainerPATCH 8/17 scripts: set proper OpenSSL include dir also for sign-file
In reply to Greg Kroah-HartmanFrom: Rolf Eike Beer <[email protected]>
commit fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f upstream.
--- scripts/Makefile | 1 + 1 file changed, 1 insertion(+)
scripts/Makefile +1 -0
@@ -26,6 +26,7 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFIC HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include +HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS) HOSTLDLIBS_sign-file = $(CRYPTO_LIBS) HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS) HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS)
Greg Kroah-Hartman
maintainerPATCH 9/17 mm: unexport follow_pte_pmd
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
commit 7336375734d65ecc82956b59a79cf5deccce880c upstream.
Patch series "simplify follow_pte a bit".
This small series drops the not needed follow_pte_pmd exports, and simplifies the follow_pte family of functions a bit.
This patch (of 2):
follow_pte_pmd() is only used by the DAX code, which can't be modular.
--- mm/memory.c | 1 - 1 file changed, 1 deletion(-)
mm/memory.c +0 -1
@@ -4313,7 +4313,6 @@ int follow_pte_pmd(struct mm_struct *mm, ptepp, pmdpp, ptlp)));return res; } -EXPORT_SYMBOL (follow_pte_pmd);/** * follow_pfn - look up PFN at a user virtual address
Greg Kroah-Hartman
maintainerPATCH 10/17 mm: simplify follow_pte{,pmd}
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
commit ff5c19ed4b087073cea38ff0edc80c23d7256943 upstream.
Merge __follow_pte_pmd, follow_pte_pmd and follow_pte into a single follow_pte function and just pass two additional NULL arguments for the two previous follow_pte callers.
--- fs/dax.c | 9 ++++----- include/linux/mm.h | 6 +++--- mm/memory.c | 35 +++++------------------------------ 3 files changed, 12 insertions(+), 38 deletions(-)
fs/dax.c +4 -5
@@ -794,12 +794,11 @@ static void dax_entry_mkclean(struct add address =pgoff_address (index, vma);/* -* Note because we provide range to follow_pte_pmd it will -* call mmu_notifier_invalidate_range_start() on our behalf -* before taking any lock. +* Note because we provide range to follow_pte it will call +* mmu_notifier_invalidate_range_start() on our behalf before +* taking any lock. */ -if (follow_pte_pmd (vma->vm_mm, address, &range, - &ptep, &pmdp, &ptl)) +if (follow_pte (vma->vm_mm, address, &range, &ptep, &pmdp, &ptl))continue ;/*
include/linux/mm.h +3 -3
@@ -1466,9 +1466,9 @@ void free_pgd_range(struct mmu_gather *t unsigned long end, unsigned long floor, unsigned long ceiling);int copy_page_range (struct mm_struct *dst,struct mm_struct *src,struct vm_area_struct *vma); -int follow_pte_pmd (struct mm_struct *mm,unsigned long address, -struct mmu_notifier_range *range, -pte_t **ptepp,pmd_t **pmdpp,spinlock_t **ptlp); +int follow_pte (struct mm_struct *mm,unsigned long address, +struct mmu_notifier_range *range,pte_t **ptepp,pmd_t **pmdpp, +spinlock_t **ptlp);int follow_pfn (struct vm_area_struct *vma,unsigned long address,unsigned long *pfn); int follow_phys(struct vm_area_struct *vma, unsigned long address,
mm/memory.c +5 -30
@@ -4222,9 +4222,9 @@ int __pmd_alloc(struct mm_struct *mm, pu }#endif /* __PAGETABLE_PMD_FOLDED */ -static int __follow_pte_pmd (struct mm_struct *mm,unsigned long address, -struct mmu_notifier_range *range, -pte_t **ptepp,pmd_t **pmdpp,spinlock_t **ptlp) +int follow_pte (struct mm_struct *mm,unsigned long address, +struct mmu_notifier_range *range,pte_t **ptepp,pmd_t **pmdpp, +spinlock_t **ptlp) {pgd_t *pgd;p4d_t *p4d;
@@ -4289,31 +4289,6 @@ out:return -EINVAL ; } -static inline int follow_pte (struct mm_struct *mm,unsigned long address, -pte_t **ptepp,spinlock_t **ptlp) -{ -int res; - -/* (void) is needed to make gcc happy */ - (void )__cond_lock (*ptlp, - !(res =__follow_pte_pmd (mm, address,NULL , - ptepp,NULL , ptlp))); -return res; -} - -int follow_pte_pmd (struct mm_struct *mm,unsigned long address, -struct mmu_notifier_range *range, -pte_t **ptepp,pmd_t **pmdpp,spinlock_t **ptlp) -{ -int res; - -/* (void) is needed to make gcc happy */ - (void )__cond_lock (*ptlp, - !(res =__follow_pte_pmd (mm, address, range, - ptepp, pmdpp, ptlp))); -return res; -} -/** * follow_pfn - look up PFN at a user virtual address * @vma: memory mapping
@@ -4334,7 +4309,7 @@ int follow_pfn(struct vm_area_struct *vmif (!(vma->vm_flags & (VM_IO |VM_PFNMAP )))return ret; - ret =follow_pte (vma->vm_mm, address, &ptep, &ptl); + ret =follow_pte (vma->vm_mm, address,NULL , &ptep,NULL , &ptl);if (ret)return ret; *pfn =pte_pfn (*ptep);
@@ -4355,7 +4330,7 @@ int follow_phys(struct vm_area_struct *vif (!(vma->vm_flags & (VM_IO |VM_PFNMAP ))) goto out; -if (follow_pte (vma->vm_mm, address, &ptep, &ptl)) +if (follow_pte (vma->vm_mm, address,NULL , &ptep,NULL , &ptl)) goto out; pte = *ptep;
Greg Kroah-Hartman
maintainerPATCH 11/17 KVM: do not assume PTE is writable after follow_pfn
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit bd2fae8da794b55bf2ac02632da3a151b10e664c upstream.
In order to convert an HVA to a PFN, KVM usually tries to use the get_user_pages family of functinso. This however is not possible for VM_IO vmas; in that case, KVM instead uses follow_pfn.
In doing this however KVM loses the information on whether the PFN is writable. That is usually not a problem because the main use of VM_IO vmas with KVM is for BARs in PCI device assignment, however it is a bug. To fix it, use follow_pte and check pte_write while under the protection of the PTE lock. The information can be used to fail hva_to_pfn_remapped or passed back to the caller via *writable.
Usage of follow_pfn was introduced in commit add6a0cd1c5b ("KVM: MMU: try to fix up page faults before giving up", 2016-07-05); however, even older version have the same issue, all the way back to commit 2e2e3738af33 ("KVM:
Handle vma regions with no backing page", 2008-07-20), as they also did not check whether the PFN was writable.
--- virt/kvm/kvm_main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
virt/kvm/kvm_main.c +12 -3
@@ -1599,9 +1599,11 @@ static int hva_to_pfn_remapped(struct vm kvm_pfn_t *p_pfn) {unsigned long pfn; +pte_t *ptep; +spinlock_t *ptl;int r; - r =follow_pfn (vma, addr, &pfn); + r =follow_pte (vma->vm_mm, addr,NULL , &ptep,NULL , &ptl);if (r) {/* * get_user_pages fails for VM_IO and VM_PFNMAP vmas and does
@@ -1616,14 +1618,19 @@ static int hva_to_pfn_remapped(struct vmif (r)return r; - r =follow_pfn (vma, addr, &pfn); + r =follow_pte (vma->vm_mm, addr,NULL , &ptep,NULL , &ptl);if (r)return r; + } +if (write_fault && !pte_write (*ptep)) { + pfn =KVM_PFN_ERR_RO_FAULT ; + goto out; }if (writable) - *writable = true; + *writable =pte_write (*ptep); + pfn =pte_pfn (*ptep);/* * Get a reference here because callers of *hva_to_pfn* and
@@ -1638,6 +1645,8 @@ static int hva_to_pfn_remapped(struct vm*/ kvm_get_pfn (pfn); +out: +pte_unmap_unlock (ptep, ptl); *p_pfn = pfn;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 12/17 mm: provide a saner PTE walking API for modules
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 9fd6dad1261a541b3f5fa7dc5b152222306e6702 upstream.
Currently, the follow_pfn function is exported for modules but follow_pte is not. However, follow_pfn is very easy to misuse, because it does not provide protections (so most of its callers assume the page is writable!) and because it returns after having already unlocked the page table lock.
Provide instead a simplified version of follow_pte that does not have the pmdpp and range arguments. The older version survives as follow_invalidate_pte() for use by fs/dax.c.
--- fs/dax.c | 5 +++-- include/linux/mm.h | 6 ++++-- mm/memory.c | 41 ++++++++++++++++++++++++++++++++++++----- virt/kvm/kvm_main.c | 4 ++-- 4 files changed, 45 insertions(+), 11 deletions(-)
fs/dax.c +3 -2
@@ -794,11 +794,12 @@ static void dax_entry_mkclean(struct add address =pgoff_address (index, vma);/* -* Note because we provide range to follow_pte it will call +* follow_invalidate_pte() will use the range to call * mmu_notifier_invalidate_range_start() on our behalf before * taking any lock. */ -if (follow_pte (vma->vm_mm, address, &range, &ptep, &pmdp, &ptl)) +if (follow_invalidate_pte (vma->vm_mm, address, &range, &ptep, + &pmdp, &ptl))continue ;/*
include/linux/mm.h +4 -2
@@ -1466,9 +1466,11 @@ void free_pgd_range(struct mmu_gather *t unsigned long end, unsigned long floor, unsigned long ceiling);int copy_page_range (struct mm_struct *dst,struct mm_struct *src,struct vm_area_struct *vma); +int follow_invalidate_pte (struct mm_struct *mm,unsigned long address, +struct mmu_notifier_range *range,pte_t **ptepp, +pmd_t **pmdpp,spinlock_t **ptlp);int follow_pte (struct mm_struct *mm,unsigned long address, -struct mmu_notifier_range *range,pte_t **ptepp,pmd_t **pmdpp, -spinlock_t **ptlp); +pte_t **ptepp,spinlock_t **ptlp);int follow_pfn (struct vm_area_struct *vma,unsigned long address,unsigned long *pfn); int follow_phys(struct vm_area_struct *vma, unsigned long address,
mm/memory.c +36 -5
71 lines not on this page · raw message
virt/kvm/kvm_main.c +2 -2
@@ -1603,7 +1603,7 @@ static int hva_to_pfn_remapped(struct vmspinlock_t *ptl;int r; - r =follow_pte (vma->vm_mm, addr,NULL , &ptep,NULL , &ptl); + r =follow_pte (vma->vm_mm, addr, &ptep, &ptl);if (r) {/* * get_user_pages fails for VM_IO and VM_PFNMAP vmas and does
@@ -1618,7 +1618,7 @@ static int hva_to_pfn_remapped(struct vmif (r)return r; - r =follow_pte (vma->vm_mm, addr,NULL , &ptep,NULL , &ptl); + r =follow_pte (vma->vm_mm, addr, &ptep, &ptl);if (r)return r; }
Greg Kroah-Hartman
maintainerPATCH 13/17 KVM: Use kvm_pfn_t for local PFN variable in hva_to_pfn_remapped()
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit a9545779ee9e9e103648f6f2552e73cfe808d0f4 upstream.
Use kvm_pfn_t, a.k.a. u64, for the local 'pfn' variable when retrieving a so called "remapped" hva/pfn pair. In theory, the hva could resolve to a pfn in high memory on a 32-bit kernel.
This bug was inadvertantly exposed by commit bd2fae8da794 ("KVM: do not assume PTE is writable after follow_pfn"), which added an error PFN value to the mix, causing gcc to comlain about overflowing the unsigned long.
arch/x86/kvm/../../../virt/kvm/kvm_main.c: In function ‘hva_to_pfn_remapped’:
include/linux/kvm_host.h:89:30: error: conversion from ‘long long unsigned int’
to ‘long unsigned int’ changes value from ‘9218868437227405314’ to ‘2’ [-Werror=overflow]
89 | #define KVM_PFN_ERR_RO_FAULT (KVM_PFN_ERR_MASK + 2)
| ^virt/kvm/kvm_main.c:1935:9: note: in expansion of macro ‘KVM_PFN_ERR_RO_FAULT’
Message-Id: <[email protected]>
--- virt/kvm/kvm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
virt/kvm/kvm_main.c +1 -1
@@ -1598,7 +1598,7 @@ static int hva_to_pfn_remapped(struct vm bool write_fault, bool *writable, kvm_pfn_t *p_pfn) { - unsigned long pfn; + kvm_pfn_t pfn;pte_t *ptep;spinlock_t *ptl;int r;
Greg Kroah-Hartman
maintainerPATCH 14/17 NET: usb: qmi_wwan: Adding support for Cinterion MV31
In reply to Greg Kroah-HartmanFrom: Christoph Schemmel <[email protected]>
[ Upstream commit a4dc7eee9106a9d2a6e08b442db19677aa9699c7 ]
Adding support for Cinterion MV31 with PID 0x00B7.
T: Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 11 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 P: Vendor=1e2d ProdID=00b7 Rev=04.14 S: Manufacturer=Cinterion S: Product=Cinterion USB Mobile Broadband S: SerialNumber=b3246eed C: #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=896mA I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan I: If#=0x1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option
--- drivers/net/usb/qmi_wwan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1354,6 +1354,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x1e2d, 0x0082, 5)}, /* Cinterion PHxx,PXxx (2 RmNet) */ {QMI_FIXED_INTF(0x1e2d, 0x0083, 4)}, /* Cinterion PHxx,PXxx (1 RmNet + USB Audio)*/ {QMI_QUIRK_SET_DTR(0x1e2d, 0x00b0, 4)}, /* Cinterion CLS8 */ + {QMI_FIXED_INTF(0x1e2d, 0x00b7, 0)}, /* Cinterion MV31 RmNet */ {QMI_FIXED_INTF(0x413c, 0x81a2, 8)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ {QMI_FIXED_INTF(0x413c, 0x81a3, 8)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ {QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 15/17 cxgb4: Add new T6 PCI device id 0x6092
In reply to Greg Kroah-HartmanFrom: Raju Rangoju <[email protected]>
[ Upstream commit 3401e4aa43a540881cc97190afead650e709c418 ]
--- drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h +1 -0
@@ -219,6 +219,7 @@ CH_PCI_DEVICE_ID_TABLE_DEFINE_BEGINCH_PCI_ID_TABLE_FENTRY (0x6089 ),/* Custom T62100-KR */ CH_PCI_ID_TABLE_FENTRY (0x608a ),/* Custom T62100-CR */ CH_PCI_ID_TABLE_FENTRY (0x608b ),/* Custom T6225-CR */ +CH_PCI_ID_TABLE_FENTRY (0x6092 ),/* Custom T62100-CR-LOM */ CH_PCI_DEVICE_ID_TABLE_DEFINE_END ;#endif /* __T4_PCI_ID_TBL_H__ */
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 16/17 cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath.
In reply to Greg Kroah-HartmanFrom: Shyam Prasad N <[email protected]>
[ Upstream commit a738c93fb1c17e386a09304b517b1c6b2a6a5a8b ]
While debugging another issue today, Steve and I noticed that if a subdir for a file share is already mounted on the client, any new mount of any other subdir (or the file share root) of the same share results in sharing the cifs superblock, which e.g. can result in incorrect device name.
While setting prefix path for the root of a cifs_sb, CIFS_MOUNT_USE_PREFIX_PATH flag should also be set. Without it, prepath is not even considered in some places, and output of "mount" and various /proc/<>/*mount* related options can be missing part of the device name.
--- fs/cifs/connect.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/connect.c +1 -0
@@ -4198,6 +4198,7 @@ int cifs_setup_cifs_sb(struct smb_vol *pvolume_info, cifs_sb->prepath =kstrdup (pvolume_info->prepath,GFP_KERNEL );if (cifs_sb->prepath ==NULL )return -ENOMEM ; + cifs_sb->mnt_cifs_flags |=CIFS_MOUNT_USE_PREFIX_PATH ; }return 0 ;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 17/17 scripts/recordmcount.pl: support big endian for ARCH sh
In reply to Greg Kroah-HartmanFrom: Rong Chen <[email protected]>
[ Upstream commit 93ca696376dd3d44b9e5eae835ffbc84772023ec ]
The kernel test robot reported the following issue:
CC [M] drivers/soc/litex/litex_soc_ctrl.o
sh4-linux-objcopy: Unable to change endianness of input file(s)
sh4-linux-ld: cannot find drivers/soc/litex/.tmp_gl_litex_soc_ctrl.o: No such file or directory
sh4-linux-objcopy: 'drivers/soc/litex/.tmp_mx_litex_soc_ctrl.o': No such file
The problem is that the format of input file is elf32-shbig-linux, but sh4-linux-objcopy wants to output a file which format is elf32-sh-linux:
$ sh4-linux-objdump -d drivers/soc/litex/litex_soc_ctrl.o | grep format drivers/soc/litex/litex_soc_ctrl.o: file format elf32-shbig-linux
--- scripts/recordmcount.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
scripts/recordmcount.pl +5 -1
@@ -268,7 +268,11 @@ if ($arch eq "x86_64") { # force flags for this arch $ld .= " -m shlelf_linux"; - $objcopy .= " -O elf32-sh-linux"; + if ($endian eq "big") { + $objcopy .= " -O elf32-shbig-linux"; + } else { + $objcopy .= " -O elf32-sh-linux"; + } } elsif ($arch eq "powerpc") { my $ldemulation;
Signature · 1 line
2.27.0
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.101 release. There are 17 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, 27 Feb 2021 09:25:06 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.101-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.4:
12 builds: 12 pass, 0 fail
26 boots: 26 pass, 0 fail
57 tests: 57 pass, 0 failLinux version: 5.4.101-rc1-g981a14c3f325
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.101 release. There are 17 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, 27 Feb 2021 09:25:06 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 157 fail: 0 Qemu test results: total: 429 pass: 429 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.101 release. There are 17 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, 27 Feb 2021 09:25:06 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.101-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB, using 32-bit and 64-bit ARM:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.101 release. There are 17 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, 27 Feb 2021 09:25:06 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.101-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.101 release. There are 17 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.
Compiled and booted with no regressions on x86_64.
thanks,
Ross
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.101 release. There are 17 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, 27 Feb 2021 09:25:06 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.101-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.4.101-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.4.y
git commit: 981a14c3f32577a8b2c1d21b17f134b14d41c89a
git describe: v5.4.100-18-g981a14c3f325
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.4.y/build/v5.4.100-18-g981a14c3f325
No regressions (compared to build v5.4.100)
No fixes (compared to build v5.4.100)
Ran 55957 total tests in the following environments and test suites.
Environments
--------------
- arc
- arm
- arm64
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- mips
- nxp-ls2088
- nxp-ls2088-64k_page_size
- parisc
- powerpc
- qemu-arm-clang
- qemu-arm64-clang
- qemu-arm64-kasan
- qemu-x86_64-clang
- qemu-x86_64-kasan
- qemu-x86_64-kcsan
- qemu_arm
- qemu_arm64
- qemu_arm64-compat
- qemu_i386
- qemu_x86_64
- qemu_x86_64-compat
- riscv
- s390
- sh
- sparc
- x15
- x86
- x86-kasan
- x86_64
Test Suites
-----------
* build
* linux-log-parser
* igt-gpu-tools
* install-android-platform-tools-r2600
* kselftest-bpf
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-lkdtm
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-zram
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-fs-tests
* ltp-hugetlb-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-sched-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* perf
* v4l2-compliance
* fwts
* kselftest-android
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kvm-unit-tests
* libhugetlbfs
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-ipc-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-securebits-tests
* network-basic-tests
* kselftest-kexec
* kselftest-vm
* kselftest-x86
* ltp-dio-tests
* ltp-io-tests
* ltp-open-posix-tests
* rcutorture
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org