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

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

Merge 4.9.142 into android-4.9 



Changes in 4.9.142
	usb: core: Fix hub port connection events lost
	usb: dwc3: core: Clean up ULPI device
	usb: xhci: fix timeout for transition from RExit to U0
	MAINTAINERS: Add Sasha as a stable branch maintainer
	gpio: don't free unallocated ida on gpiochip_add_data_with_key() error path
	iwlwifi: mvm: support sta_statistics() even on older firmware
	iwlwifi: mvm: fix regulatory domain update when the firmware starts
	brcmfmac: fix reporting support for 160 MHz channels
	tools/power/cpupower: fix compilation with STATIC=true
	v9fs_dir_readdir: fix double-free on p9stat_read error
	selinux: Add __GFP_NOWARN to allocation at str_read()
	bfs: add sanity check at bfs_fill_super()
	sctp: clear the transport of some out_chunk_list chunks in sctp_assoc_rm_peer
	gfs2: Don't leave s_fs_info pointing to freed memory in init_sbd
	llc: do not use sk_eat_skb()
	mm: don't warn about large allocations for slab
	drm/ast: change resolution may cause screen blurred
	drm/ast: fixed cursor may disappear sometimes
	drm/ast: Remove existing framebuffers before loading driver
	can: dev: can_get_echo_skb(): factor out non sending code to __can_get_echo_skb()
	can: dev: __can_get_echo_skb(): replace struct can_frame by canfd_frame to access frame length
	can: dev: __can_get_echo_skb(): Don't crash the kernel if can_priv::echo_skb is accessed out of bounds
	can: dev: __can_get_echo_skb(): print error message, if trying to echo non existing skb
	IB/core: Fix for core panic
	IB/hfi1: Eliminate races in the SDMA send error path
	usb: xhci: Prevent bus suspend if a port connect change or polling state is detected
	pinctrl: meson: fix pinconf bias disable
	KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE
	cpufreq: imx6q: add return value check for voltage scale
	rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write
	floppy: fix race condition in __floppy_read_block_0()
	powerpc/io: Fix the IO workarounds code to work with Radix
	perf/x86/intel/uncore: Add more IMC PCI IDs for KabyLake and CoffeeLake CPUs
	SUNRPC: Fix a bogus get/put in generic_key_to_expire()
	kdb: Use strscpy with destination buffer size
	powerpc/numa: Suppress "VPHN is not supported" messages
	efi/arm: Revert deferred unmap of early memmap mapping
	tmpfs: make lseek(SEEK_DATA/SEK_HOLE) return ENXIO with a negative offset
	of: add helper to lookup compatible child node
	NFC: nfcmrvl_uart: fix OF child-node lookup
	net: bcmgenet: fix OF child-node lookup
	arm64: remove no-op -p linker flag
	ath10k: fix kernel panic due to race in accessing arvif list
	Input: xpad - add product ID for Xbox One S pad
	Input: xpad - fix Xbox One rumble stopping after 2.5 secs
	Input: xpad - correctly sort vendor id's
	Input: xpad - move reporting xbox one home button to common function
	Input: xpad - simplify error condition in init_output
	Input: xpad - don't depend on endpoint order
	Input: xpad - fix stuck mode button on Xbox One S pad
	Input: xpad - restore LED state after device resume
	Input: xpad - support some quirky Xbox One pads
	Input: xpad - sort supported devices by USB ID
	Input: xpad - sync supported devices with xboxdrv
	Input: xpad - add USB IDs for Mad Catz Brawlstick and Razer Sabertooth
	Input: xpad - sync supported devices with 360Controller
	Input: xpad - sync supported devices with XBCD
	Input: xpad - constify usb_device_id
	Input: xpad - fix PowerA init quirk for some gamepad models
	Input: xpad - validate USB endpoint type during probe
	Input: xpad - add support for PDP Xbox One controllers
	Input: xpad - add PDP device id 0x02a4
	Input: xpad - fix some coding style issues
	Input: xpad - avoid using __set_bit() for capabilities
	Input: xpad - add GPD Win 2 Controller USB IDs
	Input: xpad - fix GPD Win 2 controller name
	Input: xpad - add support for Xbox1 PDP Camo series gamepad
	cw1200: Don't leak memory if krealloc failes
	mwifiex: prevent register accesses after host is sleeping
	mwifiex: report error to PCIe for suspend failure
	mwifiex: Fix NULL pointer dereference in skb_dequeue()
	mwifiex: fix p2p device doesn't find in scan problem
	scsi: ufs: fix bugs related to null pointer access and array size
	scsi: ufshcd: Fix race between clk scaling and ungate work
	scsi: ufs: fix race between clock gating and devfreq scaling work
	scsi: ufshcd: release resources if probe fails
	include/linux/pfn_t.h: force '~' to be parsed as an unary operator
	tty: wipe buffer.
	tty: wipe buffer if not echoing data
	usb: xhci: fix uninitialized completion when USB3 port got wrong status
	sched/core: Allow __sched_setscheduler() in interrupts when PI is not used
	namei: allow restricted O_CREAT of FIFOs and regular files
	lan78xx: Read MAC address from DT if present
	s390/mm: Check for valid vma before zapping in gmap_discard
	net: ieee802154: 6lowpan: fix frag reassembly
	Revert "evm: Translate user/group ids relative to s_user_ns when computing HMAC"
	ima: always measure and audit files in policy
	EVM: Add support for portable signature format
	ima: re-introduce own integrity cache lock
	ima: re-initialize iint->atomic_flags
	Linux 4.9.142

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 4dcb0afd 68ae960f

