Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3e9c9b0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.68 into android-4.19-q 



Changes in 4.19.68
	sh: kernel: hw_breakpoint: Fix missing break in switch statement
	seq_file: fix problem when seeking mid-record
	mm/hmm: fix bad subpage pointer in try_to_unmap_one
	mm: mempolicy: make the behavior consistent when MPOL_MF_MOVE* and MPOL_MF_STRICT were specified
	mm: mempolicy: handle vma with unmovable pages mapped correctly in mbind
	mm/memcontrol.c: fix use after free in mem_cgroup_iter()
	mm/usercopy: use memory range to be accessed for wraparound check
	Revert "pwm: Set class for exported channels in sysfs"
	cpufreq: schedutil: Don't skip freq update when limits change
	xtensa: add missing isync to the cpu_reset TLB code
	ALSA: hda/realtek - Add quirk for HP Envy x360
	ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term
	ALSA: usb-audio: Fix an OOB bug in parse_audio_mixer_unit
	ALSA: hda - Apply workaround for another AMD chip 1022:1487
	ALSA: hda - Fix a memory leak bug
	ALSA: hda - Add a generic reboot_notify
	ALSA: hda - Let all conexant codec enter D3 when rebooting
	HID: holtek: test for sanity of intfdata
	HID: hiddev: avoid opening a disconnected device
	HID: hiddev: do cleanup in failure of opening a device
	Input: kbtab - sanity check for endpoint type
	Input: iforce - add sanity checks
	net: usb: pegasus: fix improper read if get_registers() fail
	netfilter: ebtables: also count base chain policies
	riscv: Make __fstate_clean() work correctly.
	clk: at91: generated: Truncate divisor to GENERATED_MAX_DIV + 1
	clk: sprd: Select REGMAP_MMIO to avoid compile errors
	clk: renesas: cpg-mssr: Fix reset control race condition
	xen/pciback: remove set but not used variable 'old_state'
	irqchip/gic-v3-its: Free unused vpt_page when alloc vpe table fail
	irqchip/irq-imx-gpcv2: Forward irq type to parent
	perf header: Fix divide by zero error if f_header.attr_size==0
	perf header: Fix use of unitialized value warning
	libata: zpodd: Fix small read overflow in zpodd_get_mech_type()
	drm/bridge: lvds-encoder: Fix build error while CONFIG_DRM_KMS_HELPER=m
	Btrfs: fix deadlock between fiemap and transaction commits
	scsi: hpsa: correct scsi command status issue after reset
	scsi: qla2xxx: Fix possible fcport null-pointer dereferences
	drm/amdgpu: fix a potential information leaking bug
	ata: libahci: do not complain in case of deferred probe
	kbuild: modpost: handle KBUILD_EXTRA_SYMBOLS only for external modules
	kbuild: Check for unknown options with cc-option usage in Kconfig and clang
	arm64/efi: fix variable 'si' set but not used
	arm64: unwind: Prohibit probing on return_address()
	arm64/mm: fix variable 'pud' set but not used
	IB/core: Add mitigation for Spectre V1
	IB/mlx5: Fix MR registration flow to use UMR properly
	IB/mad: Fix use-after-free in ib mad completion handling
	drm: msm: Fix add_gpu_components
	drm/exynos: fix missing decrement of retry counter
	Revert "kmemleak: allow to coexist with fault injection"
	ocfs2: remove set but not used variable 'last_hash'
	asm-generic: fix -Wtype-limits compiler warnings
	arm64: KVM: regmap: Fix unexpected switch fall-through
	KVM: arm/arm64: Sync ICH_VMCR_EL2 back when about to block
	staging: comedi: dt3000: Fix signed integer overflow 'divider * base'
	staging: comedi: dt3000: Fix rounding up of timer divisor
	iio: adc: max9611: Fix temperature reading in probe
	USB: core: Fix races in character device registration and deregistraion
	usb: gadget: udc: renesas_usb3: Fix sysfs interface of "role"
	usb: cdc-acm: make sure a refcount is taken early enough
	USB: CDC: fix sanity checks in CDC union parser
	USB: serial: option: add D-Link DWM-222 device ID
	USB: serial: option: Add support for ZTE MF871A
	USB: serial: option: add the BroadMobi BM818 card
	USB: serial: option: Add Motorola modem UARTs
	drm/i915/cfl: Add a new CFL PCI ID.
	dm: disable DISCARD if the underlying storage no longer supports it
	arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side
	netfilter: conntrack: Use consistent ct id hash calculation
	Input: psmouse - fix build error of multiple definition
	iommu/amd: Move iommu_init_pci() to .init section
	bnx2x: Fix VF's VLAN reconfiguration in reload.
	bonding: Add vlan tx offload to hw_enc_features
	net: dsa: Check existence of .port_mdb_add callback before calling it
	net/mlx4_en: fix a memory leak bug
	net/packet: fix race in tpacket_snd()
	sctp: fix memleak in sctp_send_reset_streams
	sctp: fix the transport error_count check
	team: Add vlan tx offload to hw_enc_features
	tipc: initialise addr_trail_end when setting node addresses
	xen/netback: Reset nr_frags before freeing skb
	net/mlx5e: Only support tx/rx pause setting for port owner
	net/mlx5e: Use flow keys dissector to parse packets for ARFS
	mmc: sdhci-of-arasan: Do now show error message in case of deffered probe
	Linux 4.19.68

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib17849ac5ecc11f8bd998c994891ee12d6528da3
parents dc878384 def4c11b

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 67

