Commit d3df1dbc authored Nov 29, 2022 by Greg Kroah-Hartman

Merge branch 'android11-5.4' into branch 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

4338018d Merge tag 'android11-5.4.219_r00' into android11-5.4
a6768f02 UPSTREAM: mmc: hsq: Fix data stomping during mmc recovery
c08e708d UPSTREAM: pinctrl: sunxi: Fix name for A100 R_PIO
b45868d6 BACKPORT: mmc: core: Fix UHS-I SD 1.8V workaround branch
4f0ce36d UPSTREAM: Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression
624ab3a0 UPSTREAM: wifi: mac80211_hwsim: set virtio device ready in probe()
de960e4e BACKPORT: f2fs: don't use casefolded comparison for "." and ".."
c219b2d3 UPSTREAM: Revert "mm/cma.c: remove redundant cma_mutex lock"
bcbaf126 UPSTREAM: usb: dwc3: Try usb-role-switch first in dwc3_drd_init
2117e7c7 BACKPORT: usb: typec: ucsi: Fix reuse of completion structure
ef283814 BACKPORT: tipc: fix incorrect order of state message data sanity check
c5f9da53 UPSTREAM: net: fix up skbs delta_truesize in UDP GRO frag_list
f644f482 UPSTREAM: cgroup-v1: Correct privileges check in release_agent writes
cb59d054 UPSTREAM: mm: don't try to NUMA-migrate COW pages that have other uses
e4d47f2d UPSTREAM: usb: raw-gadget: fix handling of dual-direction-capable endpoints
21192379 UPSTREAM: selinux: check return value of sel_make_avc_files
51733057 UPSTREAM: usb: musb: select GENERIC_PHY instead of depending on it
e233e13e BACKPORT: driver core: Fix error return code in really_probe()
fb4622ee UPSTREAM: fscrypt: fix derivation of SipHash keys on big endian CPUs
c8bc35f2 BACKPORT: fscrypt: rename FS_KEY_DERIVATION_NONCE_SIZE
0aad5861 UPSTREAM: socionext: account for napi_gro_receive never returning GRO_DROP
38f38545 UPSTREAM: net: socionext: netsec: fix xdp stats accounting
202bfe2b BACKPORT: fs: align IOCB_* flags with RWF_* flags
141f8d76 UPSTREAM: efi: capsule-loader: Fix use-after-free in efi_capsule_write
d4d1f95c BACKPORT: ARM: 9039/1: assembler: generalize byte swapping macro into rev_l
28066cfb BACKPORT: ARM: 9035/1: uncompress: Add be32tocpu macro
cc190ff2 UPSTREAM: drm/meson: Fix overflow implicit truncation warnings
0d0c1b26 UPSTREAM: irqchip/tegra: Fix overflow implicit truncation warnings
026441f5 UPSTREAM: video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
482efd77 UPSTREAM: mm/mremap: hold the rmap lock in write mode when moving page table entries.
c262d216 FROMLIST: binder: fix UAF of alloc->vma in race with munmap()
6d1487a4 UPSTREAM: mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region()
4a5337df UPSTREAM: mm: Force TLB flush for PFNMAP mappings before unlink_file_vma()
e8453c3d UPSTREAM: af_key: Do not call xfrm_probe_algs in parallel
40a8e0ed UPSTREAM: wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
f7fbd478 UPSTREAM: wifi: cfg80211/mac80211: reject bad MBSSID elements
569d099d UPSTREAM: wifi: cfg80211: ensure length byte is present before access
916a29b4 UPSTREAM: wifi: cfg80211: fix BSS refcounting bugs
a30ebebb UPSTREAM: wifi: cfg80211: avoid nontransmitted BSS list corruption
99f08128 UPSTREAM: wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
df86d024 UPSTREAM: wifi: cfg80211: update hidden BSSes to avoid WARN_ON
fa35741b UPSTREAM: mac80211: mlme: find auth challenge directly
7633d41a UPSTREAM: wifi: mac80211: don't parse mbssid in assoc response
9f3b5ab8 UPSTREAM: wifi: mac80211: fix MBSSID parsing use-after-free
09cd270b ANDROID: Drop explicit 'CONFIG_INIT_STACK_ALL_ZERO=y' from gki_defconfig
0d4d3b41 UPSTREAM: hardening: Remove Clang's enable flag for -ftrivial-auto-var-init=zero
9267f980 UPSTREAM: hardening: Avoid harmless Clang option under CONFIG_INIT_STACK_ALL_ZERO
f0865810 UPSTREAM: hardening: Clarify Kconfig text for auto-var-init
07228609 ANDROID: GKI: Update FCNT KMI symbol list
b8dedbc2 ANDROID: Fix kenelci build-break for !CONFIG_PERF_EVENTS
c1957fce BACKPORT: HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report
7e0fbb9e ANDROID: ABI: Update allowed list for QCOM
da8a8d77 UPSTREAM: wifi: mac80211_hwsim: use 32-bit skb cookie
85f80951 UPSTREAM: wifi: mac80211_hwsim: add back erroneously removed cast
8b32ee8a UPSTREAM: wifi: mac80211_hwsim: fix race condition in pending packet

