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

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

Merge 4.9.151 into android-4.9 



Changes in 4.9.151
	ALSA: hda/realtek - Disable headset Mic VREF for headset mode of ALC225
	CIFS: Do not hide EINTR after sending network packets
	cifs: Fix potential OOB access of lock element array
	usb: cdc-acm: send ZLP for Telit 3G Intel based modems
	USB: storage: don't insert sane sense for SPC3+ when bad sense specified
	USB: storage: add quirk for SMI SM3350
	USB: Add USB_QUIRK_DELAY_CTRL_MSG quirk for Corsair K70 RGB
	slab: alien caches must not be initialized if the allocation of the alien cache failed
	mm: page_mapped: don't assume compound page is huge or THP
	ACPI: power: Skip duplicate power resource references in _PRx
	i2c: dev: prevent adapter retries and timeout being set as minus value
	rbd: don't return 0 on unmap if RBD_DEV_FLAG_REMOVING is set
	ext4: make sure enough credits are reserved for dioread_nolock writes
	ext4: fix a potential fiemap/page fault deadlock w/ inline_data
	ext4: avoid kernel warning when writing the superblock to a dead device
	sunrpc: use-after-free in svc_process_common()
	Linux 4.9.151

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ca975794 008bfb93

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 150

SUBLEVEL = 151

EXTRAVERSION =

NAME = Roaring Lionus

drivers/acpi/power.c

+22 −0
Original line number Diff line number Diff line
@@ -131,6 +131,23 @@ void acpi_power_resources_list_free(struct list_head *list) 
	}

}



static bool acpi_power_resource_is_dup(union acpi_object *package,

				       unsigned int start, unsigned int i)

{

	acpi_handle rhandle, dup;

	unsigned int j;



	/* The caller is expected to check the package element types */

	rhandle = package->package.elements[i].reference.handle;

	for (j = start; j < i; j++) {

		dup = package->package.elements[j].reference.handle;

		if (dup == rhandle)

			return true;

	}



	return false;

}



int acpi_extract_power_resources(union acpi_object *package, unsigned int start,

				 struct list_head *list)

{
@@ -150,6 +167,11 @@ int acpi_extract_power_resources(union acpi_object *package, unsigned int start, 
			err = -ENODEV;

			break;

		}



		/* Some ACPI tables contain duplicate power resource references */

		if (acpi_power_resource_is_dup(package, start, i))

			continue;



		err = acpi_add_power_resource(rhandle);

		if (err)

			break;

drivers/block/rbd.c

+4 −5
Original line number Diff line number Diff line
@@ -6346,7 +6346,6 @@ static ssize_t do_rbd_remove(struct bus_type *bus, 
	struct list_head *tmp;

	int dev_id;

	char opt_buf[6];

	bool already = false;

	bool force = false;

	int ret;
@@ -6379,13 +6378,13 @@ static ssize_t do_rbd_remove(struct bus_type *bus, 
		spin_lock_irq(&rbd_dev->lock);

		if (rbd_dev->open_count && !force)

			ret = -EBUSY;

		else

			already = test_and_set_bit(RBD_DEV_FLAG_REMOVING,

							&rbd_dev->flags);

		else if (test_and_set_bit(RBD_DEV_FLAG_REMOVING,

					  &rbd_dev->flags))

			ret = -EINPROGRESS;

		spin_unlock_irq(&rbd_dev->lock);

	}

	spin_unlock(&rbd_dev_list_lock);

	if (ret < 0 || already)

	if (ret)

		return ret;



	if (force) {

drivers/i2c/i2c-dev.c

+6 −0
Original line number Diff line number Diff line
@@ -461,9 +461,15 @@ static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		return i2cdev_ioctl_smbus(client, arg);



	case I2C_RETRIES:

		if (arg > INT_MAX)

			return -EINVAL;



		client->adapter->retries = arg;

		break;

	case I2C_TIMEOUT:

		if (arg > INT_MAX)

			return -EINVAL;



		/* For historical reasons, user-space sets the timeout

		 * value in units of 10 ms.

		 */

drivers/usb/class/cdc-acm.c

+7 −0
Original line number Diff line number Diff line
@@ -1828,6 +1828,13 @@ static const struct usb_device_id acm_ids[] = { 
	.driver_info = IGNORE_DEVICE,

	},



	{ USB_DEVICE(0x1bc7, 0x0021), /* Telit 3G ACM only composition */

	.driver_info = SEND_ZERO_PACKET,

	},

	{ USB_DEVICE(0x1bc7, 0x0023), /* Telit 3G ACM + ECM composition */

	.driver_info = SEND_ZERO_PACKET,

	},



	/* control interfaces without any protocol set */

	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,

		USB_CDC_PROTO_NONE) },