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

Commit 7e061af6 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4' 



* refs/heads/9796ea8f
  Linux 4.4.67
  dm ioctl: prevent stack leak in dm ioctl call
  nfsd: stricter decoding of write-like NFSv2/v3 ops
  nfsd4: minor NFSv2/v3 write decoding cleanup
  ext4/fscrypto: avoid RCU lookup in d_revalidate
  ext4 crypto: use dget_parent() in ext4_d_revalidate()
  ext4 crypto: revalidate dentry after adding or removing the key
  ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY
  IB/ehca: fix maybe-uninitialized warnings
  IB/qib: rename BITS_PER_PAGE to RVT_BITS_PER_PAGE
  netlink: Allow direct reclaim for fallback allocation
  8250_pci: Fix potential use-after-free in error path
  scsi: cxlflash: Improve EEH recovery time
  scsi: cxlflash: Fix to avoid EEH and host reset collisions
  scsi: cxlflash: Scan host only after the port is ready for I/O
  net: tg3: avoid uninitialized variable warning
  mtd: avoid stack overflow in MTD CFI code
  drbd: avoid redefinition of BITS_PER_PAGE
  ALSA: ppc/awacs: shut up maybe-uninitialized warning
  ASoC: intel: Fix PM and non-atomic crash in bytcr drivers
  Handle mismatched open calls
  timerfd: Protect the might cancel mechanism proper
  ANDROID: android-base.cfg: remove USB_OTG_WAKELOCK
  ANDROID: android-base.cfg: remove defunct options
  ANDROID: arm64: suspend: Restore the UAO state
  ANDROID: usb: gadget: f_audio_source: disable the CPU C-states upon playback
  ANDROID: usb: gadget: f_mtp: Set 0xFFFFFFFF in mtp header ContainerLength field

Conflicts:
	drivers/usb/gadget/function/f_mtp.c
	fs/ext4/crypto.c

Change-Id: I408054176798ba49f0b62fb46a3b0d59060d108e
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 78cf4322 9796ea8f

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 66

SUBLEVEL = 67

EXTRAVERSION =

NAME = Blurry Fish Butt

android/configs/android-base.cfg

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ CONFIG_HIGH_RES_TIMERS=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_INET6_AH=y

CONFIG_INET6_DIAG_DESTROY=y

CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_INET=y
@@ -72,7 +71,6 @@ CONFIG_MODVERSIONS=y 
CONFIG_NET=y

CONFIG_NETDEVICES=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_TPROXY=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -173,5 +171,4 @@ CONFIG_USB_CONFIGFS_F_MTP=y 
CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_GADGET=y

CONFIG_USB_OTG_WAKELOCK=y

CONFIG_XFRM_USER=y

arch/arm64/include/asm/exec.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#ifndef __ASM_EXEC_H

#define __ASM_EXEC_H



#include <linux/sched.h>



extern unsigned long arch_align_stack(unsigned long sp);

void uao_thread_switch(struct task_struct *next);



#endif	/* __ASM_EXEC_H */

arch/arm64/kernel/process.c

+2 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <asm/alternative.h>

#include <asm/compat.h>

#include <asm/cacheflush.h>

#include <asm/exec.h>

#include <asm/fpsimd.h>

#include <asm/mmu_context.h>

#include <asm/processor.h>
@@ -383,7 +384,7 @@ static void tls_thread_switch(struct task_struct *next) 
}



/* Restore the UAO state depending on next's addr_limit */

static void uao_thread_switch(struct task_struct *next)

void uao_thread_switch(struct task_struct *next)

{

	if (IS_ENABLED(CONFIG_ARM64_UAO)) {

		if (task_thread_info(next)->addr_limit == KERNEL_DS)

arch/arm64/kernel/suspend.c

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <asm/cacheflush.h>

#include <asm/cpufeature.h>

#include <asm/debug-monitors.h>

#include <asm/exec.h>

#include <asm/pgtable.h>

#include <asm/memory.h>

#include <asm/mmu_context.h>
@@ -95,6 +96,7 @@ int cpu_suspend(unsigned long arg, int (*fn)(unsigned long)) 
		 */

		asm(ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_HAS_PAN,

				CONFIG_ARM64_PAN));

		uao_thread_switch(current);



		/*

		 * Restore HW breakpoint registers to sane values