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

Commit a06206db authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.199(dcb71b3f) into msm-4.9 



* refs/heads/tmp-dcb71b3f:
  Linux 4.9.199
  Revert "ALSA: hda: Flush interrupts on disabling"
  ALSA: timer: Fix mutex deadlock at releasing card
  ALSA: timer: Simplify error path in snd_timer_open()
  ALSA: timer: Limit max instances per timer
  ALSA: timer: Follow standard EXPORT_SYMBOL() declarations
  xfs: Correctly invert xfs_buftarg LRU isolation logic
  sctp: not bind the socket in sctp_connect
  sctp: fix the issue that flags are ignored when using kernel_connect
  sch_netem: fix rcu splat in netem_enqueue()
  net: usb: sr9800: fix uninitialized local variable
  bonding: fix potential NULL deref in bond_update_slave_arr
  llc: fix sk_buff leak in llc_conn_service()
  llc: fix sk_buff leak in llc_sap_state_process()
  dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle
  rtlwifi: Fix potential overflow on P2P code
  s390/cmm: fix information leak in cmm_timeout_handler()
  nl80211: fix validation of mesh path nexthop
  HID: fix error message in hid_open_report()
  HID: Fix assumption that devices have inputs
  HID: i2c-hid: add Trekstor Primebook C11B to descriptor override
  USB: serial: whiteheat: fix line-speed endianness
  USB: serial: whiteheat: fix potential slab corruption
  USB: ldusb: fix control-message timeout
  USB: ldusb: fix ring-buffer locking
  usb-storage: Revert commit 747668dbc061 ("usb-storage: Set virt_boundary_mask to avoid SG overflows")
  USB: gadget: Reject endpoints with 0 maxpacket value
  UAS: Revert commit 3ae62a42090f ("UAS: fix alignment of scatter/gather segments")
  ALSA: bebob: Fix prototype of helper function to return negative value
  fuse: truncate pending writes on O_TRUNC
  fuse: flush dirty data/metadata before non-truncate setattr
  ath6kl: fix a NULL-ptr-deref bug in ath6kl_usb_alloc_urb_from_pipe()
  thunderbolt: Use 32-bit writes when writing ring producer/consumer
  USB: legousbtower: fix a signedness bug in tower_probe()
  tracing: Initialize iter->seq after zeroing in tracing_read_pipe()
  s390/uaccess: avoid (false positive) compiler warnings
  NFSv4: Fix leak of clp->cl_acceptor string
  MIPS: fw: sni: Fix out of bounds init of o32 stack
  fs: ocfs2: fix a possible null-pointer dereference in ocfs2_info_scan_inode_alloc()
  fs: ocfs2: fix a possible null-pointer dereference in ocfs2_write_end_nolock()
  fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()
  ocfs2: clear zero in unaligned direct IO
  efi/x86: Do not clean dummy variable in kexec path
  efi/cper: Fix endianness of PCIe class code
  serial: mctrl_gpio: Check for NULL pointer
  fs: cifs: mute -Wunused-const-variable message
  gpio: max77620: Use correct unit for debounce times
  RDMA/iwcm: Fix a lock inversion issue
  staging: rtl8188eu: fix null dereference when kzalloc fails
  perf jevents: Fix period for Intel fixed counters
  perf map: Fix overlapped map handling
  iio: fix center temperature of bmc150-accel-core
  exec: load_script: Do not exec truncated interpreter path
  rtc: pcf8523: set xtal load capacitance from DT
  usb: handle warm-reset port requests on hub resume
  scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks
  HID: i2c-hid: Add Odys Winbook 13 to descriptor override
  x86/cpu: Add Atom Tremont (Jacobsville)
  HID: i2c-hid: add Direkt-Tek DTLAPY133-1 to descriptor override
  sc16is7xx: Fix for "Unexpected interrupt: 8"
  dm: Use kzalloc for all structs with embedded biosets/mempools
  dm snapshot: rework COW throttling to fix deadlock
  dm snapshot: introduce account_start_copy() and account_end_copy()
  dm snapshot: use mutex instead of rw_semaphore
  binder: binder: fix possible UAF when freeing buffer
  BACKPORT: dm bufio: introduce a global cache replacement
  BACKPORT: dm bufio: remove old-style buffer cleanup
  BACKPORT: dm bufio: introduce a global queue
  BACKPORT: dm bufio: refactor adjust_total_allocated
  BACKPORT: dm bufio: call adjust_total_allocated from __link_buffer and __unlink_buffer
  cuttlefish-4.9: Enable CONFIG_DM_SNAPSHOT

Change-Id: I020417869bc3a936613420c502a9aa0b06e5deb4
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents 9aec3ce1 dcb71b3f

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 198

SUBLEVEL = 199

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm64/configs/cuttlefish_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ CONFIG_SCSI_VIRTIO=y 
CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_SNAPSHOT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y

arch/mips/fw/sni/sniprom.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


/* O32 stack has to be 8-byte aligned. */

static u64 o32_stk[4096];

#define O32_STK	  &o32_stk[sizeof(o32_stk)]

#define O32_STK	  (&o32_stk[ARRAY_SIZE(o32_stk)])



#define __PROM_O32(fun, arg) fun arg __asm__(#fun); \

				     __asm__(#fun " = call_o32")

arch/s390/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ unsigned long __must_check __copy_to_user(void __user *to, const void *from, 
	__rc;							\

})



static inline int __put_user_fn(void *x, void __user *ptr, unsigned long size)

static __always_inline int __put_user_fn(void *x, void __user *ptr, unsigned long size)

{

	unsigned long spec = 0x810000UL;

	int rc;
@@ -181,7 +181,7 @@ static inline int __put_user_fn(void *x, void __user *ptr, unsigned long size) 
	return rc;

}



static inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size)

static __always_inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size)

{

	unsigned long spec = 0x81UL;

	int rc;

arch/s390/mm/cmm.c

+6 −6
Original line number Diff line number Diff line
@@ -306,16 +306,16 @@ static int cmm_timeout_handler(struct ctl_table *ctl, int write, 
	}



	if (write) {

		len = *lenp;

		if (copy_from_user(buf, buffer,

				   len > sizeof(buf) ? sizeof(buf) : len))

		len = min(*lenp, sizeof(buf));

		if (copy_from_user(buf, buffer, len))

			return -EFAULT;

		buf[sizeof(buf) - 1] = '\0';

		buf[len - 1] = '\0';

		cmm_skip_blanks(buf, &p);

		nr = simple_strtoul(p, &p, 0);

		cmm_skip_blanks(p, &p);

		seconds = simple_strtoul(p, &p, 0);

		cmm_set_timeout(nr, seconds);

		*ppos += *lenp;

	} else {

		len = sprintf(buf, "%ld %ld\n",

			      cmm_timeout_pages, cmm_timeout_seconds);
@@ -323,9 +323,9 @@ static int cmm_timeout_handler(struct ctl_table *ctl, int write, 
			len = *lenp;

		if (copy_to_user(buffer, buf, len))

			return -EFAULT;

	}

		*lenp = len;

		*ppos += len;

	}

	return 0;

}