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

Commit 5cf2fb4e authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.19-stable.152 (13abe236) into msm-4.19 



* refs/heads/tmp-13abe236:
  Linux 4.19.152
  crypto: qat - check cipher length for aead AES-CBC-HMAC-SHA
  crypto: bcm - Verify GCM/CCM key length in setkey
  drivers/net/ethernet/marvell/mvmdio.c: Fix non OF case
  reiserfs: Fix oops during mount
  reiserfs: Initialize inode keys properly
  USB: serial: ftdi_sio: add support for FreeCalypso JTAG+UART adapters
  USB: serial: pl2303: add device-id for HP GC device
  staging: comedi: check validity of wMaxPacketSize of usb endpoints found
  USB: serial: option: Add Telit FT980-KS composition
  USB: serial: option: add Cellient MPL200 card
  media: usbtv: Fix refcounting mixup
  Bluetooth: Disconnect if E0 is used for Level 4
  Bluetooth: Fix update of connection state in `hci_encrypt_cfm`
  Bluetooth: Consolidate encryption handling in hci_encrypt_cfm
  Bluetooth: MGMT: Fix not checking if BT_HS is enabled
  Bluetooth: L2CAP: Fix calling sk_filter on non-socket based channel
  Bluetooth: A2MP: Fix not initializing all members
  ARM: 8867/1: vdso: pass --be8 to linker if necessary
  ARM: 8939/1: kbuild: use correct nm executable
  ARM: 8858/1: vdso: use $(LD) instead of $(CC) to link VDSO
  perf cs-etm: Move definition of 'traceid_list' global variable from header file
  FROMLIST: arm64: vdso32: Allow ld.lld to properly link the VDSO
  Linux 4.19.151
  net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails
  mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged
  mmc: core: don't set limits.discard_granularity as 0
  perf: Fix task_function_call() error handling
  rxrpc: Fix server keyring leak
  rxrpc: Fix some missing _bh annotations on locking conn->state_lock
  rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read()
  rxrpc: Fix rxkad token xdr encoding
  net/mlx5e: Fix VLAN create flow
  net/mlx5e: Fix VLAN cleanup flow
  net: usb: ax88179_178a: fix missing stop entry in driver_info
  mdio: fix mdio-thunder.c dependency & build error
  bonding: set dev->needed_headroom in bond_setup_by_slave()
  xfrm: Use correct address family in xfrm_state_find
  platform/x86: fix kconfig dependency warning for FUJITSU_LAPTOP
  net: stmmac: removed enabling eee in EEE set callback
  xfrm: clone whole liftime_cur structure in xfrm_do_migrate
  xfrm: clone XFRMA_SEC_CTX in xfrm_do_migrate
  xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate
  xfrm: clone XFRMA_SET_MARK in xfrm_do_migrate
  drm/amdgpu: prevent double kfree ttm->sg
  openvswitch: handle DNAT tuple collision
  net: team: fix memory leak in __team_options_register
  team: set dev->needed_headroom in team_setup_by_port()
  sctp: fix sctp_auth_init_hmacs() error path
  i2c: owl: Clear NACK and BUS error bits
  i2c: meson: fixup rate calculation with filter delay
  i2c: meson: fix clock setting overwrite
  cifs: Fix incomplete memory allocation on setxattr path
  xfrmi: drop ignore_df check before updating pmtu
  mm/khugepaged: fix filemap page_to_pgoff(page) != offset
  macsec: avoid use-after-free in macsec_handle_frame()
  nvme-core: put ctrl ref when module ref get fail
  arm64: dts: stratix10: add status to qspi dts node
  mtd: rawnand: sunxi: Fix the probe error path
  i2c: i801: Exclude device from suspend direct complete optimization
  perf top: Fix stdio interface input handling with glibc 2.28+
  driver core: Fix probe_count imbalance in really_probe()
  platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse
  platform/x86: intel-vbtn: Switch to an allow-list for SW_TABLET_MODE reporting
  platform/x86: thinkpad_acpi: initialize tp_nvram_state variable
  platform/x86: intel-vbtn: Fix SW_TABLET_MODE always reporting 1 on the HP Pavilion 11 x360
  usermodehelper: reset umask to default before executing user process
  drm/nouveau/mem: guard against NULL pointer access in mem_del
  net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key()
  Revert "ravb: Fixed to be able to unload modules"
  fbcon: Fix global-out-of-bounds read in fbcon_get_font()
  Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts
  fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h
  Linux 4.19.150
  netfilter: ctnetlink: add a range check for l3/l4 protonum
  ep_create_wakeup_source(): dentry name can change under you...
  epoll: EPOLL_CTL_ADD: close the race in decision to take fast path
  epoll: replace ->visited/visited_list with generation count
  epoll: do not insert into poll queues until all sanity checks are done
  net/packet: fix overflow in tpacket_rcv
  mm: don't rely on system state to detect hot-plug operations
  mm: replace memmap_context by meminit_context
  random32: Restore __latent_entropy attribute on net_rand_state
  Input: trackpoint - enable Synaptics trackpoints
  i2c: cpm: Fix i2c_ram structure
  iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate()
  clk: samsung: exynos4: mark 'chipid' clock as CLK_IGNORE_UNUSED
  nfs: Fix security label length not being reset
  pinctrl: mvebu: Fix i2c sda definition for 98DX3236
  gpio: sprd: Clear interrupt when setting the type as edge
  nvme-fc: fail new connections to a deleted host or remote port
  spi: fsl-espi: Only process interrupts for expected events
  mac80211: do not allow bigger VHT MPDUs than the hardware supports
  drivers/net/wan/hdlc: Set skb->protocol before transmitting
  drivers/net/wan/lapbether: Make skb->protocol consistent with the header
  nvme-core: get/put ctrl and transport module in nvme_dev_open/release()
  rndis_host: increase sleep time in the query-response loop
  net: dec: de2104x: Increase receive ring size for Tulip
  drm/sun4i: mixer: Extend regmap max_register
  drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices
  drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config
  ftrace: Move RCU is watching check after recursion check
  Input: i8042 - add nopnp quirk for Acer Aspire 5 A515
  net: virtio_vsock: Enhance connection semantics
  vsock/virtio: add transport parameter to the virtio_transport_reset_no_sock()
  vsock/virtio: stop workers during the .remove()
  vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock
  clk: socfpga: stratix10: fix the divider for the emac_ptp_free_clk
  gpio: tc35894: fix up tc35894 interrupt configuration
  gpio: mockup: fix resource leak in error path
  USB: gadget: f_ncm: Fix NDP16 datagram validation
  mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models
  ANDROID: use arm-linux-androidkernel- for CROSS_COMPILE_COMPAT
  ANDROID: build.config.common: enable LLVM=1

