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

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

Merge 3.18.107 into android-3.18 



Changes in 3.18.107
	cifs: do not allow creating sockets except with SMB1 posix exensions
	x86/tsc: Prevent 32bit truncation in calc_hpet_ref()
	ext4: fix deadlock between inline_data and ext4_expand_extra_isize_ea()
	ext4: bugfix for mmaped pages in mpage_release_unused_pages()
	ext4: don't update checksum of new initialized bitmaps
	perf: Return proper values for user stack errors
	mm/filemap.c: fix NULL pointer in page_cache_tree_insert()
	jbd2: fix use after free in kjournald2()
	bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
	KEYS: DNS: limit the length of option strings
	l2tp: check sockaddr length in pppol2tp_connect()
	tcp: don't read out-of-bounds opsize
	team: avoid adding twice the same option to the event list
	team: fix netconsole setup over team
	pppoe: check sockaddr length in pppoe_connect()
	llc: hold llc_sap before release_sock()
	llc: fix NULL pointer deref for SOCK_ZAPPED
	packet: fix bitfield update race
	tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets
	net: af_packet: fix race in PACKET_{R|T}X_RING
	llc: delete timers synchronously in llc_sk_free()
	ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
	scsi: mptsas: Disable WRITE SAME
	cdrom: information leak in cdrom_ioctl_media_changed()
	Linux 3.18.107

Change-Id: Ic724a65b0fff40f18c99ca4693427a22e0a0e957
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9a03aba0 754ca08e

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 106

SUBLEVEL = 107

EXTRAVERSION =

NAME = Diseased Newt

arch/x86/kernel/tsc.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static unsigned long calc_hpet_ref(u64 deltatsc, u64 hpet1, u64 hpet2) 
	hpet2 -= hpet1;

	tmp = ((u64)hpet2 * hpet_readl(HPET_PERIOD));

	do_div(tmp, 1000000);

	do_div(deltatsc, tmp);

	deltatsc = div64_u64(deltatsc, tmp);



	return (unsigned long) deltatsc;

}

drivers/cdrom/cdrom.c

+1 −1
Original line number Diff line number Diff line
@@ -2357,7 +2357,7 @@ static int cdrom_ioctl_media_changed(struct cdrom_device_info *cdi, 
	if (!CDROM_CAN(CDC_SELECT_DISC) || arg == CDSL_CURRENT)

		return media_changed(cdi, 1);



	if ((unsigned int)arg >= cdi->capacity)

	if (arg >= cdi->capacity)

		return -EINVAL;



	info = kmalloc(sizeof(*info), GFP_KERNEL);

drivers/message/fusion/mptsas.c

+1 −0
Original line number Diff line number Diff line
@@ -1994,6 +1994,7 @@ static struct scsi_host_template mptsas_driver_template = { 
	.cmd_per_lun			= 7,

	.use_clustering			= ENABLE_CLUSTERING,

	.shost_attrs			= mptscsih_host_attrs,

	.no_write_same			= 1,

};



static int mptsas_get_linkerrors(struct sas_phy *phy)

drivers/net/bonding/bond_main.c

+1 −2
Original line number Diff line number Diff line
@@ -1505,8 +1505,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	} /* switch(bond_mode) */



#ifdef CONFIG_NET_POLL_CONTROLLER

	slave_dev->npinfo = bond->dev->npinfo;

	if (slave_dev->npinfo) {

	if (bond->dev->npinfo) {

		if (slave_enable_netpoll(new_slave)) {

			netdev_info(bond_dev, "master_dev is using netpoll, but new slave device does not support netpoll\n");

			res = -EBUSY;