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

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

Merge 4.19.303 into android-4.19-stable 



Changes in 4.19.303
	qca_debug: Prevent crash on TX ring changes
	qca_debug: Fix ethtool -G iface tx behavior
	qca_spi: Fix reset behavior
	atm: solos-pci: Fix potential deadlock on &cli_queue_lock
	atm: solos-pci: Fix potential deadlock on &tx_queue_lock
	atm: Fix Use-After-Free in do_vcc_ioctl
	net/rose: Fix Use-After-Free in rose_ioctl
	qed: Fix a potential use-after-free in qed_cxt_tables_alloc
	net: Remove acked SYN flag from packet in the transmit queue correctly
	sign-file: Fix incorrect return values check
	vsock/virtio: Fix unsigned integer wrap around in virtio_transport_has_space()
	net: stmmac: Handle disabled MDIO busses from devicetree
	appletalk: Fix Use-After-Free in atalk_ioctl
	Revert "PCI: acpiphp: Reassign resources on bridge if necessary"
	cred: switch to using atomic_long_t
	blk-throttle: fix lockdep warning of "cgroup_mutex or RCU read lock required!"
	bcache: avoid oversize memory allocation by small stripe_size
	bcache: add code comments for bch_btree_node_get() and __bch_btree_node_alloc()
	bcache: avoid NULL checking to c->root in run_cache_set()
	platform/x86: intel_telemetry: Fix kernel doc descriptions
	HID: add ALWAYS_POLL quirk for Apple kb
	HID: hid-asus: reset the backlight brightness level on resume
	HID: multitouch: Add quirk for HONOR GLO-GXXX touchpad
	asm-generic: qspinlock: fix queued_spin_value_unlocked() implementation
	net: usb: qmi_wwan: claim interface 4 for ZTE MF290
	HID: hid-asus: add const to read-only outgoing usb buffer
	perf: Fix perf_event_validate_size() lockdep splat
	ext4: prevent the normalized size from exceeding EXT_MAX_BLOCKS
	arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify
	team: Fix use-after-free when an option instance allocation fails
	ring-buffer: Fix memory leak of free page
	mmc: block: Be sure to wait while busy in CQE error recovery
	powerpc/ftrace: Create a dummy stackframe to fix stack unwind
	powerpc/ftrace: Fix stack teardown in ftrace_no_trace
	Linux 4.19.303

Change-Id: I209240976b6ff49ae89b0a77e777041e376416d9
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents cc0ec744 74ad23cd

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 302

SUBLEVEL = 303

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/include/asm/pgtable.h

+6 −0
Original line number Diff line number Diff line
@@ -595,6 +595,12 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	if (pte_hw_dirty(pte))

		pte = pte_mkdirty(pte);

	pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);

	/*

	 * If we end up clearing hw dirtiness for a sw-dirty PTE, set hardware

	 * dirtiness again.

	 */

	if (pte_sw_dirty(pte))

		pte = pte_mkdirty(pte);

	return pte;

}

arch/powerpc/kernel/trace/ftrace_64_mprofile.S

+13 −4
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ _GLOBAL(ftrace_regs_caller) 
	/* Save the original return address in A's stack frame */

	std	r0,LRSAVE(r1)



	/* Create a minimal stack frame for representing B */

	stdu	r1, -STACK_FRAME_MIN_SIZE(r1)



	/* Create our stack frame + pt_regs */

	stdu	r1,-SWITCH_FRAME_SIZE(r1)
@@ -56,7 +59,7 @@ _GLOBAL(ftrace_regs_caller) 
	SAVE_10GPRS(22, r1)



	/* Save previous stack pointer (r1) */

	addi	r8, r1, SWITCH_FRAME_SIZE

	addi	r8, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE

	std	r8, GPR1(r1)



	/* Load special regs for save below */
