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

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

Merge 4.19.185 into android-4.19-stable 



Changes in 4.19.185
	selinux: vsock: Set SID for socket returned by accept()
	tcp: relookup sock for RST+ACK packets handled by obsolete req sock
	ipv6: weaken the v4mapped source check
	ext4: fix bh ref count on error paths
	rpc: fix NULL dereference on kmalloc failure
	ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor of 10
	ASoC: rt5651: Fix dac- and adc- vol-tlv values being off by a factor of 10
	ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe
	ASoC: es8316: Simplify adc_pga_gain_tlv table
	ASoC: cs42l42: Fix Bitclock polarity inversion
	ASoC: cs42l42: Fix channel width support
	ASoC: cs42l42: Fix mixer volume control
	ASoC: cs42l42: Always wait at least 3ms after reset
	vhost: Fix vhost_vq_reset()
	scsi: st: Fix a use after free in st_open()
	scsi: qla2xxx: Fix broken #endif placement
	staging: comedi: cb_pcidas: fix request_irq() warn
	staging: comedi: cb_pcidas64: fix request_irq() warn
	ASoC: rt5659: Update MCLK rate in set_sysclk()
	thermal/core: Add NULL pointer check before using cooling device stats
	locking/ww_mutex: Simplify use_ww_ctx & ww_ctx handling
	ext4: do not iput inode under running transaction in ext4_rename()
	brcmfmac: clear EAP/association status bits on linkdown events
	ath10k: hold RCU lock when calling ieee80211_find_sta_by_ifaddr()
	net: ethernet: aquantia: Handle error cleanup of start on open
	appletalk: Fix skb allocation size in loopback case
	net: wan/lmc: unregister device when no matching device is found
	bpf: Remove MTU check in __bpf_skb_max_len
	ALSA: usb-audio: Apply sample rate quirk to Logitech Connect
	ALSA: hda/realtek: fix a determine_headset_type issue for a Dell AIO
	ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook
	PM: runtime: Fix race getting/putting suppliers at probe
	PM: runtime: Fix ordering in pm_runtime_get_suppliers()
	tracing: Fix stack trace event size
	mm: fix race by making init_zero_pfn() early_initcall
	drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings()
	drm/amdgpu: check alignment on CPU page for bo map
	reiserfs: update reiserfs_xattrs_initialized() condition
	pinctrl: rockchip: fix restore error in resume
	extcon: Add stubs for extcon_register_notifier_all() functions
	extcon: Fix error handling in extcon_dev_register
	firewire: nosy: Fix a use-after-free bug in nosy_ioctl()
	usbip: vhci_hcd fix shift out-of-bounds in vhci_hub_control()
	USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem
	usb: musb: Fix suspend with devices connected for a64
	usb: xhci-mtk: fix broken streams issue on 0.96 xHCI
	cdc-acm: fix BREAK rx code path adding necessary calls
	USB: cdc-acm: untangle a circular dependency between callback and softint
	USB: cdc-acm: downgrade message to debug
	USB: cdc-acm: fix double free on probe failure
	USB: cdc-acm: fix use-after-free after probe failure
	usb: gadget: udc: amd5536udc_pci fix null-ptr-dereference
	usb: dwc2: Fix HPRT0.PrtSusp bit setting for HiKey 960 board.
	staging: rtl8192e: Fix incorrect source in memcpy()
	staging: rtl8192e: Change state information from u16 to u8
	drivers: video: fbcon: fix NULL dereference in fbcon_cursor()
	Linux 4.19.185

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I65f4fd7d1b60193895371093882ab33943d22e7c
parents 4a20e9c3 b4454811

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 184

SUBLEVEL = 185

EXTRAVERSION =

NAME = "People's Front"

drivers/base/power/runtime.c

+8 −2
Original line number Diff line number Diff line
@@ -1572,8 +1572,8 @@ void pm_runtime_get_suppliers(struct device *dev) 
	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node)

		if (link->flags & DL_FLAG_PM_RUNTIME) {

			link->supplier_preactivated = true;

			refcount_inc(&link->rpm_active);

			pm_runtime_get_sync(link->supplier);

			refcount_inc(&link->rpm_active);

		}



	device_links_read_unlock(idx);
@@ -1586,6 +1586,8 @@ void pm_runtime_get_suppliers(struct device *dev) 
void pm_runtime_put_suppliers(struct device *dev)

{

	struct device_link *link;

	unsigned long flags;

	bool put;

	int idx;



	idx = device_links_read_lock();
@@ -1593,7 +1595,11 @@ void pm_runtime_put_suppliers(struct device *dev) 
	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node)

		if (link->supplier_preactivated) {

			link->supplier_preactivated = false;

			if (refcount_dec_not_one(&link->rpm_active))

			spin_lock_irqsave(&dev->power.lock, flags);

			put = pm_runtime_status_suspended(dev) &&

			      refcount_dec_not_one(&link->rpm_active);

			spin_unlock_irqrestore(&dev->power.lock, flags);

			if (put)

				pm_runtime_put(link->supplier);

		}

drivers/extcon/extcon.c

+1 −0
Original line number Diff line number Diff line
@@ -1303,6 +1303,7 @@ int extcon_dev_register(struct extcon_dev *edev) 
				sizeof(*edev->nh), GFP_KERNEL);

	if (!edev->nh) {

		ret = -ENOMEM;

		device_unregister(&edev->dev);

		goto err_dev;

	}

drivers/firewire/nosy.c

+7 −2
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ nosy_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	struct client *client = file->private_data;

	spinlock_t *client_list_lock = &client->lynx->client_list_lock;

	struct nosy_stats stats;

	int ret;



	switch (cmd) {

	case NOSY_IOC_GET_STATS:
@@ -373,11 +374,15 @@ nosy_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			return 0;



	case NOSY_IOC_START:

		ret = -EBUSY;

		spin_lock_irq(client_list_lock);

		if (list_empty(&client->link)) {

			list_add_tail(&client->link, &client->lynx->client_list);

			ret = 0;

		}

		spin_unlock_irq(client_list_lock);



		return 0;

		return ret;



	case NOSY_IOC_STOP:

		spin_lock_irq(client_list_lock);

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+5 −5
Original line number Diff line number Diff line
@@ -2076,8 +2076,8 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev, 
	uint64_t eaddr;



	/* validate the parameters */

	if (saddr & AMDGPU_GPU_PAGE_MASK || offset & AMDGPU_GPU_PAGE_MASK ||

	    size == 0 || size & AMDGPU_GPU_PAGE_MASK)

	if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK ||

	    size == 0 || size & ~PAGE_MASK)

		return -EINVAL;



	/* make sure object fit at this offset */
@@ -2141,8 +2141,8 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev, 
	int r;



	/* validate the parameters */

	if (saddr & AMDGPU_GPU_PAGE_MASK || offset & AMDGPU_GPU_PAGE_MASK ||

	    size == 0 || size & AMDGPU_GPU_PAGE_MASK)

	if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK ||

	    size == 0 || size & ~PAGE_MASK)

		return -EINVAL;



	/* make sure object fit at this offset */
@@ -2286,7 +2286,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, 
			after->start = eaddr + 1;

			after->last = tmp->last;

			after->offset = tmp->offset;

			after->offset += after->start - tmp->start;

			after->offset += (after->start - tmp->start) << PAGE_SHIFT;

			after->flags = tmp->flags;

			after->bo_va = tmp->bo_va;

			list_add(&after->list, &tmp->bo_va->invalids);