From: Vitalii Irkha <v.irkha@samsung.com>
Date: Thu, 22 Aug 2019 13:20:34 +0000 (+0300)
Subject: CONPRO-1481 crash while fuzzing with nmap
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e1274077cb893c3c1aa43bdf18876bab5bcbc56;p=platform%2Fupstream%2Fiotivity.git

CONPRO-1481 crash while fuzzing with nmap

Check dataLen before read data from TLS connection

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/7cc9764f1b6698759f76bbfa35d9d497e22b13f9
(cherry-picked from 7cc9764f1b6698759f76bbfa35d9d497e22b13f9)

Change-Id: I33e010519573155725e5f1986b60bdcacfa3db2b
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>
---

diff --git a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
index 355b0aa..966b2a4 100644
--- a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
+++ b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
@@ -2479,6 +2479,12 @@ CAResult_t CAdecryptSsl(const CASecureEndpoint_t *sep, uint8_t *data, uint32_t d
     VERIFY_NON_NULL_RET(sep, NET_SSL_TAG, "endpoint is NULL" , CA_STATUS_INVALID_PARAM);
     VERIFY_NON_NULL_RET(data, NET_SSL_TAG, "Param data is NULL" , CA_STATUS_INVALID_PARAM);
 
+    if (0 == dataLen)
+    {
+        OIC_LOG(ERROR, NET_SSL_TAG, "dataLen is zero");
+        return CA_STATUS_FAILED;
+    }
+
     oc_mutex_lock(g_sslContextMutex);
     if (NULL == g_caSslContext)
     {