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

Commit 0422a21a authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.9.113 (7f6f94c9) into msm-4.9 



* refs/heads/tmp-7f6f94c9:
  Revert "UPSTREAM: ANDROID: binder: remove 32-bit binder interface."
  Linux 4.9.113
  loop: remember whether sysfs_create_group() was done
  RDMA/ucm: Mark UCM interface as BROKEN
  PM / hibernate: Fix oops at snapshot_write()
  loop: add recursion validation to LOOP_CHANGE_FD
  netfilter: x_tables: initialise match/target check parameter struct
  netfilter: nf_queue: augment nfqa_cfg_policy
  uprobes/x86: Remove incorrect WARN_ON() in uprobe_init_insn()
  nvme-pci: Remap CMB SQ entries on every controller reset
  iw_cxgb4: correctly enforce the max reg_mr depth
  i2c: tegra: Fix NACK error handling
  tools build: fix # escaping in .cmd files for future Make
  fs, elf: make sure to page align bss in load_elf_library
  ALSA: hda - Handle pm failure during hotplug
  Fix up non-directory creation in SGID directories
  HID: usbhid: add quirk for innomedia INNEX GENESIS/ATARI adapter
  xhci: xhci-mem: off by one in xhci_stream_id_to_ring()
  usb: quirks: add delay quirks for Corsair Strafe
  USB: serial: mos7840: fix status-register error handling
  USB: yurex: fix out-of-bounds uaccess in read handler
  USB: serial: keyspan_pda: fix modem-status error handling
  USB: serial: cp210x: add another USB ID for Qivicon ZigBee stick
  USB: serial: ch341: fix type promotion bug in ch341_control_in()
  ahci: Disable LPM on Lenovo 50 series laptops with a too old BIOS
  vmw_balloon: fix inflation with batching
  ata: Fix ZBC_OUT all bit handling
  ata: Fix ZBC_OUT command block check
  ibmasm: don't write out of bounds in read handler
  mmc: dw_mmc: fix card threshold control configuration
  MIPS: Fix ioremap() RAM check
  MIPS: Call dump_stack() from show_regs()
  nvme: validate admin queue before unquiesce
  UPSTREAM: binder: replace "%p" with "%pK"
  UPSTREAM: binder: free memory on error
  UPSTREAM: binder: fix proc->files use-after-free
  UPSTREAM: Revert "FROMLIST: binder: fix proc->files use-after-free"
  UPSTREAM: ANDROID: binder: change down_write to down_read
  UPSTREAM: ANDROID: binder: correct the cmd print for BINDER_WORK_RETURN_ERROR
  UPSTREAM: ANDROID: binder: remove 32-bit binder interface.
  UPSTREAM: ANDROID: binder: re-order some conditions
  UPSTREAM: android: binder: use VM_ALLOC to get vm area
  UPSTREAM: android: binder: Use true and false for boolean values
  UPSTREAM: android: binder: Use octal permissions
  UPSTREAM: android: binder: Prefer __func__ to using hardcoded function name
  UPSTREAM: ANDROID: binder: make binder_alloc_new_buf_locked static and indent its arguments
  UPSTREAM: android: binder: Check for errors in binder_alloc_shrinker_init().

Conflicts:
	drivers/hid/usbhid/hid-quirks.c

Change-Id: Ifd2b8c205d4829a33653b5f93a768df6685b3a0c
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents d070dfa3 db91920d

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 112

SUBLEVEL = 113

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static void arch_dump_stack(void *info) 


	if (regs)

		show_regs(regs);



	else

		dump_stack();

}

arch/mips/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ static void __show_regs(const struct pt_regs *regs) 
void show_regs(struct pt_regs *regs)

{

	__show_regs((struct pt_regs *)regs);

	dump_stack();

}



void show_registers(struct pt_regs *regs)

arch/mips/mm/ioremap.c

+25 −12
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/export.h>

#include <asm/addrspace.h>

#include <asm/byteorder.h>

#include <linux/ioport.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>
@@ -97,6 +98,20 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr, 
	return error;

}



static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,

			       void *arg)

{

	unsigned long i;



	for (i = 0; i < nr_pages; i++) {

		if (pfn_valid(start_pfn + i) &&

		    !PageReserved(pfn_to_page(start_pfn + i)))

			return 1;

	}



	return 0;

}



/*

 * Generic mapping function (not visible outside):

 */
@@ -115,8 +130,8 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr, 


void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long flags)

{

	unsigned long offset, pfn, last_pfn;

	struct vm_struct * area;

	unsigned long offset;

	phys_addr_t last_addr;

	void * addr;
@@ -136,17 +151,15 @@ void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long 
		return (void __iomem *) CKSEG1ADDR(phys_addr);



	/*

	 * Don't allow anybody to remap normal RAM that we're using..

	 * Don't allow anybody to remap RAM that may be allocated by the page

	 * allocator, since that could lead to races & data clobbering.

	 */

	if (phys_addr < virt_to_phys(high_memory)) {

		char *t_addr, *t_end;

		struct page *page;



		t_addr = __va(phys_addr);

		t_end = t_addr + (size - 1);



		for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++)

			if(!PageReserved(page))

	pfn = PFN_DOWN(phys_addr);

	last_pfn = PFN_DOWN(last_addr);

	if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,

				  __ioremap_check_ram) == 1) {

		WARN_ONCE(1, "ioremap on RAM at %pa - %pa\n",

			  &phys_addr, &last_addr);

		return NULL;

	}

arch/x86/kernel/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool 
	insn_init(insn, auprobe->insn, sizeof(auprobe->insn), x86_64);

	/* has the side-effect of processing the entire instruction */

	insn_get_length(insn);

	if (WARN_ON_ONCE(!insn_complete(insn)))

	if (!insn_complete(insn))

		return -ENOEXEC;



	if (is_prefix_bad(insn))