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

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

Merge 4.19.28 into android-4.19 



Changes in 4.19.28
	cpufreq: Use struct kobj_attribute instead of struct global_attr
	staging: erofs: fix mis-acted TAIL merging behavior
	USB: serial: option: add Telit ME910 ECM composition
	USB: serial: cp210x: add ID for Ingenico 3070
	USB: serial: ftdi_sio: add ID for Hjelmslund Electronics USB485
	staging: erofs: fix illegal address access under memory pressure
	staging: erofs: compressed_pages should not be accessed again after freed
	staging: comedi: ni_660x: fix missing break in switch statement
	staging: wilc1000: fix to set correct value for 'vif_num'
	staging: android: ion: fix sys heap pool's gfp_flags
	staging: android: ashmem: Don't call fallocate() with ashmem_mutex held.
	staging: android: ashmem: Avoid range_alloc() allocation with ashmem_mutex held.
	ip6mr: Do not call __IP6_INC_STATS() from preemptible context
	net: dsa: mv88e6xxx: handle unknown duplex modes gracefully in mv88e6xxx_port_set_duplex
	net: dsa: mv8e6xxx: fix number of internal PHYs for 88E6x90 family
	net: sched: put back q.qlen into a single location
	net-sysfs: Fix mem leak in netdev_register_kobject
	qmi_wwan: Add support for Quectel EG12/EM12
	sctp: call iov_iter_revert() after sending ABORT
	sky2: Disable MSI on Dell Inspiron 1545 and Gateway P-79
	team: Free BPF filter when unregistering netdev
	tipc: fix RDM/DGRAM connect() regression
	bnxt_en: Drop oversize TX packets to prevent errors.
	geneve: correctly handle ipv6.disable module parameter
	hv_netvsc: Fix IP header checksum for coalesced packets
	ipv4: Add ICMPv6 support when parse route ipproto
	lan743x: Fix TX Stall Issue
	net: dsa: mv88e6xxx: Fix statistics on mv88e6161
	net: dsa: mv88e6xxx: Fix u64 statistics
	netlabel: fix out-of-bounds memory accesses
	net: netem: fix skb length BUG_ON in __skb_to_sgvec
	net: nfc: Fix NULL dereference on nfc_llcp_build_tlv fails
	net: phy: Micrel KSZ8061: link failure after cable connect
	net: phy: phylink: fix uninitialized variable in phylink_get_mac_state
	net: sit: fix memory leak in sit_init_net()
	net: socket: set sock->sk to NULL after calling proto_ops::release()
	tipc: fix race condition causing hung sendto
	tun: fix blocking read
	xen-netback: don't populate the hash cache on XenBus disconnect
	xen-netback: fix occasional leak of grant ref mappings under memory pressure
	tun: remove unnecessary memory barrier
	net: Add __icmp_send helper.
	net: avoid use IPCB in cipso_v4_error
	ipv4: Return error for RTA_VIA attribute
	ipv6: Return error for RTA_VIA attribute
	mpls: Return error for RTA_GATEWAY attribute
	ipv4: Pass original device to ip_rcv_finish_core
	net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X
	net: dsa: mv88e6xxx: prevent interrupt storm caused by mv88e6390x_port_set_cmode
	net/sched: act_ipt: fix refcount leak when replace fails
	net/sched: act_skbedit: fix refcount leak when replace fails
	net: sched: act_tunnel_key: fix NULL pointer dereference during init
	x86/CPU/AMD: Set the CPB bit unconditionally on F17h
	x86/boot/compressed/64: Do not read legacy ROM on EFI system
	tracing: Fix event filters and triggers to handle negative numbers
	usb: xhci: Fix for Enabling USB ROLE SWITCH QUIRK on INTEL_SUNRISEPOINT_LP_XHCI
	applicom: Fix potential Spectre v1 vulnerabilities
	MIPS: irq: Allocate accurate order pages for irq stack
	aio: Fix locking in aio_poll()
	xtensa: fix get_wchan
	gnss: sirf: fix premature wakeup interrupt enable
	USB: serial: cp210x: fix GPIO in autosuspend
	selftests: firmware: fix verify_reqs() return value
	Bluetooth: btrtl: Restore old logic to assume firmware is already loaded
	Bluetooth: Fix locking in bt_accept_enqueue() for BH context
	exec: Fix mem leak in kernel_read_file
	scsi: core: reset host byte in DID_NEXUS_FAILURE case
	bpf: fix sanitation rewrite in case of non-pointers
	Linux 4.19.28

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents e431ff9d 6a31767f

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 27

