Эх сурвалжийг харах

securemsm-kernel: Fix misra issues in hdcp driver

Initialized the uninitialized variable to prevent potential errors.

Change-Id: I2fc05486a246fe3c05997b24587638928a0769ec
Signed-off-by: Sheik Anwar Shabic Y <[email protected]>
Sheik Anwar Shabic Y 1 жил өмнө
parent
commit
c363344909

+ 5 - 5
hdcp/hdcp2p2.h

@@ -90,7 +90,7 @@ static inline int32_t hdcp2p2_rcvd_msg(
 		uint32_t m_timeout;
 		uint32_t m_timeout;
 		uint32_t m_flag;
 		uint32_t m_flag;
 		uint32_t m_state;
 		uint32_t m_state;
-	} o;
+	} o = {0, 0, 0};
 	a[2].b = (struct ObjectBuf) {&o, 12};
 	a[2].b = (struct ObjectBuf) {&o, 12};
 	a[0].bi = (struct ObjectBufIn) {reqMsg_ptr, reqMsg_len * 1};
 	a[0].bi = (struct ObjectBufIn) {reqMsg_ptr, reqMsg_len * 1};
 	a[1].b = (struct ObjectBuf) {&ctxhandle_val, sizeof(uint32_t)};
 	a[1].b = (struct ObjectBuf) {&ctxhandle_val, sizeof(uint32_t)};
@@ -219,7 +219,7 @@ static inline int32_t hdcp2p2_start_auth(struct Object self, uint32_t ctxhandle_
 		uint32_t m_timeout;
 		uint32_t m_timeout;
 		uint32_t m_flag;
 		uint32_t m_flag;
 		uint32_t m_tzctxhandle;
 		uint32_t m_tzctxhandle;
-	} o;
+	} o = {0, 0, 0};
 
 
 	a[1].b = (struct ObjectBuf) {&o, 12};
 	a[1].b = (struct ObjectBuf) {&o, 12};
 	a[0].b = (struct ObjectBuf) {&ctxhandle_val, sizeof(uint32_t)};
 	a[0].b = (struct ObjectBuf) {&ctxhandle_val, sizeof(uint32_t)};
@@ -249,7 +249,7 @@ static inline int32_t hdcp2p2_session_open_stream(struct Object self,
 		uint32_t m_vcpayloadid;
 		uint32_t m_vcpayloadid;
 		uint32_t m_stream_number;
 		uint32_t m_stream_number;
 		uint32_t m_streamMediaType;
 		uint32_t m_streamMediaType;
-	} i;
+	} i = {0, 0, 0, 0};
 
 
 	a[0].b = (struct ObjectBuf) {&i, 16};
 	a[0].b = (struct ObjectBuf) {&i, 16};
 	i.m_sessionid = sessionid_val;
 	i.m_sessionid = sessionid_val;
@@ -270,7 +270,7 @@ static inline int32_t hdcp2p2_session_close_stream(struct Object self,
 	struct {
 	struct {
 		uint32_t m_sessionid;
 		uint32_t m_sessionid;
 		uint32_t m_streamId;
 		uint32_t m_streamId;
-	} i;
+	} i = {0, 0};
 
 
 	a[0].b = (struct ObjectBuf) {&i, 8};
 	a[0].b = (struct ObjectBuf) {&i, 8};
 	i.m_sessionid = sessionid_val;
 	i.m_sessionid = sessionid_val;
@@ -288,7 +288,7 @@ static inline int32_t hdcp2p2_force_encryption(struct Object self,
 	struct {
 	struct {
 		uint32_t m_ctxhandle;
 		uint32_t m_ctxhandle;
 		uint32_t m_enable;
 		uint32_t m_enable;
-	} i;
+	} i = {0, 0};
 
 
 	a[0].b = (struct ObjectBuf) {&i, 8};
 	a[0].b = (struct ObjectBuf) {&i, 8};
 	i.m_ctxhandle = ctxhandle_val;
 	i.m_ctxhandle = ctxhandle_val;

+ 1 - 1
hdcp/hdcp_smcinvoke.c

@@ -45,7 +45,7 @@ static int hdcp1_key_set(struct hdcp1_smcinvoke_handle *handle,
 	uint8_t *ksvRes = NULL;
 	uint8_t *ksvRes = NULL;
 	size_t ksvResLen = 0;
 	size_t ksvResLen = 0;
 
 
-	ksvRes = kmalloc(HDCP1_AKSV_SIZE, GFP_KERNEL);
+	ksvRes = kzalloc(HDCP1_AKSV_SIZE, GFP_KERNEL);
 	if (!ksvRes)
 	if (!ksvRes)
 		return -EINVAL;
 		return -EINVAL;