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

Commit be9a6fdb authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14-p.85 (e48b7f2d) into msm-4.14"

parents 4721479c 154ef8e6

Documentation/admin-guide/kernel-parameters.txt

+5 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ 
			earlyprintk=serial[,0x...[,baudrate]]

			earlyprintk=ttySn[,baudrate]

			earlyprintk=dbgp[debugController#]

			earlyprintk=pciserial,bus:device.function[,baudrate]

			earlyprintk=pciserial[,force],bus:device.function[,baudrate]

			earlyprintk=xdbc[xhciController#]



			earlyprintk is useful when the kernel crashes before
@@ -1052,6 +1052,10 @@ 


			The sclp output can only be used on s390.



			The optional "force" to "pciserial" enables use of a

			PCI device even when its classcode is not of the

			UART class.



	edac_report=	[HW,EDAC] Control how to report EDAC event

			Format: {"on" | "off" | "force"}

			on: enable EDAC to report H/W event. May be overridden

Documentation/devicetree/bindings/net/can/holt_hi311x.txt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Example: 
		reg = <1>;

		clocks = <&clk32m>;

		interrupt-parent = <&gpio4>;

		interrupts = <13 IRQ_TYPE_EDGE_RISING>;

		interrupts = <13 IRQ_TYPE_LEVEL_HIGH>;

		vdd-supply = <&reg5v0>;

		xceiver-supply = <&reg5v0>;

	};

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

Documentation/x86/x86_64/mm.txt

+6 −4
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ Virtual memory map with 4 level page tables: 
0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm

hole caused by [47:63] sign extension

ffff800000000000 - ffff87ffffffffff (=43 bits) guard hole, reserved for hypervisor

ffff880000000000 - ffffc7ffffffffff (=64 TB) direct mapping of all phys. memory

ffffc80000000000 - ffffc8ffffffffff (=40 bits) hole

ffff880000000000 - ffff887fffffffff (=39 bits) LDT remap for PTI

ffff888000000000 - ffffc87fffffffff (=64 TB) direct mapping of all phys. memory

ffffc88000000000 - ffffc8ffffffffff (=39 bits) hole

ffffc90000000000 - ffffe8ffffffffff (=45 bits) vmalloc/ioremap space

ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole

ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)
@@ -30,8 +31,9 @@ Virtual memory map with 5 level page tables: 
0000000000000000 - 00ffffffffffffff (=56 bits) user space, different per mm

hole caused by [56:63] sign extension

ff00000000000000 - ff0fffffffffffff (=52 bits) guard hole, reserved for hypervisor

ff10000000000000 - ff8fffffffffffff (=55 bits) direct mapping of all phys. memory

ff90000000000000 - ff9fffffffffffff (=52 bits) LDT remap for PTI

ff10000000000000 - ff10ffffffffffff (=48 bits) LDT remap for PTI

ff11000000000000 - ff90ffffffffffff (=55 bits) direct mapping of all phys. memory

ff91000000000000 - ff9fffffffffffff (=3840 TB) hole

ffa0000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space (12800 TB)

ffd2000000000000 - ffd3ffffffffffff (=49 bits) hole

ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12662,6 +12662,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/process/stable-kernel-rules.rst