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

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

Merge 4.14.40 into android-4.14 



Changes in 4.14.40
	geneve: update skb dst pmtu on tx path
	net: don't call update_pmtu unconditionally
	percpu: include linux/sched.h for cond_resched()
	crypto: talitos - fix IPsec cipher in length
	ACPI / button: make module loadable when booted in non-ACPI mode
	USB: serial: option: Add support for Quectel EP06
	ALSA: hda - Fix incorrect usage of IS_REACHABLE()
	ALSA: pcm: Check PCM state at xfern compat ioctl
	ALSA: seq: Fix races at MIDI encoding in snd_virmidi_output_trigger()
	ALSA: dice: fix kernel NULL pointer dereference due to invalid calculation for array index
	ALSA: aloop: Mark paused device as inactive
	ALSA: aloop: Add missing cable lock to ctl API callbacks
	tracepoint: Do not warn on ENOMEM
	scsi: target: Fix fortify_panic kernel exception
	Input: leds - fix out of bound access
	Input: atmel_mxt_ts - add touchpad button mapping for Samsung Chromebook Pro
	rtlwifi: btcoex: Add power_on_setting routine
	rtlwifi: cleanup 8723be ant_sel definition
	xfs: prevent creating negative-sized file via INSERT_RANGE
	RDMA/cxgb4: release hw resources on device removal
	RDMA/ucma: Allow resolving address w/o specifying source address
	RDMA/mlx5: Fix multiple NULL-ptr deref errors in rereg_mr flow
	RDMA/mlx5: Protect from shift operand overflow
	NET: usb: qmi_wwan: add support for ublox R410M PID 0x90b2
	IB/mlx5: Use unlimited rate when static rate is not supported
	IB/hfi1: Fix handling of FECN marked multicast packet
	IB/hfi1: Fix loss of BECN with AHG
	IB/hfi1: Fix NULL pointer dereference when invalid num_vls is used
	iw_cxgb4: Atomically flush per QP HW CQEs
	drm/vmwgfx: Fix a buffer object leak
	drm/bridge: vga-dac: Fix edid memory leak
	test_firmware: fix setting old custom fw path back on exit, second try
	errseq: Always report a writeback error once
	USB: serial: visor: handle potential invalid device configuration
	usb: dwc3: gadget: Fix list_del corruption in dwc3_ep_dequeue
	USB: Accept bulk endpoints with 1024-byte maxpacket
	USB: serial: option: reimplement interface masking
	USB: serial: option: adding support for ublox R410M
	usb: musb: host: fix potential NULL pointer dereference
	usb: musb: trace: fix NULL pointer dereference in musb_g_tx()
	platform/x86: asus-wireless: Fix NULL pointer dereference
	irqchip/qcom: Fix check for spurious interrupts
	tracing: Fix bad use of igrab in trace_uprobe.c
	Linux 4.14.40

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 2ae46065 fc72a417

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 39

SUBLEVEL = 40

EXTRAVERSION =

NAME = Petit Gorille

drivers/acpi/button.c

+23 −1
Original line number Diff line number Diff line
@@ -597,4 +597,26 @@ module_param_call(lid_init_state, 
		  NULL, 0644);

MODULE_PARM_DESC(lid_init_state, "Behavior for reporting LID initial state");



module_acpi_driver(acpi_button_driver);
 
static int acpi_button_register_driver(struct acpi_driver *driver)

{

	/*

	 * Modules such as nouveau.ko and i915.ko have a link time dependency

	 * on acpi_lid_open(), and would therefore not be loadable on ACPI

	 * capable kernels booted in non-ACPI mode if the return value of

	 * acpi_bus_register_driver() is returned from here with ACPI disabled

	 * when this driver is built as a module.

	 */

	if (acpi_disabled)

		return 0;



	return acpi_bus_register_driver(driver);

}



static void acpi_button_unregister_driver(struct acpi_driver *driver)

{

	if (!acpi_disabled)

		acpi_bus_unregister_driver(driver);

}



module_driver(acpi_button_driver, acpi_button_register_driver,

	       acpi_button_unregister_driver);

drivers/crypto/talitos.c

+21 −20
Original line number Diff line number Diff line
@@ -1116,10 +1116,10 @@ static int sg_to_link_tbl_offset(struct scatterlist *sg, int sg_count, 
	return count;

}



