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

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

Merge 5.4.16 into android-5.4 



Changes in 5.4.16
	can, slip: Protect tty->disc_data in write_wakeup and close with RCU
	firestream: fix memory leaks
	gtp: make sure only SOCK_DGRAM UDP sockets are accepted
	ipv6: sr: remove SKB_GSO_IPXIP6 on End.D* actions
	net: bcmgenet: Use netif_tx_napi_add() for TX NAPI
	net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM
	net: ip6_gre: fix moving ip6gre between namespaces
	net, ip6_tunnel: fix namespaces move
	net, ip_tunnel: fix namespaces move
	net: rtnetlink: validate IFLA_MTU attribute in rtnl_create_link()
	net_sched: fix datalen for ematch
	net_sched: use validated TCA_KIND attribute in tc_new_tfilter()
	net-sysfs: Fix reference count leak
	net: usb: lan78xx: Add .ndo_features_check
	Revert "udp: do rmem bulk free even if the rx sk queue is empty"
	tcp_bbr: improve arithmetic division in bbr_update_bw()
	tcp: do not leave dangling pointers in tp->highest_sack
	tun: add mutex_unlock() call and napi.skb clearing in tun_get_user()
	airo: Fix possible info leak in AIROOLDIOCTL/SIOCDEVPRIVATE
	airo: Add missing CAP_NET_ADMIN check in AIROOLDIOCTL/SIOCDEVPRIVATE
	mlxsw: spectrum_acl: Fix use-after-free during reload
	fou: Fix IPv6 netlink policy
	net: Fix packet reordering caused by GRO and listified RX cooperation
	net/mlx5: Fix lowest FDB pool size
	net/mlx5: Update the list of the PCI supported devices
	net/mlx5: DR, Enable counter on non-fwd-dest objects
	net/mlx5: E-Switch, Prevent ingress rate configuration of uplink rep
	net/mlx5: DR, use non preemptible call to get the current cpu number
	net/mlx5e: kTLS, Fix corner-case checks in TX resync flow
	net/mlx5e: kTLS, Remove redundant posts in TX resync flow
	net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path
	ipv4: Detect rollover in specific fib table dump
	Revert "io_uring: only allow submit from owning task"
	afs: Fix characters allowed into cell names
	hwmon: (adt7475) Make volt2reg return same reg as reg2volt input
	hwmon: (core) Do not use device managed functions for memory allocations
	ceph: hold extra reference to r_parent over life of request
	PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken
	drm/panfrost: Add the panfrost_gem_mapping concept
	drm/i915: Align engine->uabi_class/instance with i915_drm.h
	PM: hibernate: fix crashes with init_on_free=1
	tracing: trigger: Replace unneeded RCU-list traversals
	tracing/uprobe: Fix double perf_event linking on multiprobe uprobe
	tracing: Do not set trace clock if tracefs lockdown is in effect
	tracing: Fix histogram code when expression has same var as value
	powerpc/mm/hash: Fix sharing context ids between kernel & userspace
	powerpc/xive: Discard ESB load value when interrupt is invalid
	Revert "iwlwifi: mvm: fix scan config command size"
	iwlwifi: mvm: don't send the IWL_MVM_RXQ_NSSN_SYNC notif to Rx queues
	XArray: Fix infinite loop with entry at ULONG_MAX
	XArray: Fix xa_find_after with multi-index entries
	XArray: Fix xas_find returning too many entries
	pinctrl: sunrisepoint: Add missing Interrupt Status register offset
	iommu/vt-d: Call __dmar_remove_one_dev_info with valid pointer
	Input: keyspan-remote - fix control-message timeouts
	Revert "Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers"
	ARM: 8950/1: ftrace/recordmcount: filter relocation types
	mmc: tegra: fix SDR50 tuning override
	mmc: sdhci: fix minimum clock rate for v3 controller
	mmc: sdhci_am654: Remove Inverted Write Protect flag
	mmc: sdhci_am654: Reset Command and Data line after tuning
	mlxsw: switchx2: Do not modify cloned SKBs during xmit
	net/tls: fix async operation
	Input: pm8xxx-vib - fix handling of separate enable register
	Input: sur40 - fix interface sanity checks
	Input: gtco - fix endpoint sanity check
	Input: aiptek - fix endpoint sanity check
	Input: pegasus_notetaker - fix endpoint sanity check
	Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register
	netfilter: nft_osf: add missing check for DREG attribute
	lib: Reduce user_access_begin() boundaries in strncpy_from_user() and strnlen_user()
	iommu/amd: Fix IOMMU perf counter clobbering during init
	readdir: make user_access_begin() use the real access range
	leds: gpio: Fix uninitialized gpio label for fwnode based probe
	hsr: Fix a compilation error
	hwmon: (nct7802) Fix voltage limits to wrong registers
	hwmon: (nct7802) Fix non-working alarm on voltages
	scsi: RDMA/isert: Fix a recently introduced regression related to logout
	tracing: xen: Ordered comparison of function pointers
	iwlwifi: mvm: fix SKB leak on invalid queue
	iwlwifi: mvm: fix potential SKB leak on TXQ TX
	drm/i915/userptr: fix size calculation
	xfrm: support output_mark for offload ESP packets
	net, sk_msg: Don't check if sock is locked when tearing down psock
	do_last(): fetch directory ->i_mode and ->i_uid before it's too late
	readdir: be more conservative with directory entry names
	net/sonic: Add mutual exclusion for accessing shared state
	net/sonic: Clear interrupt flags immediately
	net/sonic: Use MMIO accessors
	net/sonic: Fix interface error stats collection
	net/sonic: Fix receive buffer handling
	net/sonic: Avoid needless receive descriptor EOL flag updates
	net/sonic: Improve receive descriptor status flag check
	net/sonic: Fix receive buffer replenishment
	net/sonic: Quiesce SONIC before re-initializing descriptor memory
	net/sonic: Fix command register usage
	net/sonic: Fix CAM initialization
	net/sonic: Prevent tx watchdog timeout
	libertas: Fix two buffer overflows at parsing bss descriptor
	media: v4l2-ioctl.c: zero reserved fields for S/TRY_FMT
	netfilter: ipset: use bitmap infrastructure completely
	netfilter: nf_tables: add __nft_chain_type_get()
	netfilter: nf_tables: autoload modules from the abort path
	net/x25: fix nonblocking connect
	Linux 5.4.16

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I9e45fa24244d45c31254748eb2ce698084ca06ac
parents b891cc41 60b6aa2b

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 15

