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

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

Merge 4.14.143 into android-4.14-q 



Changes in 4.14.143
	net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context
	hv_netvsc: Fix a warning of suspicious RCU usage
	net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx
	Bluetooth: btqca: Add a short delay before downloading the NVM
	ibmveth: Convert multicast list size for little-endian system
	gpio: Fix build error of function redefinition
	drm/mediatek: use correct device to import PRIME buffers
	drm/mediatek: set DMA max segment size
	cxgb4: fix a memory leak bug
	liquidio: add cleanup in octeon_setup_iq()
	net: myri10ge: fix memory leaks
	lan78xx: Fix memory leaks
	vfs: fix page locking deadlocks when deduping files
	cx82310_eth: fix a memory leak bug
	net: kalmia: fix memory leaks
	wimax/i2400m: fix a memory leak bug
	ravb: Fix use-after-free ravb_tstamp_skb
	kprobes: Fix potential deadlock in kprobe_optimizer()
	HID: cp2112: prevent sleeping function called from invalid context
	Input: hyperv-keyboard: Use in-place iterator API in the channel callback
	Tools: hv: kvp: eliminate 'may be used uninitialized' warning
	IB/mlx4: Fix memory leaks
	ceph: fix buffer free while holding i_ceph_lock in __ceph_setxattr()
	ceph: fix buffer free while holding i_ceph_lock in __ceph_build_xattrs_blob()
	ceph: fix buffer free while holding i_ceph_lock in fill_inode()
	KVM: arm/arm64: Only skip MMIO insn once
	libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer
	spi: bcm2835aux: unifying code between polling and interrupt driven code
	spi: bcm2835aux: remove dangerous uncontrolled read of fifo
	spi: bcm2835aux: fix corruptions for longer spi transfers
	Revert "x86/apic: Include the LDR when clearing out APIC registers"
	net: fix skb use after free in netpoll
	net_sched: fix a NULL pointer deref in ipt action
	net: stmmac: dwmac-rk: Don't fail if phy regulator is absent
	tcp: inherit timestamp on mtu probe
	tcp: remove empty skb from write queue in error cases
	net: sched: act_sample: fix psample group handling on overwrite
	mld: fix memory leak in mld_del_delrec()
	x86/boot: Preserve boot_params.secure_boot from sanitizing
	Linux 4.14.143

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents f3b9aac7 e2cd24b6

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 142

SUBLEVEL = 143

EXTRAVERSION =

NAME = Petit Gorille

arch/x86/include/asm/bootparam_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static void sanitize_boot_params(struct boot_params *boot_params) 
			BOOT_PARAM_PRESERVE(eddbuf_entries),

			BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),

			BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),

			BOOT_PARAM_PRESERVE(secure_boot),

			BOOT_PARAM_PRESERVE(hdr),

			BOOT_PARAM_PRESERVE(e820_table),

			BOOT_PARAM_PRESERVE(eddbuf),

arch/x86/kernel/apic/apic.c

+0 −4
Original line number Diff line number Diff line
@@ -1148,10 +1148,6 @@ void clear_local_APIC(void) 
	apic_write(APIC_LVT0, v | APIC_LVT_MASKED);

	v = apic_read(APIC_LVT1);

	apic_write(APIC_LVT1, v | APIC_LVT_MASKED);

	if (!x2apic_enabled()) {

		v = apic_read(APIC_LDR) & ~APIC_LDR_MASK;

		apic_write(APIC_LDR, v);

	}

	if (maxlvt >= 4) {

		v = apic_read(APIC_LVTPC);

		apic_write(APIC_LVTPC, v | APIC_LVT_MASKED);

drivers/bluetooth/btqca.c

+3 −0
Original line number Diff line number Diff line
@@ -363,6 +363,9 @@ int qca_uart_setup_rome(struct hci_dev *hdev, uint8_t baudrate) 
		return err;

	}



	/* Give the controller some time to get ready to receive the NVM */

	msleep(10);



	/* Download NVM configuration */

	config.type = TLV_TYPE_NVM;

	snprintf(config.fwname, sizeof(config.fwname), "qca/nvm_%08x.bin",

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+46 −3
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) 
	struct mtk_drm_private *private = drm->dev_private;

	struct platform_device *pdev;

	struct device_node *np;

	struct device *dma_dev;

	int ret;



	if (!iommu_present(&platform_bus_type))
