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

Unverified Commit 8439e0dc authored by Nathan Chancellor's avatar Nathan Chancellor
Browse files

Merge 4.4.130 into kernel.lnx.4.4.r27-rel 



Changes in 4.4.130: (51 commits)
        cifs: do not allow creating sockets except with SMB1 posix exensions
        x86/tsc: Prevent 32bit truncation in calc_hpet_ref()
        perf: Return proper values for user stack errors
        staging: ion : Donnot wakeup kswapd in ion system alloc
        r8152: add Linksys USB3GIGV1 id
        Input: drv260x - fix initializing overdrive voltage
        ath9k_hw: check if the chip failed to wake up
        jbd2: fix use after free in kjournald2()
        Revert "ath10k: send (re)assoc peer command when NSS changed"
        s390: introduce CPU alternatives
        s390: enable CPU alternatives unconditionally
        KVM: s390: wire up bpb feature
        s390: scrub registers on kernel entry and KVM exit
        s390: add optimized array_index_mask_nospec
        s390/alternative: use a copy of the facility bit mask
        s390: add options to change branch prediction behaviour for the kernel
        s390: run user space and KVM guests with modified branch prediction
        s390: introduce execute-trampolines for branches
        s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*)
        s390: do not bypass BPENTER for interrupt system calls
        s390/entry.S: fix spurious zeroing of r0
        s390: move nobp parameter functions to nospec-branch.c
        s390: add automatic detection of the spectre defense
        s390: report spectre mitigation via syslog
        s390: add sysfs attributes for spectre
        s390: correct nospec auto detection init order
        s390: correct module section names for expoline code revert
        bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
        KEYS: DNS: limit the length of option strings
        l2tp: check sockaddr length in pppol2tp_connect()
        net: validate attribute sizes in neigh_dump_table()
        llc: delete timers synchronously in llc_sk_free()
        tcp: don't read out-of-bounds opsize
        team: avoid adding twice the same option to the event list
        team: fix netconsole setup over team
        packet: fix bitfield update race
        pppoe: check sockaddr length in pppoe_connect()
        vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi
        sctp: do not check port in sctp_inet6_cmp_addr
        llc: hold llc_sap before release_sock()
        llc: fix NULL pointer deref for SOCK_ZAPPED
        tipc: add policy for TIPC_NLA_NET_ADDR
        net: fix deadlock while clearing neighbor proxy table
        tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets
        net: af_packet: fix race in PACKET_{R|T}X_RING
        ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
        scsi: mptsas: Disable WRITE SAME
        cdrom: information leak in cdrom_ioctl_media_changed()
        s390/cio: update chpid descriptor after resource accessibility event
        s390/uprobes: implement arch_uretprobe_is_alive()
        Linux 4.4.130

Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>

Conflicts:
	drivers/staging/android/ion/ion_system_heap.c
	net/ipv6/route.c
parents ca1576b2 34a220d5

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -2418,6 +2418,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	noalign		[KNL,ARM]



	noaltinstr	[S390] Disables alternative instructions patching

			(CPU alternatives feature).



	noapic		[SMP,APIC] Tells the kernel to not make use of any

			IOAPICs that may be present in the system.

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 129

SUBLEVEL = 130

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/s390/Kconfig

+47 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ config S390 
	select GENERIC_CLOCKEVENTS

	select GENERIC_CPU_AUTOPROBE

	select GENERIC_CPU_DEVICES if !SMP

	select GENERIC_CPU_VULNERABILITIES

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL
@@ -706,6 +707,51 @@ config SECCOMP 


	  If unsure, say Y.



config KERNEL_NOBP

	def_bool n

	prompt "Enable modified branch prediction for the kernel by default"

	help

	  If this option is selected the kernel will switch to a modified

	  branch prediction mode if the firmware interface is available.

	  The modified branch prediction mode improves the behaviour in

	  regard to speculative execution.



	  With the option enabled the kernel parameter "nobp=0" or "nospec"

	  can be used to run the kernel in the normal branch prediction mode.



	  With the option disabled the modified branch prediction mode is

	  enabled with the "nobp=1" kernel parameter.



	  If unsure, say N.



config EXPOLINE

	def_bool n

	prompt "Avoid speculative indirect branches in the kernel"

	help

	  Compile the kernel with the expoline compiler options to guard

	  against kernel-to-user data leaks by avoiding speculative indirect

	  branches.

	  Requires a compiler with -mindirect-branch=thunk support for full

	  protection. The kernel may run slower.



	  If unsure, say N.



