Linux 5.4.101
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.4.101 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 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, 92 insertions(+), 52 deletions(-)
Christoph Hellwig (2):
mm: unexport follow_pte_pmd
mm: simplify follow_pte{,pmd}
Christoph Schemmel (1):
NET: usb: qmi_wwan: Adding support for Cinterion MV31
Daniel Borkmann (1):
bpf: Fix truncation handling for mod32 dst reg wrt zero
Greg Kroah-Hartman (1):
Linux 5.4.101
Johan Hovold (1):
USB: quirks: sort quirk entries
Paolo Bonzini (2):
KVM: do not assume PTE is writable after follow_pfn
mm: provide a saner PTE walking API for modules
Raju Rangoju (1):
cxgb4: Add new T6 PCI device id 0x6092
Rolf Eike Beer (2):
scripts: use pkg-config to locate libcrypto
scripts: set proper OpenSSL include dir also for sign-file
Rong Chen (1):
scripts/recordmcount.pl: support big endian for ARCH sh
Rustam Kovhaev (1):
ntfs: check for valid standard information attribute
Sameer Pujar (1):
arm64: tegra: Add power-domain for Tegra210 HDA
Sean Christopherson (1):
KVM: Use kvm_pfn_t for local PFN variable in hva_to_pfn_remapped()
Shyam Prasad N (1):
cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath.
Stefan Ursella (1):
usb: quirks: add quirk to start video capture on ELMO L-12F document camera reliable
Will McVicker (1):
HID: make arrays usage and value to be the same
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 100 +SUBLEVEL = 101 EXTRAVERSION = NAME = Kleptomaniac Octopus
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"; };
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_field(struct hid_report *report, unsigned 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_parser *parser, unsigned report_type, unsign 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 ;
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__ */
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 */
drivers/usb/core/quirks.c +6 -3
@@ -391,6 +391,9 @@ static const struct usb_device_id usb_quirk_list[] = {/* 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 },
@@ -415,6 +418,9 @@ static const struct usb_device_id usb_quirk_list[] = { { 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 +501,6 @@ static const struct usb_device_id usb_quirk_list[] = {/* 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 */ };
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 ;
fs/dax.c +5 -5
@@ -794,12 +794,12 @@ static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index, 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. +* follow_invalidate_pte() will use the range to 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_invalidate_pte (vma->vm_mm, address, &range, &ptep, + &pmdp, &ptl))continue ;/*
fs/ntfs/inode.c +6 -0
@@ -628,6 +628,12 @@ static int ntfs_read_locked_inode(struct inode *vi) } 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));
include/linux/mm.h +5 -3
@@ -1466,9 +1466,11 @@ void free_pgd_range(struct mmu_gather *tlb, unsigned long addr, 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_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, +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,
kernel/bpf/verifier.c +6 -4
@@ -9005,7 +9005,7 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env)bool 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_verifier_env *env) *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)
mm/memory.c +31 -26
77 lines not on this page · raw message
scripts/Makefile +7 -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,10 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include -HOSTLDLIBS_sign-file = -lcrypto -HOSTLDLIBS_extract-cert = -lcrypto +HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS) +HOSTLDLIBS_sign-file = $(CRYPTO_LIBS) +HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS) +HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS) always := $(hostprogs-y) $(hostprogs-m)
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;
virt/kvm/kvm_main.c +13 -4
@@ -1598,10 +1598,12 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma, 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; - r =follow_pfn (vma, addr, &pfn); + r =follow_pte (vma->vm_mm, addr, &ptep, &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 vm_area_struct *vma,if (r)return r; - r =follow_pfn (vma, addr, &pfn); + r =follow_pte (vma->vm_mm, addr, &ptep, &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_area_struct *vma,*/ kvm_get_pfn (pfn); +out: +pte_unmap_unlock (ptep, ptl); *p_pfn = pfn;return 0 ; }