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

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

Merge 3.18.79 into android-3.18 



Changes in 3.18.79
	ceph: unlock dangling spinlock in try_flush_caps()
	usb: xhci: Handle error condition in xhci_stop_device()
	spi: uapi: spidev: add missing ioctl header
	fuse: fix READDIRPLUS skipping an entry
	Input: gtco - fix potential out-of-bound access
	assoc_array: Fix a buggy node-splitting case
	scsi: zfcp: fix erp_action use-before-initialize in REC action trace
	scsi: sg: Re-fix off by one in sg_fill_request_table()
	can: kvaser_usb: Correct return value in printout
	ecryptfs: fix dereference of NULL user_key_payload
	Linux 3.18.79

Change-Id: Ie675f92e62d71fed4756909d27b2e717a5fc6bd7
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 74919824 4f823316

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 78

SUBLEVEL = 79

EXTRAVERSION =

NAME = Diseased Newt

drivers/input/tablet/gtco.c

+10 −7
Original line number Diff line number Diff line
@@ -231,13 +231,17 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report, 


	/* Walk  this report and pull out the info we need */

	while (i < length) {

		prefix = report[i];



		/* Skip over prefix */

		i++;

		prefix = report[i++];



		/* Determine data size and save the data in the proper variable */

		size = PREF_SIZE(prefix);

		size = (1U << PREF_SIZE(prefix)) >> 1;

		if (i + size > length) {

			dev_err(ddev,

				"Not enough data (need %d, have %d)\n",

				i + size, length);

			break;

		}



		switch (size) {

		case 1:

			data = report[i];
@@ -245,8 +249,7 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report, 
		case 2:

			data16 = get_unaligned_le16(&report[i]);

			break;

		case 3:

			size = 4;

		case 4:

			data32 = get_unaligned_le32(&report[i]);

			break;

		}

drivers/net/can/usb/kvaser_usb.c

+2 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,8 @@ static int kvaser_usb_close(struct net_device *netdev) 
	if (err)

		netdev_warn(netdev, "Cannot flush queue, error %d\n", err);



	if (kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, priv->channel))

	err = kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, priv->channel);

	if (err)

		netdev_warn(netdev, "Cannot reset card, error %d\n", err);



	err = kvaser_usb_stop_chip(priv);

drivers/s390/scsi/zfcp_aux.c

+5 −0
Original line number Diff line number Diff line
@@ -356,6 +356,8 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device) 
	INIT_WORK(&adapter->scan_work, zfcp_fc_scan_ports);

	INIT_WORK(&adapter->ns_up_work, zfcp_fc_sym_name_update);



	adapter->erp_action.adapter = adapter;



	if (zfcp_qdio_setup(adapter))

		goto failed;
@@ -512,6 +514,9 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn, 
	port->dev.groups = zfcp_port_attr_groups;

	port->dev.release = zfcp_port_release;



	port->erp_action.adapter = adapter;

	port->erp_action.port = port;



	if (dev_set_name(&port->dev, "0x%016llx", (unsigned long long)wwpn)) {

		kfree(port);

		goto err_out;

drivers/s390/scsi/zfcp_erp.c

+11 −7
Original line number Diff line number Diff line
@@ -193,9 +193,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE,

				&zfcp_sdev->status);

		erp_action = &zfcp_sdev->erp_action;

		memset(erp_action, 0, sizeof(struct zfcp_erp_action));

		erp_action->port = port;

		erp_action->sdev = sdev;

		WARN_ON_ONCE(erp_action->port != port);

		WARN_ON_ONCE(erp_action->sdev != sdev);

		if (!(atomic_read(&zfcp_sdev->status) &

		      ZFCP_STATUS_COMMON_RUNNING))

			act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
@@ -208,8 +207,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		zfcp_erp_action_dismiss_port(port);

		atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE, &port->status);

		erp_action = &port->erp_action;

		memset(erp_action, 0, sizeof(struct zfcp_erp_action));

		erp_action->port = port;

		WARN_ON_ONCE(erp_action->port != port);

		WARN_ON_ONCE(erp_action->sdev != NULL);

		if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_RUNNING))

			act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;

		break;
@@ -219,7 +218,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		zfcp_erp_action_dismiss_adapter(adapter);

		atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE, &adapter->status);

		erp_action = &adapter->erp_action;

		memset(erp_action, 0, sizeof(struct zfcp_erp_action));

		WARN_ON_ONCE(erp_action->port != NULL);

		WARN_ON_ONCE(erp_action->sdev != NULL);

		if (!(atomic_read(&adapter->status) &

		      ZFCP_STATUS_COMMON_RUNNING))

			act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
@@ -229,7 +229,11 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		return NULL;

	}



	erp_action->adapter = adapter;

	WARN_ON_ONCE(erp_action->adapter != adapter);

	memset(&erp_action->list, 0, sizeof(erp_action->list));

	memset(&erp_action->timer, 0, sizeof(erp_action->timer));

	erp_action->step = ZFCP_ERP_STEP_UNINITIALIZED;

	erp_action->fsf_req_id = 0;

	erp_action->action = need;

	erp_action->status = act_status;