@@ -242,7 +243,29 @@ static int mtk_drm_kms_init(struct drm_device *drm) 
		goto err_component_unbind;

	}



	private->dma_dev = &pdev->dev;

	dma_dev = &pdev->dev;

	private->dma_dev = dma_dev;



	/*

	 * Configure the DMA segment size to make sure we get contiguous IOVA

	 * when importing PRIME buffers.

	 */

	if (!dma_dev->dma_parms) {

		private->dma_parms_allocated = true;

		dma_dev->dma_parms =

			devm_kzalloc(drm->dev, sizeof(*dma_dev->dma_parms),

				     GFP_KERNEL);

	}

	if (!dma_dev->dma_parms) {

		ret = -ENOMEM;

		goto err_component_unbind;

	}



	ret = dma_set_max_seg_size(dma_dev, (unsigned int)DMA_BIT_MASK(32));

	if (ret) {

		dev_err(dma_dev, "Failed to set DMA segment size\n");

		goto err_unset_dma_parms;

	}



	/*

	 * We don't use the drm_irq_install() helpers provided by the DRM
@@ -252,13 +275,16 @@ static int mtk_drm_kms_init(struct drm_device *drm) 
	drm->irq_enabled = true;

	ret = drm_vblank_init(drm, MAX_CRTC);

	if (ret < 0)

		goto err_component_unbind;

		goto err_unset_dma_parms;



	drm_kms_helper_poll_init(drm);

	drm_mode_config_reset(drm);



	return 0;



err_unset_dma_parms:

	if (private->dma_parms_allocated)

		dma_dev->dma_parms = NULL;

err_component_unbind:

	component_unbind_all(drm->dev, drm);

err_config_cleanup:
@@ -269,9 +295,14 @@ static int mtk_drm_kms_init(struct drm_device *drm) 


static void mtk_drm_kms_deinit(struct drm_device *drm)

{

	struct mtk_drm_private *private = drm->dev_private;



	drm_kms_helper_poll_fini(drm);

	drm_atomic_helper_shutdown(drm);



	if (private->dma_parms_allocated)

		private->dma_dev->dma_parms = NULL;



	component_unbind_all(drm->dev, drm);

	drm_mode_config_cleanup(drm);

}
@@ -287,6 +318,18 @@ static const struct file_operations mtk_drm_fops = { 
	.compat_ioctl = drm_compat_ioctl,

};



/*

 * We need to override this because the device used to import the memory is

 * not dev->dev, as drm_gem_prime_import() expects.

 */

struct drm_gem_object *mtk_drm_gem_prime_import(struct drm_device *dev,

						struct dma_buf *dma_buf)

{

	struct mtk_drm_private *private = dev->dev_private;



	return drm_gem_prime_import_dev(dev, dma_buf, private->dma_dev);

}



static struct drm_driver mtk_drm_driver = {

	.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME |

			   DRIVER_ATOMIC,
@@ -298,7 +341,7 @@ static struct drm_driver mtk_drm_driver = { 
	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_export = drm_gem_prime_export,

	.gem_prime_import = drm_gem_prime_import,

	.gem_prime_import = mtk_drm_gem_prime_import,

	.gem_prime_get_sg_table = mtk_gem_prime_get_sg_table,

	.gem_prime_import_sg_table = mtk_gem_prime_import_sg_table,

	.gem_prime_mmap = mtk_drm_gem_mmap_buf,