Documentation/sysctl/fs.txt

+36 −0
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ Currently, these files are in /proc/sys/fs: 
- overflowgid

- pipe-user-pages-hard

- pipe-user-pages-soft

- protected_fifos

- protected_hardlinks

- protected_regular

- protected_symlinks

- suid_dumpable

- super-max
@@ -182,6 +184,24 @@ applied. 


==============================================================



protected_fifos:



The intent of this protection is to avoid unintentional writes to

an attacker-controlled FIFO, where a program expected to create a regular

file.



When set to "0", writing to FIFOs is unrestricted.



When set to "1" don't allow O_CREAT open on FIFOs that we don't own

in world writable sticky directories, unless they are owned by the

owner of the directory.



When set to "2" it also applies to group writable sticky directories.



This protection is based on the restrictions in Openwall.



==============================================================



protected_hardlinks:



A long-standing class of security issues is the hardlink-based
@@ -202,6 +222,22 @@ This protection is based on the restrictions in Openwall and grsecurity. 


==============================================================



protected_regular:



This protection is similar to protected_fifos, but it

avoids writes to an attacker-controlled regular file, where a program

expected to create one.



When set to "0", writing to regular files is unrestricted.



When set to "1" don't allow O_CREAT open on regular files that we

don't own in world writable sticky directories, unless they are

owned by the owner of the directory.



When set to "2" it also applies to group writable sticky directories.



==============================================================



protected_symlinks:



A long-standing class of security issues is the symlink-based

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11482,6 +11482,7 @@ F: arch/alpha/kernel/srm_env.c 


STABLE BRANCH

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

M:	Sasha Levin <sashal@kernel.org>

L:	stable@vger.kernel.org

S:	Supported

F:	Documentation/stable_kernel_rules.txt

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 141

SUBLEVEL = 142

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#

# Copyright (C) 1995-2001 by Russell King



LDFLAGS_vmlinux	:=-p --no-undefined -X

LDFLAGS_vmlinux	:=--no-undefined -X

CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)

GZFLAGS		:=-9

arch/powerpc/include/asm/io.h

+7 −13
Original line number Diff line number Diff line
@@ -333,19 +333,13 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src, 
 * their hooks, a bitfield is reserved for use by the platform near the

 * top of MMIO addresses (not PIO, those have to cope the hard way).

 *

 * This bit field is 12 bits and is at the top of the IO virtual

 * addresses PCI_IO_INDIRECT_TOKEN_MASK.

 * The highest address in the kernel virtual space are:

 *

 * The kernel virtual space is thus:

 *  d0003fffffffffff	# with Hash MMU

 *  c00fffffffffffff	# with Radix MMU

 *

 *  0xD000000000000000		: vmalloc

 *  0xD000080000000000		: PCI PHB IO space

 *  0xD000080080000000		: ioremap

 *  0xD0000fffffffffff		: end of ioremap region

 *

 * Since the top 4 bits are reserved as the region ID, we use thus

 * the next 12 bits and keep 4 bits available for the future if the

 * virtual address space is ever to be extended.

 * The top 4 bits are reserved as the region ID on hash, leaving us 8 bits

 * that can be used for the field.

 *

 * The direct IO mapping operations will then mask off those bits

 * before doing the actual access, though that only happen when
@@ -357,8 +351,8 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src, 
 */



#ifdef CONFIG_PPC_INDIRECT_MMIO

#define PCI_IO_IND_TOKEN_MASK	0x0fff000000000000ul

#define PCI_IO_IND_TOKEN_SHIFT	48

#define PCI_IO_IND_TOKEN_SHIFT	52

#define PCI_IO_IND_TOKEN_MASK	(0xfful << PCI_IO_IND_TOKEN_SHIFT)

#define PCI_FIX_ADDR(addr)						\

	((PCI_IO_ADDR)(((unsigned long)(addr)) & ~PCI_IO_IND_TOKEN_MASK))

#define PCI_GET_ADDR_TOKEN(addr)					\