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

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

Merge 4.9.210 into android-4.9-q 



Changes in 4.9.210
	kobject: Export kobject_get_unless_zero()
	chardev: Avoid potential use-after-free in 'chrdev_open()'
	usb: chipidea: host: Disable port power only if previously enabled
	ALSA: usb-audio: Apply the sample rate quirk for Bose Companion 5
	tcp: minimize false-positives on TCP/GRO check
	kernel/trace: Fix do not unregister tracepoints when register sched_migrate_task fail
	tracing: Have stack tracer compile when MCOUNT_INSN_SIZE is not defined
	HID: Fix slab-out-of-bounds read in hid_field_extract
	HID: uhid: Fix returning EPOLLOUT from uhid_char_poll
	HID: hid-input: clear unmapped usages
	Input: add safety guards to input_set_keycode()
	drm/dp_mst: correct the shifting in DP_REMOTE_I2C_READ
	can: gs_usb: gs_usb_probe(): use descriptors of current altsetting
	can: mscan: mscan_rx_poll(): fix rx path lockup when returning from polling to irq mode
	can: can_dropped_invalid_skb(): ensure an initialized headroom in outgoing CAN sk_buffs
	staging: vt6656: set usb_set_intfdata on driver fail.
	USB: serial: option: add ZLP support for 0x1bc7/0x9010
	usb: musb: fix idling for suspend after disconnect interrupt
	usb: musb: Disable pullup at init
	usb: musb: dma: Correct parameter passed to IRQ handler
	staging: comedi: adv_pci1710: fix AI channels 16-31 for PCI-1713
	staging: rtl8188eu: Add device code for TP-Link TL-WN727N v5.21
	tty: link tty and port before configuring it as console
	tty: always relink the port
	mwifiex: fix possible heap overflow in mwifiex_process_country_ie()
	mwifiex: pcie: Fix memory leak in mwifiex_pcie_alloc_cmdrsp_buf
	scsi: bfa: release allocated memory in case of error
	rtl8xxxu: prevent leaking urb
	USB: Fix: Don't skip endpoint descriptors with maxpacket=0
	netfilter: arp_tables: init netns pointer in xt_tgchk_param struct
	netfilter: ipset: avoid null deref when IPSET_ATTR_LINENO is present
	drm/i915/gen9: Clear residual context state on context switch
	Linux 4.9.210

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I729c1f8c803f15426daa228d35e03307e9ff01f0
parents c8300632 36fa7559

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 209

SUBLEVEL = 210

EXTRAVERSION =

NAME = Roaring Lionus

drivers/gpu/drm/drm_dp_mst_topology.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void drm_dp_encode_sideband_req(struct drm_dp_sideband_msg_req_body *req, 
			memcpy(&buf[idx], req->u.i2c_read.transactions[i].bytes, req->u.i2c_read.transactions[i].num_bytes);

			idx += req->u.i2c_read.transactions[i].num_bytes;



			buf[idx] = (req->u.i2c_read.transactions[i].no_stop_bit & 0x1) << 5;

			buf[idx] = (req->u.i2c_read.transactions[i].no_stop_bit & 0x1) << 4;

			buf[idx] |= (req->u.i2c_read.transactions[i].i2c_transaction_delay & 0xf);

			idx++;

		}

drivers/gpu/drm/i915/intel_lrc.c

+12 −15
Original line number Diff line number Diff line
@@ -1017,6 +1017,8 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine, 
	int ret;

	struct drm_i915_private *dev_priv = engine->i915;

	uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);

	u32 scratch_addr =

			i915_ggtt_offset(engine->scratch) + 2 * CACHELINE_BYTES;



	/* WaDisableCtxRestoreArbitration:skl,bxt */

	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_D0) ||
@@ -1036,12 +1038,8 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine, 
			    GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE));

	wa_ctx_emit(batch, index, MI_NOOP);



	/* WaClearSlmSpaceAtContextSwitch:kbl */

	/* WaClearSlmSpaceAtContextSwitch:skl,bxt,kbl,glk,cfl */

	/* Actual scratch location is at 128 bytes offset */

	if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_A0)) {

		u32 scratch_addr =

			i915_ggtt_offset(engine->scratch) + 2 * CACHELINE_BYTES;



	wa_ctx_emit(batch, index, GFX_OP_PIPE_CONTROL(6));

	wa_ctx_emit(batch, index, (PIPE_CONTROL_FLUSH_L3 |

				   PIPE_CONTROL_GLOBAL_GTT_IVB |
@@ -1051,7 +1049,6 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine, 
	wa_ctx_emit(batch, index, 0);

	wa_ctx_emit(batch, index, 0);

	wa_ctx_emit(batch, index, 0);

	}



	/* WaMediaPoolStateCmdInWABB:bxt */

	if (HAS_POOLED_EU(engine->i915)) {

drivers/hid/hid-core.c

+6 −0
Original line number Diff line number Diff line
@@ -269,6 +269,12 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign 
	offset = report->size;

	report->size += parser->global.report_size * parser->global.report_count;



	/* Total size check: Allow for possible report index byte */

	if (report->size > (HID_MAX_BUFFER_SIZE - 1) << 3) {

		hid_err(parser->device, "report is too long\n");

		return -1;

	}



	if (!parser->local.usage_index) /* Ignore padding fields */

		return 0;

drivers/hid/hid-input.c

+12 −4
Original line number Diff line number Diff line
@@ -1084,9 +1084,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
	}



mapped:

	if (device->driver->input_mapped && device->driver->input_mapped(device,

				hidinput, field, usage, &bit, &max) < 0)

		goto ignore;

	if (device->driver->input_mapped &&

	    device->driver->input_mapped(device, hidinput, field, usage,

					 &bit, &max) < 0) {

		/*

		 * The driver indicated that no further generic handling

		 * of the usage is desired.

		 */

		return;

	}



	set_bit(usage->type, input->evbit);
@@ -1144,9 +1150,11 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		set_bit(MSC_SCAN, input->mscbit);

	}



ignore:

	return;



ignore:

	usage->type = 0;

	usage->code = 0;

}



void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)