choice

	prompt "Expoline default"

	depends on EXPOLINE

	default EXPOLINE_FULL



config EXPOLINE_OFF

	bool "spectre_v2=off"



config EXPOLINE_AUTO

	bool "spectre_v2=auto"



config EXPOLINE_FULL

	bool "spectre_v2=on"



endchoice



endmenu



menu "Power Management"
@@ -755,6 +801,7 @@ config PFAULT 
config SHARED_KERNEL

	bool "VM shared kernel support"

	depends on !JUMP_LABEL

	depends on !ALTERNATIVES

	help

	  Select this option, if you want to share the text segment of the

	  Linux kernel between different VM guests. This reduces memory

arch/s390/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -77,6 +77,16 @@ ifeq ($(call cc-option-yn,-mwarn-dynamicstack),y) 
cflags-$(CONFIG_WARN_DYNAMIC_STACK) += -mwarn-dynamicstack

endif



ifdef CONFIG_EXPOLINE

  ifeq ($(call cc-option-yn,$(CC_FLAGS_MARCH) -mindirect-branch=thunk),y)

    CC_FLAGS_EXPOLINE := -mindirect-branch=thunk

    CC_FLAGS_EXPOLINE += -mfunction-return=thunk

    CC_FLAGS_EXPOLINE += -mindirect-branch-table

    export CC_FLAGS_EXPOLINE

    cflags-y += $(CC_FLAGS_EXPOLINE) -DCC_USING_EXPOLINE

  endif

endif



ifdef CONFIG_FUNCTION_TRACER

# make use of hotpatch feature if the compiler supports it

cc_hotpatch	:= -mhotpatch=0,3

arch/s390/include/asm/alternative.h

0 → 100644
+149 −0
Original line number Diff line number Diff line 
#ifndef _ASM_S390_ALTERNATIVE_H

#define _ASM_S390_ALTERNATIVE_H



#ifndef __ASSEMBLY__



#include <linux/types.h>

#include <linux/stddef.h>

#include <linux/stringify.h>



struct alt_instr {

	s32 instr_offset;	/* original instruction */

	s32 repl_offset;	/* offset to replacement instruction */

	u16 facility;		/* facility bit set for replacement */

	u8  instrlen;		/* length of original instruction */

	u8  replacementlen;	/* length of new instruction */

} __packed;



void apply_alternative_instructions(void);

void apply_alternatives(struct alt_instr *start, struct alt_instr *end);



/*

 * |661:       |662:	  |6620      |663:

 * +-----------+---------------------+

 * | oldinstr  | oldinstr_padding    |

 * |	       +----------+----------+

 * |	       |	  |	     |

 * |	       | >6 bytes |6/4/2 nops|

 * |	       |6 bytes jg----------->

 * +-----------+---------------------+

 *		 ^^ static padding ^^

 *

 * .altinstr_replacement section

 * +---------------------+-----------+

 * |6641:			     |6651:

 * | alternative instr 1	     |

 * +-----------+---------+- - - - - -+

 * |6642:		 |6652:      |

 * | alternative instr 2 | padding

 * +---------------------+- - - - - -+

 *			  ^ runtime ^

 *

 * .altinstructions section

 * +---------------------------------+

 * | alt_instr entries for each      |

 * | alternative instr		     |

 * +---------------------------------+

 */



#define b_altinstr(num)	"664"#num

#define e_altinstr(num)	"665"#num



#define e_oldinstr_pad_end	"663"

#define oldinstr_len		"662b-661b"

#define oldinstr_total_len	e_oldinstr_pad_end"b-661b"

#define altinstr_len(num)	e_altinstr(num)"b-"b_altinstr(num)"b"

#define oldinstr_pad_len(num) \

	"-(((" altinstr_len(num) ")-(" oldinstr_len ")) > 0) * " \

	"((" altinstr_len(num) ")-(" oldinstr_len "))"



#define INSTR_LEN_SANITY_CHECK(len)					\

	".if " len " > 254\n"						\

	"\t.error \"cpu alternatives does not support instructions "	\

		"blocks > 254 bytes\"\n"				\

	".endif\n"							\

	".if (" len ") %% 2\n"						\

	"\t.error \"cpu alternatives instructions length is odd\"\n"	\

	".endif\n"