Change-Id: Ie1d54da353bd48b4f3a31123c9b91198d223ba73
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents 0bd6dcc0 4338018d

Documentation/filesystems/fscrypt.rst

+3 −3

Original line number	Diff line number	Diff line
		@@ -1158,7 +1158,7 @@ setxattr() because of the special semantics of the encryption xattr.
		were to be added to or removed from anything other than an empty
		directory.) These structs are defined as follows::

		#define FS_KEY_DERIVATION_NONCE_SIZE 16
		#define FSCRYPT_FILE_NONCE_SIZE 16

		#define FSCRYPT_KEY_DESCRIPTOR_SIZE 8
		struct fscrypt_context_v1 {
		@@ -1167,7 +1167,7 @@ directory.) These structs are defined as follows::
		u8 filenames_encryption_mode;
		u8 flags;
		u8 master_key_descriptor[FSCRYPT_KEY_DESCRIPTOR_SIZE];
		u8 nonce[FS_KEY_DERIVATION_NONCE_SIZE];
		u8 nonce[FSCRYPT_FILE_NONCE_SIZE];
		};

		#define FSCRYPT_KEY_IDENTIFIER_SIZE 16
		@@ -1178,7 +1178,7 @@ directory.) These structs are defined as follows::
		u8 flags;
		u8 __reserved[4];
		u8 master_key_identifier[FSCRYPT_KEY_IDENTIFIER_SIZE];
		u8 nonce[FS_KEY_DERIVATION_NONCE_SIZE];
		u8 nonce[FSCRYPT_FILE_NONCE_SIZE];
		};

		The context structs contain the same information as the corresponding

Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -810,12 +810,12 @@ endif

		# Initialize all stack variables with a zero value.
		ifdef CONFIG_INIT_STACK_ALL_ZERO
		# Future support for zero initialization is still being debated, see
		# https://bugs.llvm.org/show_bug.cgi?id=45497. These flags are subject to being
		# renamed or dropped.
		KBUILD_CFLAGS += -ftrivial-auto-var-init=zero
		ifdef CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_ENABLER
		# https://github.com/llvm/llvm-project/issues/44842
		KBUILD_CFLAGS += -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang
		endif
		endif

		DEBUG_CFLAGS := $(call cc-option, -fno-var-tracking-assignments)

android/abi_gki_aarch64_fcnt

100755 → 100644

+16 −0

Original line number	Diff line number	Diff line
		@@ -78,3 +78,19 @@

		# required by sdhci-msm.ko
		mmc_gpio_set_cd_wake

		# required by max77729.ko
		i2c_new_dummy_device
		__irq_alloc_descs
		i2c_smbus_write_word_data
		i2c_smbus_write_i2c_block_data
		i2c_smbus_read_i2c_block_data
		i2c_smbus_read_word_data
		power_supply_register
		power_supply_unregister
		mfd_add_devices
		mfd_remove_devices

		# required by sec.ko
		strncat
		input_mt_destroy_slots

android/abi_gki_aarch64_qcom

+1 −0

Original line number	Diff line number	Diff line
		@@ -1942,6 +1942,7 @@
		refcount_dec_not_one
		refcount_inc_checked
		refcount_inc_not_zero_checked
		refcount_warn_saturate
		__refrigerator
		regcache_cache_bypass
		regcache_cache_only

arch/arm/boot/compressed/head.S

+9 −14

Original line number	Diff line number	Diff line
		@@ -140,6 +140,13 @@
		#endif
		.endm

		.macro be32tocpu, val, tmp
		#ifndef __ARMEB__
		/* convert to little endian */
		rev_l \val, \tmp
		#endif
		.endm

		.section ".start", "ax"
		/*
		* sort out different calling conventions
		@@ -344,13 +351,7 @@ restart: adr r0, LC0

		/* Get the initial DTB size */
		ldr r5, [r6, #4]
		#ifndef __ARMEB__
		/* convert to little endian */
		eor r1, r5, r5, ror #16
		bic r1, r1, #0x00ff0000
		mov r5, r5, ror #8
		eor r5, r5, r1, lsr #8
		#endif
		be32tocpu r5, r1
		/* 50% DTB growth should be good enough */
		add r5, r5, r5, lsr #1
		/* preserve 64-bit alignment */
		@@ -403,13 +404,7 @@ restart: adr r0, LC0

		/* Get the current DTB size */
		ldr r5, [r6, #4]
		#ifndef __ARMEB__
		/* convert r5 (dtb size) to little endian */
		eor r1, r5, r5, ror #16
		bic r1, r1, #0x00ff0000
		mov r5, r5, ror #8
		eor r5, r5, r1, lsr #8
		#endif
		be32tocpu r5, r1

		/* preserve 64-bit alignment */
		add r5, r5, #7