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

Commit a56988d5 authored by Tengfei Fan's avatar Tengfei Fan
Browse files

Merge commit android-4.9.171 (3383326b) into msm-4.9 



* refs/heads/tmp-3383326b:
  Linux 4.9.171
  kernel/sysctl.c: fix out-of-bounds access when setting file-max
  Revert "locking/lockdep: Add debug_locks check in __lock_downgrade()"
  i2c-hid: properly terminate i2c_hid_dmi_desc_override_table[] array
  percpu: stop printing kernel addresses
  ALSA: info: Fix racy addition/deletion of nodes
  mm/vmstat.c: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n
  device_cgroup: fix RCU imbalance in error case
  sched/fair: Limit sched_cfs_period_timer() loop to avoid hard lockup
  Revert "kbuild: use -Oz instead of -Os when using clang"
  perf/x86/amd: Add event map for AMD Family 17h
  mac80211: do not call driver wake_tx_queue op during reconfig
  rt2x00: do not increment sequence number while re-transmitting
  kprobes: Fix error check when reusing optimized probes
  kprobes: Mark ftrace mcount handler functions nokprobe
  x86/kprobes: Verify stack frame on kretprobe
  arm64: futex: Restore oldval initialization to work around buggy compilers
  crypto: x86/poly1305 - fix overflow during partial reduction
  Revert "svm: Fix AVIC incomplete IPI emulation"
  Revert "scsi: fcoe: clear FC_RP_STARTED flags when receiving a LOGO"
  ALSA: core: Fix card races between register and disconnect
  staging: comedi: ni_usb6501: Fix possible double-free of ->usb_rx_buf
  staging: comedi: ni_usb6501: Fix use of uninitialized mutex
  staging: comedi: vmk80xx: Fix possible double-free of ->usb_rx_buf
  staging: comedi: vmk80xx: Fix use of uninitialized semaphore
  io: accel: kxcjk1013: restore the range after resume.
  iio: adc: at91: disable adc channel interrupt in timeout case
  iio: ad_sigma_delta: select channel when reading register
  iio/gyro/bmg160: Use millidegrees for temperature scale
  staging: iio: ad7192: Fix ad7193 channel address
  KVM: x86: Don't clear EFER during SMM transitions for 32-bit vCPU
  CIFS: keep FileInfo handle live during oplock break
  tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is incomplete
  modpost: file2alias: check prototype of handler
  modpost: file2alias: go back to simple devtable lookup
  mmc: sdhci: Fix data command CRC error handling
  crypto: crypto4xx - properly set IV after de- and encrypt
  ipv4: ensure rcu_read_lock() in ipv4_link_failure()
  ipv4: recompile ip options in ipv4_link_failure
  vhost: reject zero size iova range
  team: set slave to promisc if team is already in promisc mode
  tcp: tcp_grow_window() needs to respect tcp_space()
  net: fou: do not use guehdr after iptunnel_pull_offloads in gue_udp_recv
  net: bridge: multicast: use rcu to access port list from br_multicast_start_querier
  net: bridge: fix per-port af_packet sockets
  net: atm: Fix potential Spectre v1 vulnerabilities
  bonding: fix event handling for stacked bonds
  UPSTREAM: usb: hcd: use correct device pointer for dma ops
  UPSTREAM: usb: host: ehci: use correct device pointer for dma ops
  UPSTREAM: usb: separate out sysdev pointer from usb_bus
  ANDROID: cuttlefish_defconfig: Enable CONFIG_XFRM_STATISTICS

Conflicts:
	drivers/mmc/host/sdhci.c

Change-Id: I32202324feae8830306f9a6b56b43392cd076fcd
Signed-off-by: default avatarTengfei Fan <tengfeif@codeaurora.org>
parents 7b323f5e 3383326b

Makefile

+2 −3
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 170

SUBLEVEL = 171

EXTRAVERSION =

NAME = Roaring Lionus
@@ -747,8 +747,7 @@ export DISABLE_CFI 
endif



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= $(call cc-option,-Oz,-Os)

KBUILD_CFLAGS	+= $(call cc-disable-warning,maybe-uninitialized,)

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)

else

ifdef CONFIG_PROFILE_ALL_BRANCHES

