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

Commit 6e3b93b0 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-170125. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1112287   I62b2e50f8db39bdc430299a817ba621288ab4f3e   ASoC: msm: Include interrupt registers in pdata
1112956   I15d86f60cd3bd33e392b313f7a4ee2fca91207d4   mac80211: pass block ack session timeout to to driver
1112956   I63fdf95d25ca5bdfa87c54cea8e9a68eae715e44   Revert "mac80211: pass block ack session timeout to to d
1114525   I4df2f180ba560cf531fe97403775d4fa47061e6b   defconfig: msm: Remove LOCKUP detector in sdm660 perf co
1103089   Ice42dca6d47eb8febfe8a34e566c69e4799fab57   crypto: msm: check integer overflow on total data len in
1114411   I5d141f531f1cfdab0bd0056041e22acb26657960   msm: ipa: Fix WDI2.0 stats
1108990   I5ed1bc5f6696c8ef05a51205e83d5dc2b23dd18e   defconfig: msm: enable dvb demux modules compilation for

Change-Id: I7ba3524d21c53929c2e1cad2a53a91d4d611bb66
CRs-Fixed: 1108990, 1112287, 1114525, 1103089, 1112956, 1114411
parents 29b3dc03 314869eb

arch/arm/configs/sdm660-perf_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ CONFIG_REGULATOR_PROXY_CONSUMER=y 
CONFIG_REGULATOR_STUB=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_ADV_DEBUG=y
@@ -372,6 +373,8 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_MSM_CAMERA=y

CONFIG_MSM_CAMERA_DEBUG=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y
@@ -582,8 +585,6 @@ CONFIG_PRINTK_TIME=y 
CONFIG_DEBUG_INFO=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_PAGE_EXTENSION=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

CONFIG_PANIC_TIMEOUT=5

# CONFIG_SCHED_DEBUG is not set

CONFIG_PANIC_ON_SCHED_BUG=y

arch/arm/configs/sdm660_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ CONFIG_REGULATOR_PROXY_CONSUMER=y 
CONFIG_REGULATOR_STUB=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_ADV_DEBUG=y
@@ -374,6 +375,8 @@ CONFIG_MSM_VIDC_V4L2=m 
CONFIG_MSM_VIDC_GOVERNORS=m

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

arch/arm64/configs/sdm660-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ CONFIG_REGULATOR_PROXY_CONSUMER=y 
CONFIG_REGULATOR_STUB=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_ADV_DEBUG=y
@@ -400,6 +401,8 @@ CONFIG_MSM_VIDC_VMEM=y 
CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

arch/arm64/configs/sdm660_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ CONFIG_REGULATOR_PROXY_CONSUMER=y 
CONFIG_REGULATOR_STUB=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_ADV_DEBUG=y
@@ -402,6 +403,8 @@ CONFIG_MSM_VIDC_VMEM=y 
CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

drivers/crypto/msm/qcedev.c

+10 −1
Original line number Diff line number Diff line
@@ -1445,6 +1445,15 @@ static int qcedev_check_cipher_params(struct qcedev_cipher_op_req *req, 
			pr_err("%s: Invalid byte offset\n", __func__);

			goto error;

		}

		total = req->byteoffset;

		for (i = 0; i < req->entries; i++) {

			if (total > U32_MAX - req->vbuf.src[i].len) {

				pr_err("%s:Integer overflow on total src len\n",

					__func__);

				goto error;

			}

			total += req->vbuf.src[i].len;

		}

	}



	if (req->data_len < req->byteoffset) {
@@ -1480,7 +1489,7 @@ static int qcedev_check_cipher_params(struct qcedev_cipher_op_req *req, 
		}

	}

	/* Check for sum of all dst length is equal to data_len  */

	for (i = 0; i < req->entries; i++) {

	for (i = 0, total = 0; i < req->entries; i++) {

		if (req->vbuf.dst[i].len >= U32_MAX - total) {

			pr_err("%s: Integer overflow on total req dst vbuf length\n",

				__func__);