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

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

Merge 4.9.177 into android-4.9 



Changes in 4.9.177
	netfilter: compat: initialize all fields in xt_init
	bpf: fix struct htab_elem layout
	bpf: convert htab map to hlist_nulls
	platform/x86: sony-laptop: Fix unintentional fall-through
	USB: serial: fix unthrottle races
	iio: adc: xilinx: fix potential use-after-free on remove
	libnvdimm/namespace: Fix a potential NULL pointer dereference
	HID: input: add mapping for Expose/Overview key
	HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys
	HID: input: add mapping for "Toggle Display" key
	libnvdimm/btt: Fix a kmemdup failure check
	s390/dasd: Fix capacity calculation for large volumes
	mac80211: fix unaligned access in mesh table hash function
	s390/3270: fix lockdep false positive on view->lock
	mISDN: Check address length before reading address family
	x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T
	KVM: x86: avoid misreporting level-triggered irqs as edge-triggered in tracing
	tools lib traceevent: Fix missing equality check for strcmp
	init: initialize jump labels before command line option parsing
	selftests: netfilter: check icmp pkttoobig errors are set as related
	ipvs: do not schedule icmp errors from tunnels
	MIPS: perf: ath79: Fix perfcount IRQ assignment
	s390: ctcm: fix ctcm_new_device error return code
	drm/sun4i: Set device driver data at bind time for use in unbind
	selftests/net: correct the return value for run_netsocktests
	gpu: ipu-v3: dp: fix CSC handling
	spi: Micrel eth switch: declare missing of table
	spi: ST ST95HF NFC: declare missing of table
	Input: synaptics-rmi4 - fix possible double free
	cw1200: fix missing unlock on error in cw1200_hw_scan()
	ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command
	rtlwifi: rtl8723ae: Fix missing break in switch statement
	Don't jump to compute_result state from check_result state
	Revert "x86/vdso: Drop implicit common-page-size linker flag"
	Revert "x86: vdso: Use $LD instead of $CC to link"
	x86: vdso: Use $LD instead of $CC to link
	x86/vdso: Drop implicit common-page-size linker flag
	x86/vdso: Pass --eh-frame-hdr to the linker
	powerpc/64s: Include cpu header
	bridge: Fix error path for kobject_init_and_add()
	fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied
	net: ucc_geth - fix Oops when changing number of buffers in the ring
	packet: Fix error path in packet_init
	vlan: disable SIOCSHWTSTAMP in container
	vrf: sit mtu should not be updated when vrf netdev is the link
	ipv4: Fix raw socket lookup for local traffic
	bonding: fix arp_validate toggling in active-backup mode
	drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl
	drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl
	powerpc/lib: fix book3s/32 boot failure due to code patching
	powerpc/booke64: set RI in default MSR
	Linux 4.9.177

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 25b68512 8baec4eb

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 176

SUBLEVEL = 177

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/ath79/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -183,12 +183,6 @@ const char *get_system_type(void) 
	return ath79_sys_type;

}



int get_c0_perfcount_int(void)

{

	return ATH79_MISC_IRQ(5);

}

EXPORT_SYMBOL_GPL(get_c0_perfcount_int);



unsigned int get_c0_compare_int(void)

{

	return CP0_LEGACY_COMPARE_IRQ;

arch/powerpc/include/asm/reg_booke.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#if defined(CONFIG_PPC_BOOK3E_64)

#define MSR_64BIT	MSR_CM



#define MSR_		(MSR_ME | MSR_CE)

#define MSR_		(MSR_ME | MSR_RI | MSR_CE)

#define MSR_KERNEL	(MSR_ | MSR_64BIT)

#define MSR_USER32	(MSR_ | MSR_PR | MSR_EE)

#define MSR_USER64	(MSR_USER32 | MSR_64BIT)

arch/powerpc/kernel/security.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
//

// Copyright 2018, Michael Ellerman, IBM Corporation.



#include <linux/cpu.h>

#include <linux/kernel.h>

#include <linux/debugfs.h>

#include <linux/device.h>

arch/powerpc/lib/code-patching.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ int patch_instruction(unsigned int *addr, unsigned int instr) 
	int err;



	/* Make sure we aren't patching a freed init section */

	if (init_mem_is_free && init_section_contains(addr, 4)) {

	if (*PTRRELOC(&init_mem_is_free) && init_section_contains(addr, 4)) {

		pr_debug("Skipping init section patching addr: 0x%px\n", addr);

		return 0;

	}