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

Commit 400a374b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.187 into android11-5.4-lts 



Changes in 5.4.187
	crypto: qcom-rng - ensure buffer for generate is completely filled
	ocfs2: fix crash when initialize filecheck kobj fails
	efi: fix return value of __setup handlers
	net: phy: marvell: Fix invalid comparison in the resume and suspend functions
	net/packet: fix slab-out-of-bounds access in packet_recvmsg()
	atm: eni: Add check for dma_map_single
	hv_netvsc: Add check for kvmalloc_array
	drm/panel: simple: Fix Innolux G070Y2-L01 BPP settings
	net: handle ARPHRD_PIMREG in dev_is_mac_header_xmit()
	net: dsa: Add missing of_node_put() in dsa_port_parse_of
	arm64: fix clang warning about TRAMP_VALIAS
	usb: gadget: rndis: prevent integer overflow in rndis_set_response()
	usb: gadget: Fix use-after-free bug by not setting udc->dev.driver
	usb: usbtmc: Fix bug in pipe direction for control transfers
	Input: aiptek - properly check endpoint type
	perf symbols: Fix symbol size calculation condition
	Revert "selftests/bpf: Add test for bpf_timer overwriting crash"
	Linux 5.4.187

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I84169465999929274ca2d260c278378d16086f39
parents 8aca45f6 055c4cf7

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 186

SUBLEVEL = 187

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm64/include/asm/vectors.h

+2 −2
Original line number Diff line number Diff line
@@ -56,14 +56,14 @@ enum arm64_bp_harden_el1_vectors { 
DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);



#ifndef CONFIG_UNMAP_KERNEL_AT_EL0

#define TRAMP_VALIAS	0

#define TRAMP_VALIAS	0ul

#endif



static inline const char *

arm64_get_bp_hardening_vector(enum arm64_bp_harden_el1_vectors slot)

{

	if (arm64_kernel_unmapped_at_el0())

		return (char *)TRAMP_VALIAS + SZ_2K * slot;

		return (char *)(TRAMP_VALIAS + SZ_2K * slot);



	WARN_ON_ONCE(slot == EL1_VECTOR_KPTI);

drivers/atm/eni.c

+2 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,8 @@ DPRINTK("iovcnt = %d\n",skb_shinfo(skb)->nr_frags); 
	}

	paddr = dma_map_single(&eni_dev->pci_dev->dev,skb->data,skb->len,

			       DMA_TO_DEVICE);

	if (dma_mapping_error(&eni_dev->pci_dev->dev, paddr))

		return enq_next;

	ENI_PRV_PADDR(skb) = paddr;

	/* prepare DMA queue entries */

	j = 0;

drivers/crypto/qcom-rng.c

+10 −7
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/acpi.h>

#include <linux/clk.h>

#include <linux/crypto.h>

#include <linux/iopoll.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>
@@ -42,16 +43,19 @@ static int qcom_rng_read(struct qcom_rng *rng, u8 *data, unsigned int max) 
{

	unsigned int currsize = 0;

	u32 val;

	int ret;



	/* read random data from hardware */

	do {

		val = readl_relaxed(rng->base + PRNG_STATUS);

		if (!(val & PRNG_STATUS_DATA_AVAIL))

			break;

		ret = readl_poll_timeout(rng->base + PRNG_STATUS, val,

					 val & PRNG_STATUS_DATA_AVAIL,

					 200, 10000);

		if (ret)

			return ret;



		val = readl_relaxed(rng->base + PRNG_DATA_OUT);

		if (!val)

			break;

			return -EINVAL;



		if ((max - currsize) >= WORD_SZ) {

			memcpy(data, &val, WORD_SZ);
@@ -60,11 +64,10 @@ static int qcom_rng_read(struct qcom_rng *rng, u8 *data, unsigned int max) 
		} else {

			/* copy only remaining bytes */

			memcpy(data, &val, max - currsize);

			break;

		}

	} while (currsize < max);



	return currsize;

	return 0;

}



static int qcom_rng_generate(struct crypto_rng *tfm,
@@ -86,7 +89,7 @@ static int qcom_rng_generate(struct crypto_rng *tfm, 
	mutex_unlock(&rng->lock);

	clk_disable_unprepare(rng->clk);



	return 0;

	return ret;

}



static int qcom_rng_seed(struct crypto_rng *tfm, const u8 *seed,

drivers/firmware/efi/apple-properties.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static bool dump_properties __initdata; 
static int __init dump_properties_enable(char *arg)

{

	dump_properties = true;

	return 0;

	return 1;

}



__setup("dump_apple_properties", dump_properties_enable);