(CR) ALPS03957020(For_mt6737m_35_n1_alps-mp-n1.mp1-V1_P118)

Patch Type:
  Customer Request
CR ID:
  ALPS03957020
Severity:

Description:
  [Patch Request] [PMS] mt, Project: mt6737M_35_N1, SW Version: alps-mp-n1.mp1-V1N/A

Associated Files:
  device/mt/mt6737m_35_n1/ProjectConfig.mk

Patch Type:
  Customer Request
CR ID:
  ALPS03913671
Severity:
  Critical
Description:
  [Google Security P***h][CVE_2018_9369]EoP Vulnerability i***ootloader (Device Specific)
  [[Title fo***ustomer]]
  [Google Security P***h][CVE_2018_9369]EoP Vulnerability i***ootloader (Device Specific)
  [[Problem Description]]
  [Google Security P***h][CVE_2018_9369]EoP Vulnerability i***ootloader (Device Specific)
  [[Potential Impa*** of the solution]]
  None
  [[Modules to be verified after taking p***h]]
  None
  [[問題標題]]
  [Google Security P***h][CVE_2018_9369]EoP Vulnerability i***ootloader (Device Specific)
  [[問題現象]]
  [Google Security P***h][CVE_2018_9369]EoP Vulnerability i***ootloader (Device Specific)
  [[解法可能帶來的影響]]
  (請填寫於此行下方，並描述如果合入這個p***h可能會有什麼trade off的改變，如perfo******e降低、UI改變等等)
  None
  [[建議驗證模塊]]
  (請填寫於此行下方，並建議客戶合了此p***h後要驗證哪些module或feature)
  NoneN/A

Associated Files:
  vendor/mediatek/proprietary/bootable/bootloader/lk/app/mt_boot/fastboot.c

Patch Type:
  Customer Request
CR ID:
  ALPS03913728
Severity:
  Critical
Description:
  [Google Security P***h][CVE_2018_9394]EoP Vulnerability in P2P (Device Specific)
  [[Title fo***ustomer]]
  [Google Security P***h][CVE_2018_9394]EoP Vulnerability in P2P (Device Specific)
  [[Problem Description]]
  [Google Security P***h][CVE_2018_9394]EoP Vulnerability in P2P (Device Specific)
  [[Potential Impa*** of the solution]]
  None
  [[Modules to be verified after taking p***h]]
  None
  [[問題標題]]
  [Google Security P***h][CVE_2018_9394]EoP Vulnerability in P2P (Device Specific)
  [[問題現象]]
  [Google Security P***h][CVE_2018_9394]EoP Vulnerability in P2P (Device Specific)
  [[解法可能帶來的影響]]
  (請填寫於此行下方，並描述如果合入這個p***h可能會有什麼trade off的改變，如perfo******e降低、UI改變等等)
  None
  [[建議驗證模塊]]
  (請填寫於此行下方，並建議客戶合了此p***h後要驗證哪些module或feature)
  NoneN/A

Associated Files:
  kernel-3.18/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_p2p.c

Patch Type:
  Customer Request
CR ID:
  ALPS03913732
Severity:
  Critical
Description:
  [Google Security P***h][CVE_2018_9396]EoP Vulnerability in C*** (Device Specific)
  [[Title fo***ustomer]]
  [Google Security P***h][CVE_2018_9396]EoP Vulnerability in C*** (Device Specific)
  [[Problem Description]]
  [Google Security P***h][CVE_2018_9396]EoP Vulnerability in C*** (Device Specific)
  [[Potential Impa*** of the solution]]
  None
  [[Modules to be verified after taking p***h]]
  None
  [[問題標題]]
  [Google Security P***h][CVE_2018_9396]EoP Vulnerability in C*** (Device Specific)
  [[問題現象]]
  [Google Security P***h][CVE_2018_9396]EoP Vulnerability in C*** (Device Specific)
  [[解法可能帶來的影響]]
  (請填寫於此行下方，並描述如果合入這個p***h可能會有什麼trade off的改變，如perfo******e降低、UI改變等等)
  None
  [[建議驗證模塊]]
  (請填寫於此行下方，並建議客戶合了此p***h後要驗證哪些module或feature)
  NoneN/A

