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

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

Merge 4.19.314 into android-4.19-stable 



Changes in 4.19.314
	dmaengine: pl330: issue_pending waits until WFP state
	dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
	wifi: nl80211: don't free NULL coalescing rule
	drm/amdkfd: change system memory overcommit limit
	drm/amdgpu: Fix leak when GPU memory allocation fails
	net: slightly optimize eth_type_trans
	ethernet: add a helper for assigning port addresses
	ethernet: Add helper for assigning packet type when dest address does not match device address
	pinctrl: core: delete incorrect free in pinctrl_enable()
	power: rt9455: hide unused rt9455_boost_voltage_values
	pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
	s390/mm: Fix storage key clearing for guest huge pages
	s390/mm: Fix clearing storage keys for huge pages
	bna: ensure the copied buf is NUL terminated
	nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
	net l2tp: drop flow hash on forward
	net: dsa: mv88e6xxx: Add number of MACs in the ATU
	net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
	net: bridge: fix multicast-to-unicast with fraglist GSO
	tipc: fix a possible memleak in tipc_buf_append
	scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
	gfs2: Fix invalid metadata access in punch_hole
	wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
	net: mark racy access on sk->sk_rcvbuf
	scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
	ALSA: line6: Zero-initialize message buffers
	net: bcmgenet: Reset RBUF on first open
	ata: sata_gemini: Check clk_enable() result
	firewire: ohci: mask bus reset interrupts between ISR and bottom half
	tools/power turbostat: Fix added raw MSR output
	tools/power turbostat: Fix Bzy_MHz documentation typo
	btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
	btrfs: always clear PERTRANS metadata during commit
	scsi: target: Fix SELinux error when systemd-modules loads the target module
	selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
	fs/9p: only translate RWX permissions for plain 9P2000
	fs/9p: translate O_TRUNC into OTRUNC
	9p: explicitly deny setlease attempts
	gpio: wcove: Use -ENOTSUPP consistently
	gpio: crystalcove: Use -ENOTSUPP consistently
	fs/9p: drop inodes immediately on non-.L too
	net:usb:qmi_wwan: support Rolling modules
	tcp: remove redundant check on tskb
	tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
	tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
	Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
	Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
	rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
	phonet: fix rtm_phonet_notify() skb allocation
	net: bridge: fix corrupted ethernet header on multicast-to-unicast
	ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
	af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
	af_unix: Fix garbage collector racing against connect()
	firewire: nosy: ensure user_length is taken into account when fetching packet contents
	usb: gadget: composite: fix OS descriptors w_value logic
	usb: gadget: f_fs: Fix a race condition when processing setup packets.
	tipc: fix UAF in error path
	dyndbg: fix old BUG_ON in >control parser
	drm/vmwgfx: Fix invalid reads in fence signaled events
	net: fix out-of-bounds access in ops_init
	af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().
	Linux 4.19.314

Change-Id: Iee5ac090f6fe369f9faa89d92ad17b66b8a41bee
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 5c67c901 56a03f63

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 313

SUBLEVEL = 314

EXTRAVERSION =

NAME = "People's Front"

arch/s390/mm/gmap.c

+1 −1
Original line number Diff line number Diff line
@@ -2583,7 +2583,7 @@ static int __s390_enable_skey_hugetlb(pte_t *pte, unsigned long addr, 
		return 0;



	start = pmd_val(*pmd) & HPAGE_MASK;

	end = start + HPAGE_SIZE - 1;

	end = start + HPAGE_SIZE;

	__storage_key_init_range(start, end);

	set_bit(PG_arch_1, &page->flags);

	return 0;

arch/s390/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void clear_huge_pte_skeys(struct mm_struct *mm, unsigned long rste) 
	}



	if (!test_and_set_bit(PG_arch_1, &page->flags))

		__storage_key_init_range(paddr, paddr + size - 1);

		__storage_key_init_range(paddr, paddr + size);

}



void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

drivers/ata/sata_gemini.c

+4 −1
Original line number Diff line number Diff line
@@ -200,7 +200,10 @@ int gemini_sata_start_bridge(struct sata_gemini *sg, unsigned int bridge) 
		pclk = sg->sata0_pclk;

	else

		pclk = sg->sata1_pclk;

	clk_enable(pclk);

	ret = clk_enable(pclk);

	if (ret)

		return ret;



	msleep(10);



	/* Do not keep clocking a bridge that is not online */

drivers/firewire/nosy.c

+4 −2
Original line number Diff line number Diff line
@@ -161,10 +161,12 @@ packet_buffer_get(struct client *client, char __user *data, size_t user_length) 
	if (atomic_read(&buffer->size) == 0)

		return -ENODEV;



	/* FIXME: Check length <= user_length. */

	length = buffer->head->length;



	if (length > user_length)

		return 0;



	end = buffer->data + buffer->capacity;

	length = buffer->head->length;



	if (&buffer->head->data[length] < end) {

		if (copy_to_user(data, buffer->head->data, length))