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

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

Merge 4.9.173 into android-4.9 



Changes in 4.9.173
	usbnet: ipheth: prevent TX queue timeouts when device not ready
	usbnet: ipheth: fix potential null pointer dereference in ipheth_carrier_set
	media: vivid: check if the cec_adapter is valid
	ARM: dts: bcm283x: Fix hdmi hpd gpio pull
	s390: limit brk randomization to 32MB
	qlcnic: Avoid potential NULL pointer dereference
	netfilter: nft_set_rbtree: check for inactive element after flag mismatch
	netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING
	sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
	serial: ar933x_uart: Fix build failure with disabled console
	usb: gadget: net2280: Fix overrun of OUT messages
	usb: gadget: net2280: Fix net2280_dequeue()
	usb: gadget: net2272: Fix net2272_dequeue()
	ARM: dts: pfla02: increase phy reset duration
	net: ks8851: Dequeue RX packets explicitly
	net: ks8851: Reassert reset pin if chip ID check fails
	net: ks8851: Delay requesting IRQ until opened
	net: ks8851: Set initial carrier state to down
	staging: rtl8712: uninitialized memory in read_bbreg_hdl()
	NFS: Fix a typo in nfs_init_timeout_values()
	net: xilinx: fix possible object reference leak
	net: ibm: fix possible object reference leak
	net: ethernet: ti: fix possible object reference leak
	scsi: qla4xxx: fix a potential NULL pointer dereference
	usb: u132-hcd: fix resource leak
	ceph: fix use-after-free on symlink traversal
	scsi: zfcp: reduce flood of fcrscn1 trace records on multi-element RSCN
	libata: fix using DMA buffers on stack
	gpio: of: Fix of_gpiochip_add() error path
	kconfig/[mn]conf: handle backspace (^H) key
	leds: pca9532: fix a potential NULL pointer dereference
	vfio/type1: Limit DMA mappings per container
	Linux 4.9.173

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 2dbf78bc 4b333b9c

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 172

SUBLEVEL = 173

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts

+1 −1
Original line number Diff line number Diff line
@@ -26,5 +26,5 @@ 
};



&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

};

arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii";

	phy-reset-duration = <10>; /* in msecs */

	phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;

	phy-supply = <&vdd_eth_io_reg>;

	status = "disabled";

arch/s390/include/asm/elf.h

+7 −4
Original line number Diff line number Diff line
@@ -215,11 +215,14 @@ do { \ 


/*

 * Cache aliasing on the latest machines calls for a mapping granularity

 * of 512KB. For 64-bit processes use a 512KB alignment and a randomization

 * of up to 1GB. For 31-bit processes the virtual address space is limited,

 * use no alignment and limit the randomization to 8MB.

 * of 512KB for the anonymous mapping base. For 64-bit processes use a

 * 512KB alignment and a randomization of up to 1GB. For 31-bit processes

 * the virtual address space is limited, use no alignment and limit the

 * randomization to 8MB.

 * For the additional randomization of the program break use 32MB for

 * 64-bit and 8MB for 31-bit.

 */

#define BRK_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x3ffffUL)

#define BRK_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x1fffUL)

#define MMAP_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x3ff80UL)

#define MMAP_ALIGN_MASK	(is_compat_task() ? 0 : 0x7fUL)

#define STACK_RND_MASK	MMAP_RND_MASK

drivers/ata/libata-zpodd.c

+24 −10
Original line number Diff line number Diff line
@@ -51,39 +51,53 @@ static int eject_tray(struct ata_device *dev) 
/* Per the spec, only slot type and drawer type ODD can be supported */

static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)

{

	char buf[16];

	char *buf;

	unsigned int ret;

	struct rm_feature_desc *desc = (void *)(buf + 8);

	struct rm_feature_desc *desc;

	struct ata_taskfile tf;

	static const char cdb[] = {  GPCMD_GET_CONFIGURATION,

			2,      /* only 1 feature descriptor requested */

			0, 3,   /* 3, removable medium feature */

			0, 0, 0,/* reserved */

			0, sizeof(buf),

			0, 16,

			0, 0, 0,

	};



	buf = kzalloc(16, GFP_KERNEL);

	if (!buf)

		return ODD_MECH_TYPE_UNSUPPORTED;

	desc = (void *)(buf + 8);



	ata_tf_init(dev, &tf);

	tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;

	tf.command = ATA_CMD_PACKET;

	tf.protocol = ATAPI_PROT_PIO;

	tf.lbam = sizeof(buf);

	tf.lbam = 16;



	ret = ata_exec_internal(dev, &tf, cdb, DMA_FROM_DEVICE,

				buf, sizeof(buf), 0);

	if (ret)

				buf, 16, 0);

	if (ret) {

		kfree(buf);

		return ODD_MECH_TYPE_UNSUPPORTED;

	}



	if (be16_to_cpu(desc->feature_code) != 3)

	if (be16_to_cpu(desc->feature_code) != 3) {

		kfree(buf);

		return ODD_MECH_TYPE_UNSUPPORTED;

	}



	if (desc->mech_type == 0 && desc->load == 0 && desc->eject == 1)

	if (desc->mech_type == 0 && desc->load == 0 && desc->eject == 1) {

		kfree(buf);

		return ODD_MECH_TYPE_SLOT;

	else if (desc->mech_type == 1 && desc->load == 0 && desc->eject == 1)

	} else if (desc->mech_type == 1 && desc->load == 0 &&

		   desc->eject == 1) {

		kfree(buf);

		return ODD_MECH_TYPE_DRAWER;

	else

	} else {

		kfree(buf);

		return ODD_MECH_TYPE_UNSUPPORTED;

	}

}



/* Test if ODD is zero power ready by sense code */

static bool zpready(struct ata_device *dev)