KBUILD_CFLAGS	+= -O2 $(call cc-disable-warning,maybe-uninitialized,)

arch/arm64/configs/cuttlefish_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

arch/x86/configs/x86_64_cuttlefish_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

arch/x86/crypto/poly1305-avx2-x86_64.S

+10 −4
Original line number Diff line number Diff line
@@ -321,6 +321,12 @@ ENTRY(poly1305_4block_avx2) 
	vpaddq		t2,t1,t1

	vmovq		t1x,d4



	# Now do a partial reduction mod (2^130)-5, carrying h0 -> h1 -> h2 ->

	# h3 -> h4 -> h0 -> h1 to get h0,h2,h3,h4 < 2^26 and h1 < 2^26 + a small

	# amount.  Careful: we must not assume the carry bits 'd0 >> 26',

	# 'd1 >> 26', 'd2 >> 26', 'd3 >> 26', and '(d4 >> 26) * 5' fit in 32-bit

	# integers.  It's true in a single-block implementation, but not here.



	# d1 += d0 >> 26

	mov		d0,%rax

	shr		$26,%rax
@@ -359,16 +365,16 @@ ENTRY(poly1305_4block_avx2) 
	# h0 += (d4 >> 26) * 5

	mov		d4,%rax

	shr		$26,%rax

	lea		(%eax,%eax,4),%eax

	add		%eax,%ebx

	lea		(%rax,%rax,4),%rax

	add		%rax,%rbx

	# h4 = d4 & 0x3ffffff

	mov		d4,%rax

	and		$0x3ffffff,%eax

	mov		%eax,h4



	# h1 += h0 >> 26

	mov		%ebx,%eax

	shr		$26,%eax

	mov		%rbx,%rax

	shr		$26,%rax

	add		%eax,h1

	# h0 = h0 & 0x3ffffff

	andl		$0x3ffffff,%ebx

arch/x86/crypto/poly1305-sse2-x86_64.S

+14 −8
Original line number Diff line number Diff line
@@ -251,16 +251,16 @@ ENTRY(poly1305_block_sse2) 
	# h0 += (d4 >> 26) * 5

	mov		d4,%rax

	shr		$26,%rax

	lea		(%eax,%eax,4),%eax

	add		%eax,%ebx

	lea		(%rax,%rax,4),%rax

	add		%rax,%rbx

	# h4 = d4 & 0x3ffffff

	mov		d4,%rax

	and		$0x3ffffff,%eax

	mov		%eax,h4



	# h1 += h0 >> 26

	mov		%ebx,%eax

	shr		$26,%eax

	mov		%rbx,%rax

	shr		$26,%rax

	add		%eax,h1

	# h0 = h0 & 0x3ffffff

	andl		$0x3ffffff,%ebx
@@ -518,6 +518,12 @@ ENTRY(poly1305_2block_sse2) 
	paddq		t2,t1

	movq		t1,d4



	# Now do a partial reduction mod (2^130)-5, carrying h0 -> h1 -> h2 ->

	# h3 -> h4 -> h0 -> h1 to get h0,h2,h3,h4 < 2^26 and h1 < 2^26 + a small

	# amount.  Careful: we must not assume the carry bits 'd0 >> 26',

	# 'd1 >> 26', 'd2 >> 26', 'd3 >> 26', and '(d4 >> 26) * 5' fit in 32-bit

	# integers.  It's true in a single-block implementation, but not here.



	# d1 += d0 >> 26

	mov		d0,%rax

	shr		$26,%rax
@@ -556,16 +562,16 @@ ENTRY(poly1305_2block_sse2) 
	# h0 += (d4 >> 26) * 5

	mov		d4,%rax

	shr		$26,%rax

	lea		(%eax,%eax,4),%eax

	add		%eax,%ebx

	lea		(%rax,%rax,4),%rax

	add		%rax,%rbx

	# h4 = d4 & 0x3ffffff

	mov		d4,%rax

	and		$0x3ffffff,%eax

	mov		%eax,h4



	# h1 += h0 >> 26

	mov		%ebx,%eax

	shr		$26,%eax

	mov		%rbx,%rax

	shr		$26,%rax

	add		%eax,h1

	# h0 = h0 & 0x3ffffff

	andl		$0x3ffffff,%ebx