Commit 2dd73648 authored Apr 25, 2018 by Chetan C R

Merge 'android-3.18.106' (c590c578) into 'msm-3.18'



Merge with google common 'android-3.18.106' at
c590c578 into 'msm-3.18'

* quic/tmp-c590c578:
  Linux 3.18.106
  fanotify: fix logic of events on child
  autofs: mount point create should honour passed in mode
  Don't leak MNT_INTERNAL away from internal mounts
  rpc_pipefs: fix double-dput()
  hypfs_kill_super(): deal with failed allocations
  jffs2_kill_sb(): deal with failed allocations
  powerpc/lib: Fix off-by-one in alternate feature patching
  MIPS: memset.S: Fix clobber of v1 in last_fixup
  MIPS: memset.S: Fix return of __clear_user from Lpartial_fixup
  MIPS: memset.S: EVA & fault support for small_memset
  HID: hidraw: Fix crash on HIDIOCGFEATURE with a destroyed device
  ALSA: rawmidi: Fix missing input substream checks in compat ioctls
  drm/radeon: Fix PCIe lane width calculation
  ext4: don't allow r/w mounts if metadata blocks overlap the superblock
  ext4: fail ext4_iget for root directory if unallocated
  ALSA: pcm: Fix endless loop for XRUN recovery in OSS emulation
  ALSA: pcm: Fix mutex unbalance in OSS emulation ioctls
  ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams
  ALSA: pcm: Avoid potential races between OSS ioctls and read/write
  ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation
  ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc
  watchdog: f71808e_wdt: Fix WD_EN register read
  thermal: imx: Fix race condition in imx_thermal_probe()
  clk: mvebu: armada-38x: add support for missing clocks
  clk: mvebu: armada-38x: add support for 1866MHz variants
  mmc: jz4740: Fix race condition in IRQ mask update
  jbd2: if the journal is aborted then don't allow update of the log tail
  random: use a tighter cap in credit_entropy_bits_safe()
  thunderbolt: Resume control channel after hibernation image is created
  ASoC: ssm2602: Replace reg_default_raw with reg_default
  powerpc/powernv: Fix OPAL NVRAM driver OPAL_BUSY loops
  powerpc/powernv: define a standard delay for OPAL_BUSY type retry loops
  powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently
  powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write()
  HID: i2c-hid: fix size check and type usage
  ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status()
  xen-netfront: Fix hang on device removal
  ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property
  resource: fix integer overflow at reallocation
  fs/reiserfs/journal.c: add missing resierfs_warning() arg
  ubi: Reject MLC NAND
  ubi: Fix error for write access
  ubifs: Check ubifs_wbuf_sync() return code
  slip: Check if rstate is initialized before uncompressing
  s390/ipl: ensure loadparm valid flag is set
  s390/qdio: don't merge ERROR output buffers
  s390/qdio: don't retry EQBS after CCQ 96
  parisc: Fix out of array access in match_pci_device()
  media: v4l2-compat-ioctl32: don't oops on overlay
  f2fs: check cap_resource only for data blocks
  Revert "f2fs: introduce f2fs_set_page_dirty_nobuffer"
  f2fs: clear PageError on writepage
  BACKPORT: dm verity: add 'check_at_most_once' option to only validate hashes once
  f2fs: call unlock_new_inode() before d_instantiate()
  f2fs: refactor read path to allow multiple postprocessing steps
  FROMLIST: fscrypt: allow synchronous bio decryption

USB related changes were ignored as per the feedback
from the USB team.

Change-Id: Ied04c9a2d44aa14ab54df6d31752c274e1cdccc3
Signed-off-by: Chetan C R <cravin@codeaurora.org>

parents 4a3f15e3 c590c578

Documentation/device-mapper/verity.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,17 @@ fec_start <offset>
		This is the offset, in <data_block_size> blocks, from the start of the
		FEC device to the beginning of the encoding data.

		check_at_most_once
		Verify data blocks only the first time they are read from the data device,
		rather than every time. This reduces the overhead of dm-verity so that it
		can be used on systems that are memory and/or CPU constrained. However, it
		provides a reduced level of security because only offline tampering of the
		data device's content will be detected, not online tampering.

		Hash blocks are still verified each time they are read from the hash device,
		since verification of hash blocks is less performance critical than data
		blocks, and a hash block will not be verified any more after all the data
		blocks it covers have been verified anyway.

		Theory of operation
		===================

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 18
		SUBLEVEL = 105
		SUBLEVEL = 106
		EXTRAVERSION =
		NAME = Diseased Newt

arch/arm/boot/dts/at91sam9g25.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		atmel,mux-mask = <
		/* A B C */
		0xffffffff 0xffe0399f 0xc000001c /* pioA */
		0x0007ffff 0x8000fe3f 0x00000000 /* pioB */
		0x0007ffff 0x00047e3f 0x00000000 /* pioB */
		0x80000000 0x07c0ffff 0xb83fffff /* pioC */
		0x003fffff 0x003f8000 0x00000000 /* pioD */
		>;

arch/mips/lib/memset.S

+8 −3

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@
		1: PTR_ADDIU a0, 1 /* fill bytewise */
		R10KCBARRIER(0(ra))
		bne t1, a0, 1b
		sb a1, -1(a0)
		EX(sb, a1, -1(a0), .Lsmall_fixup\@)

		2: jr ra /* done */
		move a2, zero
		@@ -204,13 +204,18 @@
		PTR_L t0, TI_TASK($28)
		andi a2, STORMASK
		LONG_L t0, THREAD_BUADDR(t0)
		LONG_ADDU a2, t1
		LONG_ADDU a2, a0
		jr ra
		LONG_SUBU a2, t0

		.Llast_fixup\@:
		jr ra
		andi v1, a2, STORMASK
		nop

		.Lsmall_fixup\@:
		PTR_SUBU a2, t1, a0
		jr ra
		PTR_ADDIU a2, 1

		.endm

arch/parisc/kernel/drivers.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -648,6 +648,10 @@ static int match_pci_device(struct device *dev, int index,
		(modpath->mod == PCI_FUNC(devfn)));
		}

		/* index might be out of bounds for bc[] */
		if (index >= 6)
		return 0;

		id = PCI_SLOT(pdev->devfn) \| (PCI_FUNC(pdev->devfn) << 5);
		return (modpath->bc[index] == id);
		}