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

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

Merge 3.18.73 into android-3.18 



Changes in 3.18.73
	cifs: release cifs root_cred after exit_cifs
	cifs: release auth_key.response for reconnect.
	mac80211: flush hw_roc_start work before cancelling the ROC
	KVM: PPC: Book3S: Fix race and leak in kvm_vm_ioctl_create_spapr_tce()
	tracing: Fix trace_pipe behavior for instance traces
	tracing: Erase irqsoff trace with empty write
	scsi: scsi_transport_iscsi: fix the issue that iscsi_if_rx doesn't parse nlmsg properly
	crypto: talitos - fix sha224
	KEYS: fix writing past end of user-supplied buffer in keyring_read()
	KEYS: prevent creating a different user's keyrings
	KEYS: prevent KEYCTL_READ on negative key
	powerpc/pseries: Fix parent_dn reference leak in add_dt_node()
	SMB: Validate negotiate (to protect against downgrade) even if signing off
	SMB3: Don't ignore O_SYNC/O_DSYNC and O_DIRECT flags
	vfs: Return -ENXIO for negative SEEK_HOLE / SEEK_DATA offsets
	nl80211: check for the required netlink attributes presence
	bsg-lib: don't free job in bsg_prepare_job
	arm64: Make sure SPsel is always set
	kvm: nVMX: Don't allow L2 to access the hardware CR8
	PCI: Fix race condition with driver_override
	btrfs: prevent to set invalid default subvolid
	x86/fpu: Don't let userspace set bogus xcomp_bv
	video: fbdev: aty: do not leak uninitialized padding in clk to userspace
	swiotlb-xen: implement xen_swiotlb_dma_mmap callback
	fix xen_swiotlb_dma_mmap prototype
	Linux 3.18.73

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

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 72

SUBLEVEL = 73

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/xen/mm.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { 
	.unmap_page = xen_swiotlb_unmap_page,

	.dma_supported = xen_swiotlb_dma_supported,

	.set_dma_mask = xen_swiotlb_set_dma_mask,

	.mmap = xen_swiotlb_dma_mmap,

};



int __init xen_mm_init(void)

arch/arm64/kernel/head.S

+1 −0
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ ENDPROC(__mmap_switched) 
 * booted in EL1 or EL2 respectively.

 */

ENTRY(el2_setup)

	msr	SPsel, #1			// We want to use SP_EL{1,2}

	mrs	x0, CurrentEL

	cmp	x0, #CurrentEL_EL2

	b.ne	1f

arch/powerpc/kvm/book3s_64_vio.c

+27 −19
Original line number Diff line number Diff line
@@ -101,22 +101,17 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, 
				   struct kvm_create_spapr_tce *args)

{

	struct kvmppc_spapr_tce_table *stt = NULL;

	struct kvmppc_spapr_tce_table *siter;

	long npages;

	int ret = -ENOMEM;

	int i;



	/* Check this LIOBN hasn't been previously allocated */

	list_for_each_entry(stt, &kvm->arch.spapr_tce_tables, list) {

		if (stt->liobn == args->liobn)

			return -EBUSY;

	}



	npages = kvmppc_stt_npages(args->window_size);



	stt = kzalloc(sizeof(*stt) + npages * sizeof(struct page *),

		      GFP_KERNEL);

	if (!stt)

		goto fail;

		return ret;



	stt->liobn = args->liobn;

	stt->window_size = args->window_size;
@@ -128,23 +123,36 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, 
			goto fail;

	}



	kvm_get_kvm(kvm);



	mutex_lock(&kvm->lock);



	/* Check this LIOBN hasn't been previously allocated */

	ret = 0;

	list_for_each_entry(siter, &kvm->arch.spapr_tce_tables, list) {

		if (siter->liobn == args->liobn) {

			ret = -EBUSY;

			break;

		}

	}



	if (!ret)

		ret = anon_inode_getfd("kvm-spapr-tce", &kvm_spapr_tce_fops,

				       stt, O_RDWR | O_CLOEXEC);



	if (ret >= 0) {

		list_add(&stt->list, &kvm->arch.spapr_tce_tables);

		kvm_get_kvm(kvm);

	}



	mutex_unlock(&kvm->lock);



	return anon_inode_getfd("kvm-spapr-tce", &kvm_spapr_tce_fops,

				stt, O_RDWR | O_CLOEXEC);

	if (ret >= 0)

		return ret;



 fail:

	if (stt) {

	for (i = 0; i < npages; i++)

		if (stt->pages[i])

			__free_page(stt->pages[i]);



	kfree(stt);

	}

	return ret;

}

arch/powerpc/platforms/pseries/mobility.c

+3 −1
Original line number Diff line number Diff line
@@ -225,8 +225,10 @@ static int add_dt_node(__be32 parent_phandle, __be32 drc_index) 
		return -ENOENT;



	dn = dlpar_configure_connector(drc_index, parent_dn);

	if (!dn)

	if (!dn) {

		of_node_put(parent_dn);

		return -ENOENT;

	}



	rc = dlpar_attach_node(dn);

	if (rc)