SUBLEVEL = 28

EXTRAVERSION =

NAME = "People's Front"

arch/mips/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ asmlinkage void spurious_interrupt(void) 
void __init init_IRQ(void)

{

	int i;

	unsigned int order = get_order(IRQ_STACK_SIZE);



	for (i = 0; i < NR_IRQS; i++)

		irq_set_noprobe(i);
@@ -62,8 +63,7 @@ void __init init_IRQ(void) 
	arch_init_irq();



	for_each_possible_cpu(i) {

		int irq_pages = IRQ_STACK_SIZE / PAGE_SIZE;

		void *s = (void *)__get_free_pages(GFP_KERNEL, irq_pages);

		void *s = (void *)__get_free_pages(GFP_KERNEL, order);



		irq_stack[i] = s;

		pr_debug("CPU%d IRQ stack at 0x%p - 0x%p\n", i,

arch/x86/boot/compressed/pgtable_64.c

+16 −3
Original line number Diff line number Diff line 
#include <linux/efi.h>

#include <asm/e820/types.h>

#include <asm/processor.h>

#include <asm/efi.h>

#include "pgtable.h"

#include "../string.h"
@@ -37,9 +39,10 @@ int cmdline_find_option_bool(const char *option); 


static unsigned long find_trampoline_placement(void)

{

	unsigned long bios_start, ebda_start;

	unsigned long bios_start = 0, ebda_start = 0;

	unsigned long trampoline_start;

	struct boot_e820_entry *entry;

	char *signature;

	int i;



	/*
@@ -47,8 +50,18 @@ static unsigned long find_trampoline_placement(void) 
	 * This code is based on reserve_bios_regions().

	 */



	/*

	 * EFI systems may not provide legacy ROM. The memory may not be mapped

	 * at all.

	 *

	 * Only look for values in the legacy ROM for non-EFI system.

	 */

	signature = (char *)&boot_params->efi_info.efi_loader_signature;

	if (strncmp(signature, EFI32_LOADER_SIGNATURE, 4) &&

	    strncmp(signature, EFI64_LOADER_SIGNATURE, 4)) {

		ebda_start = *(unsigned short *)0x40e << 4;

		bios_start = *(unsigned short *)0x413 << 10;

	}



	if (bios_start < BIOS_START_MIN || bios_start > BIOS_START_MAX)

		bios_start = BIOS_START_MAX;

arch/x86/kernel/cpu/amd.c

+3 −5
Original line number Diff line number Diff line
@@ -818,11 +818,9 @@ static void init_amd_bd(struct cpuinfo_x86 *c) 
static void init_amd_zn(struct cpuinfo_x86 *c)

{

	set_cpu_cap(c, X86_FEATURE_ZEN);

	/*

	 * Fix erratum 1076: CPB feature bit not being set in CPUID. It affects

	 * all up to and including B1.

	 */

	if (c->x86_model <= 1 && c->x86_stepping <= 1)



	/* Fix erratum 1076: CPB feature bit not being set in CPUID. */

	if (!cpu_has(c, X86_FEATURE_CPB))

		set_cpu_cap(c, X86_FEATURE_CPB);

}

arch/xtensa/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -320,8 +320,8 @@ unsigned long get_wchan(struct task_struct *p) 


		/* Stack layout: sp-4: ra, sp-3: sp' */



		pc = MAKE_PC_FROM_RA(*(unsigned long*)sp - 4, sp);

		sp = *(unsigned long *)sp - 3;

		pc = MAKE_PC_FROM_RA(SPILL_SLOT(sp, 0), sp);

		sp = SPILL_SLOT(sp, 1);

	} while (count++ < 16);

	return 0;

}