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

Commit 13abe236 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.152 into android-4.19-stable 



Changes in 4.19.152
	perf cs-etm: Move definition of 'traceid_list' global variable from header file
	ARM: 8858/1: vdso: use $(LD) instead of $(CC) to link VDSO
	ARM: 8939/1: kbuild: use correct nm executable
	ARM: 8867/1: vdso: pass --be8 to linker if necessary
	Bluetooth: A2MP: Fix not initializing all members
	Bluetooth: L2CAP: Fix calling sk_filter on non-socket based channel
	Bluetooth: MGMT: Fix not checking if BT_HS is enabled
	Bluetooth: Consolidate encryption handling in hci_encrypt_cfm
	Bluetooth: Fix update of connection state in `hci_encrypt_cfm`
	Bluetooth: Disconnect if E0 is used for Level 4
	media: usbtv: Fix refcounting mixup
	USB: serial: option: add Cellient MPL200 card
	USB: serial: option: Add Telit FT980-KS composition
	staging: comedi: check validity of wMaxPacketSize of usb endpoints found
	USB: serial: pl2303: add device-id for HP GC device
	USB: serial: ftdi_sio: add support for FreeCalypso JTAG+UART adapters
	reiserfs: Initialize inode keys properly
	reiserfs: Fix oops during mount
	drivers/net/ethernet/marvell/mvmdio.c: Fix non OF case
	crypto: bcm - Verify GCM/CCM key length in setkey
	crypto: qat - check cipher length for aead AES-CBC-HMAC-SHA
	Linux 4.19.152

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I220620fba6634de064782836b2738a9651edd299
parents 71ca95b7 ad326970

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 151

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 $< $@

drivers/crypto/bcm/cipher.c

+14 −1
Original line number Diff line number Diff line
@@ -2980,7 +2980,6 @@ static int aead_gcm_ccm_setkey(struct crypto_aead *cipher, 


	ctx->enckeylen = keylen;

	ctx->authkeylen = 0;

	memcpy(ctx->enckey, key, ctx->enckeylen);



	switch (ctx->enckeylen) {

	case AES_KEYSIZE_128:
@@ -2996,6 +2995,8 @@ static int aead_gcm_ccm_setkey(struct crypto_aead *cipher, 
		goto badkey;

	}



	memcpy(ctx->enckey, key, ctx->enckeylen);



	flow_log("  enckeylen:%u authkeylen:%u\n", ctx->enckeylen,

		 ctx->authkeylen);

	flow_dump("  enc: ", ctx->enckey, ctx->enckeylen);
@@ -3056,6 +3057,10 @@ static int aead_gcm_esp_setkey(struct crypto_aead *cipher, 
	struct iproc_ctx_s *ctx = crypto_aead_ctx(cipher);



	flow_log("%s\n", __func__);



	if (keylen < GCM_ESP_SALT_SIZE)

		return -EINVAL;



	ctx->salt_len = GCM_ESP_SALT_SIZE;

	ctx->salt_offset = GCM_ESP_SALT_OFFSET;

	memcpy(ctx->salt, key + keylen - GCM_ESP_SALT_SIZE, GCM_ESP_SALT_SIZE);
@@ -3084,6 +3089,10 @@ static int rfc4543_gcm_esp_setkey(struct crypto_aead *cipher, 
	struct iproc_ctx_s *ctx = crypto_aead_ctx(cipher);



	flow_log("%s\n", __func__);



	if (keylen < GCM_ESP_SALT_SIZE)

		return -EINVAL;



	ctx->salt_len = GCM_ESP_SALT_SIZE;

	ctx->salt_offset = GCM_ESP_SALT_OFFSET;

	memcpy(ctx->salt, key + keylen - GCM_ESP_SALT_SIZE, GCM_ESP_SALT_SIZE);
@@ -3113,6 +3122,10 @@ static int aead_ccm_esp_setkey(struct crypto_aead *cipher, 
	struct iproc_ctx_s *ctx = crypto_aead_ctx(cipher);



	flow_log("%s\n", __func__);



	if (keylen < CCM_ESP_SALT_SIZE)

		return -EINVAL;



	ctx->salt_len = CCM_ESP_SALT_SIZE;

	ctx->salt_offset = CCM_ESP_SALT_OFFSET;

	memcpy(ctx->salt, key + keylen - CCM_ESP_SALT_SIZE, CCM_ESP_SALT_SIZE);

drivers/crypto/qat/qat_common/qat_algs.c

+9 −1
Original line number Diff line number Diff line
@@ -828,6 +828,11 @@ static int qat_alg_aead_dec(struct aead_request *areq) 
	struct icp_qat_fw_la_bulk_req *msg;

	int digst_size = crypto_aead_authsize(aead_tfm);

	int ret, ctr = 0;

	u32 cipher_len;



	cipher_len = areq->cryptlen - digst_size;

	if (cipher_len % AES_BLOCK_SIZE != 0)

		return -EINVAL;



	ret = qat_alg_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req);

	if (unlikely(ret))
@@ -842,7 +847,7 @@ static int qat_alg_aead_dec(struct aead_request *areq) 
	qat_req->req.comn_mid.src_data_addr = qat_req->buf.blp;

	qat_req->req.comn_mid.dest_data_addr = qat_req->buf.bloutp;

	cipher_param = (void *)&qat_req->req.serv_specif_rqpars;

	cipher_param->cipher_length = areq->cryptlen - digst_size;

	cipher_param->cipher_length = cipher_len;

	cipher_param->cipher_offset = areq->assoclen;

	memcpy(cipher_param->u.cipher_IV_array, areq->iv, AES_BLOCK_SIZE);

	auth_param = (void *)((uint8_t *)cipher_param + sizeof(*cipher_param));
@@ -871,6 +876,9 @@ static int qat_alg_aead_enc(struct aead_request *areq) 
	uint8_t *iv = areq->iv;

	int ret, ctr = 0;



	if (areq->cryptlen % AES_BLOCK_SIZE != 0)

		return -EINVAL;



	ret = qat_alg_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req);

	if (unlikely(ret))

		return ret;