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

Commit 7f5d2d7c authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.192 (bb1c7f3a) into msm-4.9 



* refs/heads/tmp-bb1c7f3a:
  Linux 4.9.192
  mld: fix memory leak in mld_del_delrec()
  tcp: inherit timestamp on mtu probe
  net: stmmac: dwmac-rk: Don't fail if phy regulator is absent
  net: fix skb use after free in netpoll
  Revert "x86/apic: Include the LDR when clearing out APIC registers"
  spi: bcm2835aux: fix corruptions for longer spi transfers
  spi: bcm2835aux: remove dangerous uncontrolled read of fifo
  spi: bcm2835aux: unifying code between polling and interrupt driven code
  spi: bcm2835aux: ensure interrupts are enabled for shared handler
  libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer
  KVM: arm/arm64: Only skip MMIO insn once
  ceph: fix buffer free while holding i_ceph_lock in fill_inode()
  ceph: fix buffer free while holding i_ceph_lock in __ceph_setxattr()
  IB/mlx4: Fix memory leaks
  Tools: hv: kvp: eliminate 'may be used uninitialized' warning
  ravb: Fix use-after-free ravb_tstamp_skb
  wimax/i2400m: fix a memory leak bug
  net: kalmia: fix memory leaks
  cx82310_eth: fix a memory leak bug
  net: myri10ge: fix memory leaks
  cxgb4: fix a memory leak bug
  gpio: Fix build error of function redefinition
  ibmveth: Convert multicast list size for little-endian system
  Bluetooth: btqca: Add a short delay before downloading the NVM
  net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx
  net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context

Change-Id: I2179e5a615a951c2e65ccd816546fc1272da5914
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents 6fdca0f1 bb1c7f3a

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 191

SUBLEVEL = 192

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/kvm/mmio.c

+7 −0
Original line number Diff line number Diff line
@@ -98,6 +98,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	unsigned int len;

	int mask;



	/* Detect an already handled MMIO return */

	if (unlikely(!vcpu->mmio_needed))

		return 0;



	vcpu->mmio_needed = 0;



	if (!run->mmio.is_write) {

		len = run->mmio.len;

		if (len > sizeof(unsigned long))
@@ -200,6 +206,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run, 
	run->mmio.is_write	= is_write;

	run->mmio.phys_addr	= fault_ipa;

	run->mmio.len		= len;

	vcpu->mmio_needed	= 1;



	if (!ret) {

		/* We handled the access successfully in the kernel. */

arch/x86/kernel/apic/apic.c

+0 −4
Original line number Diff line number Diff line
@@ -1067,10 +1067,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
@@ -403,6 +403,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/infiniband/hw/mlx4/mad.c

+2 −2
Original line number Diff line number Diff line
@@ -1643,8 +1643,6 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, 
				    tx_buf_size, DMA_TO_DEVICE);

		kfree(tun_qp->tx_ring[i].buf.addr);

	}

	kfree(tun_qp->tx_ring);

	tun_qp->tx_ring = NULL;

	i = MLX4_NUM_TUNNEL_BUFS;

err:

	while (i > 0) {
@@ -1653,6 +1651,8 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, 
				    rx_buf_size, DMA_FROM_DEVICE);

		kfree(tun_qp->ring[i].addr);

	}

	kfree(tun_qp->tx_ring);

	tun_qp->tx_ring = NULL;

	kfree(tun_qp->ring);

	tun_qp->ring = NULL;

	return -ENOMEM;