int talitos_sg_map(struct device *dev, struct scatterlist *src,

static int talitos_sg_map_ext(struct device *dev, struct scatterlist *src,

			      unsigned int len, struct talitos_edesc *edesc,

		   struct talitos_ptr *ptr,

		   int sg_count, unsigned int offset, int tbl_off)

			      struct talitos_ptr *ptr, int sg_count,

			      unsigned int offset, int tbl_off, int elen)

{

	struct talitos_private *priv = dev_get_drvdata(dev);

	bool is_sec1 = has_ftr_sec1(priv);
@@ -1130,7 +1130,7 @@ int talitos_sg_map(struct device *dev, struct scatterlist *src, 
	}



	to_talitos_ptr_len(ptr, len, is_sec1);

	to_talitos_ptr_ext_set(ptr, 0, is_sec1);

	to_talitos_ptr_ext_set(ptr, elen, is_sec1);



	if (sg_count == 1) {

		to_talitos_ptr(ptr, sg_dma_address(src) + offset, is_sec1);
@@ -1140,7 +1140,7 @@ int talitos_sg_map(struct device *dev, struct scatterlist *src, 
		to_talitos_ptr(ptr, edesc->dma_link_tbl + offset, is_sec1);

		return sg_count;

	}

	sg_count = sg_to_link_tbl_offset(src, sg_count, offset, len,

	sg_count = sg_to_link_tbl_offset(src, sg_count, offset, len + elen,

					 &edesc->link_tbl[tbl_off]);

	if (sg_count == 1) {

		/* Only one segment now, so no link tbl needed*/
@@ -1154,6 +1154,15 @@ int talitos_sg_map(struct device *dev, struct scatterlist *src, 
	return sg_count;

}



static int talitos_sg_map(struct device *dev, struct scatterlist *src,

			  unsigned int len, struct talitos_edesc *edesc,

			  struct talitos_ptr *ptr, int sg_count,

			  unsigned int offset, int tbl_off)

{

	return talitos_sg_map_ext(dev, src, len, edesc, ptr, sg_count, offset,

				  tbl_off, 0);

}



/*

 * fill in and submit ipsec_esp descriptor

 */
@@ -1171,7 +1180,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq, 
	unsigned int ivsize = crypto_aead_ivsize(aead);

	int tbl_off = 0;

	int sg_count, ret;

	int sg_link_tbl_len;

	int elen = 0;

	bool sync_needed = false;

	struct talitos_private *priv = dev_get_drvdata(dev);

	bool is_sec1 = has_ftr_sec1(priv);
@@ -1225,20 +1234,12 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq, 
	 * extent is bytes of HMAC postpended to ciphertext,

	 * typically 12 for ipsec

	 */

	to_talitos_ptr_len(&desc->ptr[4], cryptlen, is_sec1);

	to_talitos_ptr_ext_set(&desc->ptr[4], 0, is_sec1);



	sg_link_tbl_len = cryptlen;



	if (desc->hdr & DESC_HDR_TYPE_IPSEC_ESP) {

		to_talitos_ptr_ext_set(&desc->ptr[4], authsize, is_sec1);



		if (edesc->desc.hdr & DESC_HDR_MODE1_MDEU_CICV)

			sg_link_tbl_len += authsize;

	}

	if ((desc->hdr & DESC_HDR_TYPE_IPSEC_ESP) &&

	    (desc->hdr & DESC_HDR_MODE1_MDEU_CICV))

		elen = authsize;



	ret = talitos_sg_map(dev, areq->src, sg_link_tbl_len, edesc,

			     &desc->ptr[4], sg_count, areq->assoclen, tbl_off);

	ret = talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, &desc->ptr[4],

				 sg_count, areq->assoclen, tbl_off, elen);



	if (ret > 1) {

		tbl_off += ret;

drivers/gpu/drm/bridge/dumb-vga-dac.c

+3 −1
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ static int dumb_vga_get_modes(struct drm_connector *connector) 
	}



	drm_mode_connector_update_edid_property(connector, edid);

	return drm_add_edid_modes(connector, edid);

	ret = drm_add_edid_modes(connector, edid);

	kfree(edid);

	return ret;



fallback:

	/*

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+1 −0
Original line number Diff line number Diff line
@@ -2612,6 +2612,7 @@ void vmw_kms_helper_resource_finish(struct vmw_validation_ctx *ctx, 
		vmw_kms_helper_buffer_finish(res->dev_priv, NULL, ctx->buf,

					     out_fence, NULL);



	vmw_dmabuf_unreference(&ctx->buf);

	vmw_resource_unreserve(res, false, NULL, 0);

	mutex_unlock(&res->dev_priv->cmdbuf_mutex);

}