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

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

Merge 3.18.113 into android-3.18 



Changes in 3.18.113
	tracing: Fix crash when freeing instances with event triggers
	selinux: KASAN: slab-out-of-bounds in xattr_getsecurity
	cfg80211: further limit wiphy names to 64 bytes
	tcp: avoid integer overflows in tcp_rcv_space_adjust()
	MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs
	drm/i915: Disable LVDS on Radiant P845
	fix io_destroy()/aio_complete() race
	mm: fix the NULL mapping case in __isolate_lru_page()
	mmap: introduce sane default mmap limits
	mmap: relax file size limit for regular files
	drm: set FMODE_UNSIGNED_OFFSET for drm files
	bnx2x: use the right constant
	dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()
	enic: set DMA mask to 47 bit
	ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds
	isdn: eicon: fix a missing-check bug
	net/packet: refine check for priv area size
	net: usb: cdc_mbim: add flag FLAG_SEND_ZLP
	net/mlx4: Fix irq-unsafe spinlock usage
	team: use netdev_features_t instead of u32
	rtnetlink: validate attributes in do_setlink()
	Linux 3.18.113

Change-Id: Ibf07496bae9bb4d4059eb6f938d85666a2a79343
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0e469fca 31767764

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 112

SUBLEVEL = 113

EXTRAVERSION =

NAME = Diseased Newt

arch/mips/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ long arch_ptrace(struct task_struct *child, long request, 
				break;

			}

#endif

			tmp = get_fpr32(&fregs[addr - FPR_BASE], 0);

			tmp = get_fpr64(&fregs[addr - FPR_BASE], 0);

			break;

		case PC:

			tmp = regs->cp0_epc;

arch/mips/kernel/ptrace32.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
						addr & 1);

				break;

			}

			tmp = get_fpr32(&fregs[addr - FPR_BASE], 0);

			tmp = get_fpr64(&fregs[addr - FPR_BASE], 0);

			break;

		case PC:

			tmp = regs->cp0_epc;

drivers/gpu/drm/drm_fops.c

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor) 
		return -ENOMEM;



	filp->private_data = priv;

	filp->f_mode |= FMODE_UNSIGNED_OFFSET;

	priv->filp = filp;

	priv->uid = current_euid();

	priv->pid = get_pid(task_pid(current));

drivers/gpu/drm/i915/intel_lvds.c

+8 −0
Original line number Diff line number Diff line
@@ -745,6 +745,14 @@ static const struct dmi_system_id intel_no_lvds[] = { 
			DMI_EXACT_MATCH(DMI_BOARD_NAME, "D525MW"),

		},

	},

	{

		.callback = intel_no_lvds_dmi_callback,

		.ident = "Radiant P845",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Radiant Systems Inc"),

			DMI_MATCH(DMI_PRODUCT_NAME, "P845"),

		},

	},



	{ }	/* terminating entry */

};