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

Commit f859eff5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 3e77ef3d 2dd73648

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);

}