SUBLEVEL = 16

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/powerpc/include/asm/book3s/64/mmu-hash.h

+4 −1
Original line number Diff line number Diff line
@@ -600,8 +600,11 @@ extern void slb_set_size(u16 size); 
 *

 */

#define MAX_USER_CONTEXT	((ASM_CONST(1) << CONTEXT_BITS) - 2)



// The + 2 accounts for INVALID_REGION and 1 more to avoid overlap with kernel

#define MIN_USER_CONTEXT	(MAX_KERNEL_CTX_CNT + MAX_VMALLOC_CTX_CNT + \

				 MAX_IO_CTX_CNT + MAX_VMEMMAP_CTX_CNT)

				 MAX_IO_CTX_CNT + MAX_VMEMMAP_CTX_CNT + 2)



/*

 * For platforms that support on 65bit VA we limit the context bits

 */

arch/powerpc/include/asm/xive-regs.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#define XIVE_ESB_VAL_P		0x2

#define XIVE_ESB_VAL_Q		0x1

#define XIVE_ESB_INVALID	0xFF



/*

 * Thread Management (aka "TM") registers

arch/powerpc/sysdev/xive/common.c

+12 −3
Original line number Diff line number Diff line
@@ -972,12 +972,21 @@ static int xive_get_irqchip_state(struct irq_data *data, 
				  enum irqchip_irq_state which, bool *state)

{

	struct xive_irq_data *xd = irq_data_get_irq_handler_data(data);

	u8 pq;



	switch (which) {

	case IRQCHIP_STATE_ACTIVE:

		*state = !xd->stale_p &&

			 (xd->saved_p ||

			  !!(xive_esb_read(xd, XIVE_ESB_GET) & XIVE_ESB_VAL_P));

		pq = xive_esb_read(xd, XIVE_ESB_GET);



		/*

		 * The esb value being all 1's means we couldn't get

		 * the PQ state of the interrupt through mmio. It may

		 * happen, for example when querying a PHB interrupt

		 * while the PHB is in an error state. We consider the

		 * interrupt to be inactive in that case.

		 */

		*state = (pq != XIVE_ESB_INVALID) && !xd->stale_p &&

			(xd->saved_p || !!(pq & XIVE_ESB_VAL_P));

		return 0;

	default:

		return -EINVAL;

drivers/atm/firestream.c

+3 −0
Original line number Diff line number Diff line
@@ -912,6 +912,7 @@ static int fs_open(struct atm_vcc *atm_vcc) 
			}

			if (!to) {

				printk ("No more free channels for FS50..\n");

				kfree(vcc);

				return -EBUSY;

			}

			vcc->channo = dev->channo;
@@ -922,6 +923,7 @@ static int fs_open(struct atm_vcc *atm_vcc) 
			if (((DO_DIRECTION(rxtp) && dev->atm_vccs[vcc->channo])) ||

			    ( DO_DIRECTION(txtp) && test_bit (vcc->channo, dev->tx_inuse))) {

				printk ("Channel is in use for FS155.\n");

				kfree(vcc);

				return -EBUSY;

			}

		}
@@ -935,6 +937,7 @@ static int fs_open(struct atm_vcc *atm_vcc) 
			    tc, sizeof (struct fs_transmit_config));

		if (!tc) {

			fs_dprintk (FS_DEBUG_OPEN, "fs: can't alloc transmit_config.\n");

			kfree(vcc);

			return -ENOMEM;

		}