Associated Files:
  kernel-3.18/drivers/misc/mediatek/eccci/port_rpc.c

Patch Type:
  Customer Request
CR ID:
  ALPS03921114
Severity:
  Critical
Description:
  [IMS ***erface][version#0x68][AP] Added support fo***ountry-specific ur***o***o call response
  [[Title fo***ustomer]]
  IMS ***erface to support country-specific URN
  [[Problem Description]]
  Added support for IMS ***erface mo_call_c*** to country-specific URN which I***tack may send to MD side.
  [[Potential Impa*** of the solution]]
  Emergency call fun***ionality possible to implement as per ***PP and operator requirement.
  [[Modules to be verified after taking p***h]]
  VDM, VoLTE UA
  [[問題標題]]
  IMS ***erface to support country-specific URN
  [[問題現象]]
  Added support for IMS ***erface mo_call_c*** to country-specific URN which I***tack may send to MD side.
  [[解法可能帶來的影響]]
  (請填寫於此行下方，並描述如果合入這個p***h可能會有什麼trade off的改變，如perfo******e降低、UI改變等等)
  Emergency call fun***ionality possible to implement as per ***PP and operator requirement.
  [[建議驗證模塊]]
  (請填寫於此行下方，並建議客戶合了此p***h後要驗證哪些module或feature)
  VDM, VoLTE UAN/A

Associated Files:
  vendor/mt/libs/volte_imcb/arm/volte_imcb
  vendor/mt/libs/volte_stack/arm/volte_stack
  vendor/mt/libs/volte_ua/arm/volte_ua

Change-Id: I0b947e82a40c6d2f7f63069ea73023cd61056223

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_p2p.c b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_p2p.c
index 07794b66e..f5de89f64 100644
--- a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_p2p.c
+++ b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_p2p.c
@@ -1258,8 +1258,8 @@ BOOLEAN p2pNetRegister(P_GLUE_INFO_T prGlueInfo, BOOLEAN fgIsRtnlLockAcquired)
 	/* register for net device */
 	if (register_netdev(prGlueInfo->prP2PInfo->prDevHandler) < 0) {
 		DBGLOG(P2P, WARN, "unable to register netdevice for p2p\n");
-
-		free_netdev(prGlueInfo->prP2PInfo->prDevHandler);
+		/* free dev in glUnregisterP2P() */
+		/* free_netdev(prGlueInfo->prP2PInfo->prDevHandler); */
 
 		ret = FALSE;
 	} else {
@@ -1645,7 +1645,8 @@ BOOLEAN glUnregisterP2P(P_GLUE_INFO_T prGlueInfo)
 #if CFG_SUPPORT_PERSIST_NETDEV
 	dev_close(prGlueInfo->prP2PInfo->prDevHandler);
 #else
-	free_netdev(prGlueInfo->prP2PInfo->prDevHandler);
+	if (prGlueInfo->prP2PInfo->prDevHandler != NULL)
+		free_netdev(prGlueInfo->prP2PInfo->prDevHandler);
 	prGlueInfo->prP2PInfo->prDevHandler = NULL;
 #endif
 	/* Free p2p memory */
@@ -2897,6 +2898,10 @@ mtk_p2p_wext_set_key(IN struct net_device *prDev,
 
 					/* BSSID */
 					memcpy(prKey->arBSSID, prIWEncExt->addr.sa_data, 6);
+					if (prIWEncExt->key_len >= 32) {
+						ret = -EINVAL;
+						break;
+					}
 					memcpy(prKey->aucKeyMaterial, prIWEncExt->key, prIWEncExt->key_len);
 
 					prKey->u4KeyLength = prIWEncExt->key_len;