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

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

Merge 4.9.97 into android-4.9 



Changes in 4.9.97
	cifs: do not allow creating sockets except with SMB1 posix exensions
	x86/tsc: Prevent 32bit truncation in calc_hpet_ref()
	drm/vc4: Fix memory leak during BO teardown
	drm/i915: Fix LSPCON TMDS output buffer enabling from low-power state
	i2c: i801: store and restore the SLVCMD register at load and unload
	i2c: i801: Save register SMBSLVCMD value only once
	i2c: i801: Restore configuration at shutdown
	usb: musb: fix enumeration after resume
	usb: musb: call pm_runtime_{get,put}_sync before reading vbus registers
	usb: musb: Fix external abort in musb_remove on omap2430
	MIPS: Generic: Fix big endian CPUs on generic machine
	Input: drv260x - fix initializing overdrive voltage
	power: supply: bq2415x: check for NULL acpi_id to avoid null pointer dereference
	stk-webcam: fix an endian bug in stk_camera_read_reg()
	OF: Prevent unaligned access in of_alias_scan()
	ath9k_hw: check if the chip failed to wake up
	jbd2: fix use after free in kjournald2()
	Revert "perf tools: Decompress kernel module when reading DSO data"
	perf: Fix sample_max_stack maximum check
	perf: Return proper values for user stack errors
	RDMA/mlx5: Fix NULL dereference while accessing XRC_TGT QPs
	drm/i915/bxt, glk: Increase PCODE timeouts during CDCLK freq changing
	mac80211_hwsim: fix use-after-free bug in hwsim_exit_net
	r8152: add Linksys USB3GIGV1 id
	Revert "pinctrl: intel: Initialize GPIO properly when used through irqchip"
	Revert "ath10k: send (re)assoc peer command when NSS changed"
	PCI: Wait up to 60 seconds for device to become ready after FLR
	s390: introduce CPU alternatives
	s390: enable CPU alternatives unconditionally
	KVM: s390: wire up bpb feature
	s390: scrub registers on kernel entry and KVM exit
	s390: add optimized array_index_mask_nospec
	s390/alternative: use a copy of the facility bit mask
	s390: add options to change branch prediction behaviour for the kernel
	s390: run user space and KVM guests with modified branch prediction
	s390: introduce execute-trampolines for branches
	KVM: s390: force bp isolation for VSIE
	s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*)
	s390: do not bypass BPENTER for interrupt system calls
	s390/entry.S: fix spurious zeroing of r0
	s390: move nobp parameter functions to nospec-branch.c
	s390: add automatic detection of the spectre defense
	s390: report spectre mitigation via syslog
	s390: add sysfs attributes for spectre
	s390: correct nospec auto detection init order
	s390: correct module section names for expoline code revert
	bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
	KEYS: DNS: limit the length of option strings
	l2tp: check sockaddr length in pppol2tp_connect()
	net: validate attribute sizes in neigh_dump_table()
	llc: delete timers synchronously in llc_sk_free()
	tcp: don't read out-of-bounds opsize
	team: avoid adding twice the same option to the event list
	team: fix netconsole setup over team
	packet: fix bitfield update race
	tipc: add policy for TIPC_NLA_NET_ADDR
	pppoe: check sockaddr length in pppoe_connect()
	vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi
	sctp: do not check port in sctp_inet6_cmp_addr
	net: sched: ife: signal not finding metaid
	llc: hold llc_sap before release_sock()
	llc: fix NULL pointer deref for SOCK_ZAPPED
	net: ethernet: ti: cpsw: fix tx vlan priority mapping
	net: fix deadlock while clearing neighbor proxy table
	tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets
	net: af_packet: fix race in PACKET_{R|T}X_RING
	ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
	strparser: Fix incorrect strp->need_bytes value.
	scsi: mptsas: Disable WRITE SAME
	cdrom: information leak in cdrom_ioctl_media_changed()
	s390/cio: update chpid descriptor after resource accessibility event
	s390/dasd: fix IO error for newly defined devices
	s390/uprobes: implement arch_uretprobe_is_alive()
	ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
	Linux 4.9.97

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 71fce1ed ba3cd579

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -2652,6 +2652,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	noalign		[KNL,ARM]



	noaltinstr	[S390] Disables alternative instructions patching

			(CPU alternatives feature).



	noapic		[SMP,APIC] Tells the kernel to not make use of any

			IOAPICs that may be present in the system.

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 96

SUBLEVEL = 97

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ config MIPS_GENERIC 
	select PCI_DRIVERS_GENERIC

	select PINCTRL

	select SMP_UP if SMP

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_CPU_MIPS32_R6

arch/s390/Kconfig

+47 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ config S390 
	select GENERIC_CLOCKEVENTS

	select GENERIC_CPU_AUTOPROBE

	select GENERIC_CPU_DEVICES if !SMP

	select GENERIC_CPU_VULNERABILITIES

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL
@@ -704,6 +705,51 @@ config SECCOMP 


	  If unsure, say Y.



config KERNEL_NOBP

	def_bool n

	prompt "Enable modified branch prediction for the kernel by default"

	help

	  If this option is selected the kernel will switch to a modified

	  branch prediction mode if the firmware interface is available.

	  The modified branch prediction mode improves the behaviour in

	  regard to speculative execution.



	  With the option enabled the kernel parameter "nobp=0" or "nospec"

	  can be used to run the kernel in the normal branch prediction mode.



	  With the option disabled the modified branch prediction mode is

	  enabled with the "nobp=1" kernel parameter.



	  If unsure, say N.



config EXPOLINE

	def_bool n

	prompt "Avoid speculative indirect branches in the kernel"

	help

	  Compile the kernel with the expoline compiler options to guard

	  against kernel-to-user data leaks by avoiding speculative indirect

	  branches.

	  Requires a compiler with -mindirect-branch=thunk support for full

	  protection. The kernel may run slower.



	  If unsure, say N.



choice

	prompt "Expoline default"

	depends on EXPOLINE

	default EXPOLINE_FULL



config EXPOLINE_OFF

	bool "spectre_v2=off"



config EXPOLINE_AUTO

	bool "spectre_v2=auto"



config EXPOLINE_FULL

	bool "spectre_v2=on"



endchoice



endmenu



menu "Power Management"
@@ -753,6 +799,7 @@ config PFAULT 
config SHARED_KERNEL

	bool "VM shared kernel support"

	depends on !JUMP_LABEL

	depends on !ALTERNATIVES

	help

	  Select this option, if you want to share the text segment of the

	  Linux kernel between different VM guests. This reduces memory

arch/s390/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -79,6 +79,16 @@ ifeq ($(call cc-option-yn,-mwarn-dynamicstack),y) 
cflags-$(CONFIG_WARN_DYNAMIC_STACK) += -mwarn-dynamicstack

endif



ifdef CONFIG_EXPOLINE

  ifeq ($(call cc-option-yn,$(CC_FLAGS_MARCH) -mindirect-branch=thunk),y)

    CC_FLAGS_EXPOLINE := -mindirect-branch=thunk

    CC_FLAGS_EXPOLINE += -mfunction-return=thunk

    CC_FLAGS_EXPOLINE += -mindirect-branch-table

    export CC_FLAGS_EXPOLINE

    cflags-y += $(CC_FLAGS_EXPOLINE) -DCC_USING_EXPOLINE

  endif

endif



ifdef CONFIG_FUNCTION_TRACER

# make use of hotpatch feature if the compiler supports it

cc_hotpatch	:= -mhotpatch=0,3