#define OLDINSTR_PADDING(oldinstr, num)					\

	".if " oldinstr_pad_len(num) " > 6\n"				\

	"\tjg " e_oldinstr_pad_end "f\n"				\

	"6620:\n"							\

	"\t.fill (" oldinstr_pad_len(num) " - (6620b-662b)) / 2, 2, 0x0700\n" \

	".else\n"							\

	"\t.fill " oldinstr_pad_len(num) " / 6, 6, 0xc0040000\n"	\

	"\t.fill " oldinstr_pad_len(num) " %% 6 / 4, 4, 0x47000000\n"	\

	"\t.fill " oldinstr_pad_len(num) " %% 6 %% 4 / 2, 2, 0x0700\n"	\

	".endif\n"



#define OLDINSTR(oldinstr, num)						\

	"661:\n\t" oldinstr "\n662:\n"					\

	OLDINSTR_PADDING(oldinstr, num)					\

	e_oldinstr_pad_end ":\n"					\

	INSTR_LEN_SANITY_CHECK(oldinstr_len)



#define OLDINSTR_2(oldinstr, num1, num2)				\

	"661:\n\t" oldinstr "\n662:\n"					\

	".if " altinstr_len(num1) " < " altinstr_len(num2) "\n"		\

	OLDINSTR_PADDING(oldinstr, num2)				\

	".else\n"							\

	OLDINSTR_PADDING(oldinstr, num1)				\

	".endif\n"							\

	e_oldinstr_pad_end ":\n"					\

	INSTR_LEN_SANITY_CHECK(oldinstr_len)



#define ALTINSTR_ENTRY(facility, num)					\

	"\t.long 661b - .\n"			/* old instruction */	\

	"\t.long " b_altinstr(num)"b - .\n"	/* alt instruction */	\

	"\t.word " __stringify(facility) "\n"	/* facility bit    */	\

	"\t.byte " oldinstr_total_len "\n"	/* source len	   */	\

	"\t.byte " altinstr_len(num) "\n"	/* alt instruction len */



#define ALTINSTR_REPLACEMENT(altinstr, num)	/* replacement */	\

	b_altinstr(num)":\n\t" altinstr "\n" e_altinstr(num) ":\n"	\

	INSTR_LEN_SANITY_CHECK(altinstr_len(num))



/* alternative assembly primitive: */

#define ALTERNATIVE(oldinstr, altinstr, facility) \

	".pushsection .altinstr_replacement, \"ax\"\n"			\

	ALTINSTR_REPLACEMENT(altinstr, 1)				\

	".popsection\n"							\

	OLDINSTR(oldinstr, 1)						\

	".pushsection .altinstructions,\"a\"\n"				\

	ALTINSTR_ENTRY(facility, 1)					\

	".popsection\n"



#define ALTERNATIVE_2(oldinstr, altinstr1, facility1, altinstr2, facility2)\

	".pushsection .altinstr_replacement, \"ax\"\n"			\

	ALTINSTR_REPLACEMENT(altinstr1, 1)				\

	ALTINSTR_REPLACEMENT(altinstr2, 2)				\

	".popsection\n"							\

	OLDINSTR_2(oldinstr, 1, 2)					\

	".pushsection .altinstructions,\"a\"\n"				\

	ALTINSTR_ENTRY(facility1, 1)					\

	ALTINSTR_ENTRY(facility2, 2)					\

	".popsection\n"



/*

 * Alternative instructions for different CPU types or capabilities.

 *

 * This allows to use optimized instructions even on generic binary

 * kernels.

 *

 * oldinstr is padded with jump and nops at compile time if altinstr is

 * longer. altinstr is padded with jump and nops at run-time during patching.

 *

 * For non barrier like inlines please define new variants

 * without volatile and memory clobber.

 */

#define alternative(oldinstr, altinstr, facility)			\

	asm volatile(ALTERNATIVE(oldinstr, altinstr, facility) : : : "memory")



#define alternative_2(oldinstr, altinstr1, facility1, altinstr2, facility2) \

	asm volatile(ALTERNATIVE_2(oldinstr, altinstr1, facility1,	    \

				   altinstr2, facility2) ::: "memory")



#endif /* __ASSEMBLY__ */



#endif /* _ASM_S390_ALTERNATIVE_H */