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

Commit e956ad82 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

Merge android-4.14-p.84 (fa255125) into msm-4.14 



* remotes/origin/tmp-fa255125:
  Linux 4.14.84
  libceph: fall back to sendmsg for slab pages
  HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges
  ACPI / platform: Add SMB0001 HID to forbidden_id_list
  drivers/misc/sgi-gru: fix Spectre v1 vulnerability
  USB: misc: appledisplay: add 20" Apple Cinema Display
  misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data
  usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB
  USB: quirks: Add no-lpm quirk for Raydium touchscreens
  usb: cdc-acm: add entry for Hiro (Conexant) modem
  uio: Fix an Oops on load
  MIPS: OCTEON: cavium_octeon_defconfig: re-enable OCTEON USB driver
  media: v4l: event: Add subscription to list before calling "add" operation
  x86/ldt: Unmap PTEs for the slot before freeing LDT pages
  x86/mm: Move LDT remap out of KASLR region on 5-level paging
  perf test code-reading: Fix perf_env setup for PTI entry trampolines
  perf machine: Workaround missing maps for x86 PTI entry trampolines
  perf machine: Add nr_cpus_avail()
  perf tools: Fix kernel_start for PTI on x86
  perf machine: Add machine__is() to identify machine arch
  ACPI / watchdog: Prefer iTCO_wdt always when WDAT table uses RTC SRAM
  SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()
  zram: close udev startup race condition as default groups
  net: stmmac: Fix RX packet size > 8191
  qed: Fix potential memory corruption
  qed: Fix blocking/unlimited SPQ entries leak
  qed: Fix memory/entry leak in qed_init_sp_request()
  i40e: restore NETIF_F_GSO_IPXIP[46] to netdev features
  perf tools: Fix undefined symbol scnprintf in libperf-jvmti.so
  sched/core: Take the hotplug lock in sched_init_smp()
  s390/perf: Change CPUM_CF return code in event init function
  lib/raid6: Fix arm64 test build
  clk: fixed-factor: fix of_node_get-put imbalance
  Revert "drm/exynos/decon5433: implement frame counter"
  hwmon: (ibmpowernv) Remove bogus __init annotations
  s390/qeth: fix HiperSockets sniffer
  netfilter: xt_IDLETIMER: add sysfs filename checking routine
  netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment()
  s390/mm: Fix ERROR: "__node_distance" undefined!
  netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net
  netfilter: ipset: list:set: Decrease refcount synchronously on deletion and replace
  s390/vdso: add missing FORCE to build targets
  arm64: percpu: Initialize ret in the default case
  platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307
  x86/earlyprintk: Add a force option for pciserial device
  apparmor: Fix uninitialized value in aa_split_fqname
  clk: samsung: exynos5420: Enable PERIS clocks for suspend
  fs/exofs: fix potential memory leak in mount option parsing
  perf symbols: Set PLT entry/header sizes properly on Sparc
  clk: fixed-rate: fix of_node_get-put imbalance
  platform/x86: intel_telemetry: report debugfs failure
  drm/edid: Add 6 bpc quirk for BOE panel.
  um: Give start_idle_thread() a return code
  hfsplus: prevent btree data loss on root split
  hfs: prevent btree data loss on root split
  reiserfs: propagate errors from fill_with_dentries() properly
  ixgbe: fix MAC anti-spoofing filter after VFLR
  arm64: kprobe: make page to RO mode when allocate it
  cifs: fix return value for cifs_listxattr
  cifs: don't dereference smb_file_target before null check

Conflicts:
	arch/um/os-Linux/skas/process.c
	drivers/block/zram/zram_drv.c

Change-Id: I3f728cd67e0a86378adf6ca4abc2c53f462c84bc
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parents 1f8e1735 fa255125

Documentation/admin-guide/kernel-parameters.txt