@@ -69,6 +72,8 @@ _GLOBAL(ftrace_regs_caller) 
	mflr	r7

	/* Save it as pt_regs->nip */

	std     r7, _NIP(r1)

	/* Also save it in B's stackframe header for proper unwind */

	std	r7, LRSAVE+SWITCH_FRAME_SIZE(r1)

	/* Save the read LR in pt_regs->link */

	std     r0, _LINK(r1)
@@ -125,7 +130,7 @@ ftrace_regs_call: 
	ld	r2, 24(r1)



	/* Pop our stack frame */

	addi r1, r1, SWITCH_FRAME_SIZE

	addi r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE



#ifdef CONFIG_LIVEPATCH

        /* Based on the cmpd above, if the NIP was altered handle livepatch */
@@ -149,7 +154,7 @@ ftrace_no_trace: 
	mflr	r3

	mtctr	r3

	REST_GPR(3, r1)

	addi	r1, r1, SWITCH_FRAME_SIZE

	addi	r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE

	mtlr	r0

	bctr
@@ -157,6 +162,9 @@ _GLOBAL(ftrace_caller) 
	/* Save the original return address in A's stack frame */

	std	r0, LRSAVE(r1)



	/* Create a minimal stack frame for representing B */

	stdu	r1, -STACK_FRAME_MIN_SIZE(r1)



	/* Create our stack frame + pt_regs */

	stdu	r1, -SWITCH_FRAME_SIZE(r1)
@@ -170,6 +178,7 @@ _GLOBAL(ftrace_caller) 
	/* Get the _mcount() call site out of LR */

	mflr	r7

	std     r7, _NIP(r1)

	std	r7, LRSAVE+SWITCH_FRAME_SIZE(r1)



	/* Save callee's TOC in the ABI compliant location */

	std	r2, 24(r1)
@@ -204,7 +213,7 @@ ftrace_call: 
	ld	r2, 24(r1)



	/* Pop our stack frame */

	addi	r1, r1, SWITCH_FRAME_SIZE

	addi	r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE



	/* Reload original LR */

	ld	r0, LRSAVE(r1)

block/blk-throttle.c

+2 −0
Original line number Diff line number Diff line
@@ -1383,6 +1383,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global) 
		   tg_bps_limit(tg, READ), tg_bps_limit(tg, WRITE),

		   tg_iops_limit(tg, READ), tg_iops_limit(tg, WRITE));



	rcu_read_lock();

	/*

	 * Update has_rules[] flags for the updated tg's subtree.  A tg is

	 * considered to have rules if either the tg itself or any of its
@@ -1410,6 +1411,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global) 
		this_tg->latency_target = max(this_tg->latency_target,

				parent_tg->latency_target);

	}

	rcu_read_unlock();



	/*

	 * We're already holding queue_lock and know @tg is valid.  Let's

drivers/atm/solos-pci.c

+4 −4
Original line number Diff line number Diff line
@@ -458,9 +458,9 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr, 
	struct sk_buff *skb;

	unsigned int len;



	spin_lock(&card->cli_queue_lock);

	spin_lock_bh(&card->cli_queue_lock);

	skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]);

	spin_unlock(&card->cli_queue_lock);

	spin_unlock_bh(&card->cli_queue_lock);

	if(skb == NULL)

		return sprintf(buf, "No data.\n");
@@ -968,14 +968,14 @@ static void pclose(struct atm_vcc *vcc) 
	struct pkt_hdr *header;



	/* Remove any yet-to-be-transmitted packets from the pending queue */

	spin_lock(&card->tx_queue_lock);

	spin_lock_bh(&card->tx_queue_lock);

	skb_queue_walk_safe(&card->tx_queue[port], skb, tmpskb) {

		if (SKB_CB(skb)->vcc == vcc) {

			skb_unlink(skb, &card->tx_queue[port]);

			solos_pop(vcc, skb);

		}

	}

	spin_unlock(&card->tx_queue_lock);

	spin_unlock_bh(&card->tx_queue_lock);



	skb = alloc_skb(sizeof(*header), GFP_KERNEL);

	if (!skb) {