Change-Id: I6e694123520bede70e7216a0c909560f0cd2ba59
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 5ca1f513 13abe236

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 149

SUBLEVEL = 152

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin -I$(obj) 
asflags-y := -DZIMAGE



# Supply kernel BSS size to the decompressor via a linker symbol.

KBSS_SZ = $(shell echo $$(($$($(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \

KBSS_SZ = $(shell echo $$(($$($(NM) $(obj)/../../../../vmlinux | \

		sed -n -e 's/^\([^ ]*\) [AB] __bss_start$$/-0x\1/p' \

		       -e 's/^\([^ ]*\) [AB] __bss_stop$$/+0x\1/p') )) )

LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)
@@ -166,7 +166,7 @@ $(obj)/bswapsdi2.S: $(srctree)/arch/$(SRCARCH)/lib/bswapsdi2.S 
# The .data section is already discarded by the linker script so no need

# to bother about it here.

check_for_bad_syms = \

bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \

bad_syms=$$($(NM) $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \

[ -z "$$bad_syms" ] || \

  ( echo "following symbols must have non local/private scope:" >&2; \

    echo "$$bad_syms" >&2; rm -f $@; false )

arch/arm/vdso/Makefile

+9 −13
Original line number Diff line number Diff line
@@ -10,12 +10,13 @@ obj-vdso := $(addprefix $(obj)/, $(obj-vdso)) 
ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector

ccflags-y += -DDISABLE_BRANCH_PROFILING



VDSO_LDFLAGS := -Wl,-Bsymbolic -Wl,--no-undefined -Wl,-soname=linux-vdso.so.1

VDSO_LDFLAGS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096

VDSO_LDFLAGS += -nostdlib -shared

VDSO_LDFLAGS += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)

VDSO_LDFLAGS += $(call cc-ldoption, -Wl$(comma)--build-id)

VDSO_LDFLAGS += $(call cc-ldoption, -fuse-ld=bfd)

ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8

ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \

	    -z max-page-size=4096 -z common-page-size=4096 \

	    -nostdlib -shared $(ldflags-y) \

	    $(call ld-option, --hash-style=sysv) \

	    $(call ld-option, --build-id) \

	    -T



obj-$(CONFIG_VDSO) += vdso.o

extra-$(CONFIG_VDSO) += vdso.lds
@@ -37,8 +38,8 @@ KCOV_INSTRUMENT := n 
$(obj)/vdso.o : $(obj)/vdso.so



# Link rule for the .so file

$(obj)/vdso.so.raw: $(src)/vdso.lds $(obj-vdso) FORCE

	$(call if_changed,vdsold)

$(obj)/vdso.so.raw: $(obj)/vdso.lds $(obj-vdso) FORCE

	$(call if_changed,ld)



$(obj)/vdso.so.dbg: $(obj)/vdso.so.raw $(obj)/vdsomunge FORCE

	$(call if_changed,vdsomunge)
@@ -48,11 +49,6 @@ $(obj)/%.so: OBJCOPYFLAGS := -S 
$(obj)/%.so: $(obj)/%.so.dbg FORCE

	$(call if_changed,objcopy)



# Actual build commands

quiet_cmd_vdsold = VDSO    $@

      cmd_vdsold = $(CC) $(c_flags) $(VDSO_LDFLAGS) \

                   -Wl,-T $(filter %.lds,$^) $(filter %.o,$^) -o $@



quiet_cmd_vdsomunge = MUNGE   $@

      cmd_vdsomunge = $(objtree)/$(obj)/vdsomunge $< $@

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
};



&qspi {

	status = "okay";

	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

arch/arm64/kernel/vdso32/Makefile

+12 −11
Original line number Diff line number Diff line
@@ -22,16 +22,21 @@ endif 


CC_COMPAT ?= $(CC)

CC_COMPAT += $(CC_COMPAT_CLANG_FLAGS)



ifeq ($(LLVM),1)

LD_COMPAT ?= $(LD)

else

LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld

endif

else

CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc

LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld

endif



cc32-option = $(call try-run,\

        $(CC_COMPAT) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))

cc32-disable-warning = $(call try-run,\

	$(CC_COMPAT) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))

cc32-ldoption = $(call try-run,\

        $(CC_COMPAT) $(1) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2))

cc32-as-instr = $(call try-run,\

	printf "%b\n" "$(1)" | $(CC_COMPAT) $(VDSO_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))
@@ -114,14 +119,10 @@ dmbinstr := $(call cc32-as-instr,dmb ishld,-DCONFIG_AS_DMB_ISHLD=1) 
VDSO_CFLAGS += $(dmbinstr)

VDSO_AFLAGS += $(dmbinstr)



VDSO_LDFLAGS := $(VDSO_CPPFLAGS)

# From arm vDSO Makefile

VDSO_LDFLAGS += -Wl,-Bsymbolic -Wl,--no-undefined -Wl,-soname=linux-vdso.so.1

VDSO_LDFLAGS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096

VDSO_LDFLAGS += -nostdlib -shared -mfloat-abi=soft

VDSO_LDFLAGS += $(call cc32-ldoption,-Wl$(comma)--hash-style=sysv)

VDSO_LDFLAGS += $(call cc32-ldoption,-Wl$(comma)--build-id)

VDSO_LDFLAGS += $(call cc32-ldoption,-fuse-ld=bfd)

VDSO_LDFLAGS += -Bsymbolic --no-undefined -soname=linux-vdso.so.1

VDSO_LDFLAGS += -z max-page-size=4096 -z common-page-size=4096

VDSO_LDFLAGS += -nostdlib -shared --hash-style=sysv --build-id





# Borrow vdsomunge.c from the arm vDSO
@@ -182,8 +183,8 @@ quiet_cmd_vdsold_and_vdso_check = LD32 $@ 
      cmd_vdsold_and_vdso_check = $(cmd_vdsold); $(cmd_vdso_check)



quiet_cmd_vdsold = LD32    $@

      cmd_vdsold = $(CC_COMPAT) -Wp,-MD,$(depfile) $(VDSO_LDFLAGS) \

                   -Wl,-T $(filter %.lds,$^) $(filter %.o,$^) -o $@

      cmd_vdsold = $(LD_COMPAT) $(VDSO_LDFLAGS) \

                   -T $(filter %.lds,$^) $(filter %.o,$^) -o $@

quiet_cmd_vdsocc = CC32    $@

      cmd_vdsocc = $(CC_COMPAT) -Wp,-MD,$(depfile) $(VDSO_CFLAGS) -c -o $@ $<

quiet_cmd_vdsocc_gettimeofday = CC32    $@