+5 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ 
			earlyprintk=serial[,0x...[,baudrate]]

			earlyprintk=ttySn[,baudrate]

			earlyprintk=dbgp[debugController#]

			earlyprintk=pciserial,bus:device.function[,baudrate]

			earlyprintk=pciserial[,force],bus:device.function[,baudrate]

			earlyprintk=xdbc[xhciController#]



			earlyprintk is useful when the kernel crashes before
@@ -1052,6 +1052,10 @@ 


			The sclp output can only be used on s390.



			The optional "force" to "pciserial" enables use of a

			PCI device even when its classcode is not of the

			UART class.



	edac_report=	[HW,EDAC] Control how to report EDAC event

			Format: {"on" | "off" | "force"}

			on: enable EDAC to report H/W event. May be overridden

Documentation/x86/x86_64/mm.txt

+6 −4
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ Virtual memory map with 4 level page tables: 
0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm

hole caused by [47:63] sign extension

ffff800000000000 - ffff87ffffffffff (=43 bits) guard hole, reserved for hypervisor

ffff880000000000 - ffffc7ffffffffff (=64 TB) direct mapping of all phys. memory

ffffc80000000000 - ffffc8ffffffffff (=40 bits) hole

ffff880000000000 - ffff887fffffffff (=39 bits) LDT remap for PTI

ffff888000000000 - ffffc87fffffffff (=64 TB) direct mapping of all phys. memory

ffffc88000000000 - ffffc8ffffffffff (=39 bits) hole

ffffc90000000000 - ffffe8ffffffffff (=45 bits) vmalloc/ioremap space

ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole

ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)
@@ -30,8 +31,9 @@ Virtual memory map with 5 level page tables: 
0000000000000000 - 00ffffffffffffff (=56 bits) user space, different per mm

hole caused by [56:63] sign extension

ff00000000000000 - ff0fffffffffffff (=52 bits) guard hole, reserved for hypervisor

ff10000000000000 - ff8fffffffffffff (=55 bits) direct mapping of all phys. memory

ff90000000000000 - ff9fffffffffffff (=52 bits) LDT remap for PTI

ff10000000000000 - ff10ffffffffffff (=48 bits) LDT remap for PTI

ff11000000000000 - ff90ffffffffffff (=55 bits) direct mapping of all phys. memory

ff91000000000000 - ff9fffffffffffff (=3840 TB) hole

ffa0000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space (12800 TB)

ffd2000000000000 - ffd3ffffffffffff (=49 bits) hole

ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 83

SUBLEVEL = 84

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/include/asm/percpu.h

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static inline unsigned long __percpu_##op(void *ptr, \ 
		: [val] "Ir" (val));					\

		break;							\

	default:							\

		ret = 0;						\

		BUILD_BUG();						\

	}								\

									\
@@ -122,6 +123,7 @@ static inline unsigned long __percpu_read(void *ptr, int size) 
		ret = READ_ONCE(*(u64 *)ptr);

		break;

	default:

		ret = 0;

		BUILD_BUG();

	}
@@ -191,6 +193,7 @@ static inline unsigned long __percpu_xchg(void *ptr, unsigned long val, 
		: [val] "r" (val));

		break;

	default:

		ret = 0;

		BUILD_BUG();

	}

arch/arm64/kernel/probes/kprobes.c

+20 −7
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 
#include <linux/slab.h>

#include <linux/stop_machine.h>

#include <linux/sched/debug.h>

#include <linux/set_memory.h>

#include <linux/stringify.h>

#include <linux/vmalloc.h>

#include <asm/traps.h>

#include <asm/ptrace.h>

#include <asm/cacheflush.h>
@@ -42,10 +44,21 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); 
static void __kprobes

post_kprobe_handler(struct kprobe_ctlblk *, struct pt_regs *);



static int __kprobes patch_text(kprobe_opcode_t *addr, u32 opcode)

{

	void *addrs[1];

	u32 insns[1];



	addrs[0] = addr;

	insns[0] = opcode;



	return aarch64_insn_patch_text(addrs, insns, 1);

}



static void __kprobes arch_prepare_ss_slot(struct kprobe *p)

{

	/* prepare insn slot */

	p->ainsn.api.insn[0] = cpu_to_le32(p->opcode);

	patch_text(p->ainsn.api.insn, p->opcode);



	flush_icache_range((uintptr_t) (p->ainsn.api.insn),

			   (uintptr_t) (p->ainsn.api.insn) +
@@ -118,15 +131,15 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
	return 0;

}



static int __kprobes patch_text(kprobe_opcode_t *addr, u32 opcode)

void *alloc_insn_page(void)

{

	void *addrs[1];

	u32 insns[1];

	void *page;



	addrs[0] = (void *)addr;

	insns[0] = (u32)opcode;

	page = vmalloc_exec(PAGE_SIZE);

	if (page)

		set_memory_ro((unsigned long)page, 1);



	return aarch64_insn_patch_text(addrs, insns, 1);

	return page;

}



/* arm kprobe: install breakpoint in text */