SUBLEVEL = 68

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/include/asm/efi.h

+5 −1
Original line number Diff line number Diff line
@@ -94,7 +94,11 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, 
	((protocol##_t *)instance)->f(instance, ##__VA_ARGS__)



#define alloc_screen_info(x...)		&screen_info

#define free_screen_info(x...)



static inline void free_screen_info(efi_system_table_t *sys_table_arg,

				    struct screen_info *si)

{

}



/* redeclare as 'hidden' so the compiler will generate relative references */

extern struct screen_info screen_info __attribute__((__visibility__("hidden")));

arch/arm64/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -419,8 +419,8 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, 
				 PMD_TYPE_SECT)



#if defined(CONFIG_ARM64_64K_PAGES) || CONFIG_PGTABLE_LEVELS < 3

#define pud_sect(pud)		(0)

#define pud_table(pud)		(1)

static inline bool pud_sect(pud_t pud) { return false; }

static inline bool pud_table(pud_t pud) { return true; }

#else

#define pud_sect(pud)		((pud_val(pud) & PUD_TYPE_MASK) == \

				 PUD_TYPE_SECT)

arch/arm64/kernel/ftrace.c

+12 −9
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) 


	if (offset < -SZ_128M || offset >= SZ_128M) {

#ifdef CONFIG_ARM64_MODULE_PLTS

		struct plt_entry trampoline;

		struct plt_entry trampoline, *dst;

		struct module *mod;



		/*
@@ -104,24 +104,27 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) 
		 * is added in the future, but for now, the pr_err() below

		 * deals with a theoretical issue only.

		 */

		dst = mod->arch.ftrace_trampoline;

		trampoline = get_plt_entry(addr);

		if (!plt_entries_equal(mod->arch.ftrace_trampoline,

				       &trampoline)) {

			if (!plt_entries_equal(mod->arch.ftrace_trampoline,

					       &(struct plt_entry){})) {

		if (!plt_entries_equal(dst, &trampoline)) {

			if (!plt_entries_equal(dst, &(struct plt_entry){})) {

				pr_err("ftrace: far branches to multiple entry points unsupported inside a single module\n");

				return -EINVAL;

			}



			/* point the trampoline to our ftrace entry point */

			module_disable_ro(mod);

			*mod->arch.ftrace_trampoline = trampoline;

			*dst = trampoline;

			module_enable_ro(mod, true);



			/* update trampoline before patching in the branch */

			smp_wmb();

			/*

			 * Ensure updated trampoline is visible to instruction

			 * fetch before we patch in the branch.

			 */

			__flush_icache_range((unsigned long)&dst[0],

					     (unsigned long)&dst[1]);

		}

		addr = (unsigned long)(void *)mod->arch.ftrace_trampoline;

		addr = (unsigned long)dst;

#else /* CONFIG_ARM64_MODULE_PLTS */

		return -EINVAL;

#endif /* CONFIG_ARM64_MODULE_PLTS */

arch/arm64/kernel/return_address.c

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/export.h>

#include <linux/ftrace.h>

#include <linux/kprobes.h>



#include <asm/stack_pointer.h>

#include <asm/stacktrace.h>
@@ -32,6 +33,7 @@ static int save_return_addr(struct stackframe *frame, void *d) 
		return 0;

	}

}

NOKPROBE_SYMBOL(save_return_addr);



void *return_address(unsigned int level)

{
@@ -55,3 +57,4 @@ void *return_address(unsigned int level) 
		return NULL;

}

EXPORT_SYMBOL_GPL(return_address);

NOKPROBE_SYMBOL(return_address);