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

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

Merge 3.18.77 into android-3.18 



Changes in 3.18.77
	x86/mm: Disable preemption during CR3 read+write
	drm/dp/mst: save vcpi with payloads
	ext4: avoid deadlock when expanding inode size
	sctp: potential read out of bounds in sctp_ulpevent_type_enabled()
	bpf/verifier: reject BPF_ALU64|BPF_END
	packet: hold bind lock when rebinding to fanout hook
	isdn/i4l: fetch the ppp_write buffer in one shot
	vti: fix use after free in vti_tunnel_xmit/vti6_tnl_xmit
	l2tp: Avoid schedule while atomic in exit_net
	l2tp: fix race condition in l2tp_tunnel_delete
	packet: in packet_do_bind, test fanout with bind_lock held
	net: Set sk_prot_creator when cloning sockets to the right proto
	Revert "bsg-lib: don't free job in bsg_prepare_job"
	locking/lockdep: Add nest_lock integrity test
	watchdog: kempld: fix gcc-4.3 build
	irqchip/crossbar: Fix incorrect type of local variables
	netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
	iio: adc: xilinx: Fix error handling
	Btrfs: send, fix failure to rename top level inode due to name collision
	net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs
	crypto: xts - Add ECB dependency
	ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock
	scsi: scsi_dh_emc: return success in clariion_std_inquiry()
	uapi: fix linux/rds.h userspace compilation errors
	uapi: fix linux/mroute6.h userspace compilation errors
	target/iscsi: Fix unsolicited data seq_end_offset calculation
	Revert "tty: goldfish: Fix a parameter of a call to free_irq"
	Linux 3.18.77

Change-Id: I5d44b2d96850f7dee839c6af0b44e3769a8ef3b3
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents cd47f9a1 6f457819

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 76

SUBLEVEL = 77

EXTRAVERSION =

NAME = Diseased Newt

arch/x86/include/asm/tlbflush.h

+7 −0
Original line number Diff line number Diff line
@@ -86,7 +86,14 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask) 


static inline void __native_flush_tlb(void)

{

	/*

	 * If current->mm == NULL then we borrow a mm which may change during a

	 * task switch and therefore we must not be preempted while we write CR3

	 * back:

	 */

	preempt_disable();

	native_write_cr3(native_read_cr3());

	preempt_enable();

}



static inline void __native_flush_tlb_global_irq_disabled(void)

block/bsg-lib.c

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static int bsg_create_job(struct device *dev, struct request *req) 
failjob_rls_rqst_payload:

	kfree(job->request_payload.sg_list);

failjob_rls_job:

	kfree(job);

	return -ENOMEM;

}

crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ config CRYPTO_XTS 
	select CRYPTO_BLKCIPHER

	select CRYPTO_MANAGER

	select CRYPTO_GF128MUL

	select CRYPTO_ECB

	help

	  XTS: IEEE1619/D16 narrow block cipher use with aes-xts-plain,

	  key size 256, 384 or 512 bits. This implementation currently

drivers/gpu/drm/drm_dp_mst_topology.c

+2 −0
Original line number Diff line number Diff line
@@ -1707,6 +1707,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) 
				return -EINVAL;

			}

			req_payload.num_slots = mgr->proposed_vcpis[i]->num_slots;

			req_payload.vcpi = mgr->proposed_vcpis[i]->vcpi;

		} else {

			port = NULL;

			req_payload.num_slots = 0;
@@ -1722,6 +1723,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) 
			if (req_payload.num_slots) {

				drm_dp_create_payload_step1(mgr, mgr->proposed_vcpis[i]->vcpi, &req_payload);

				mgr->payloads[i].num_slots = req_payload.num_slots;

				mgr->payloads[i].vcpi = req_payload.vcpi;

			} else if (mgr->payloads[i].num_slots) {

				mgr->payloads[i].num_slots = 0;

				drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]);