tls: Fix coverity issues

Issues 319212 and 319248: bad check of error condition in SSL write Issue 319221: overlapping memcpy when creating an incomming message
iotivity · Jun 22, 2023 · 2b371b4 · 2b371b4
1 parent 4fe9c7f
commit 2b371b4
Show file tree

Hide file tree

Showing 5 changed files with 193 additions and 134 deletions.
diff --git a/port/android/storage.c b/port/android/storage.c
@@ -76,17 +76,28 @@ oc_storage_read(const char *store, uint8_t *buf, size_t size)
     return -EINVAL;
   }
 
-  fseek(fp, 0, SEEK_END);
-  size_t fsize = ftell(fp);
-  if (fsize > size) {
-    fclose(fp);
-    return -EINVAL;
+  if (fseek(fp, 0, SEEK_END) != 0) {
+    goto error;
+  }
+  long fsize = ftell(fp);
+  if (fsize < 0) {
+    goto error;
+  }
+  if ((size_t)fsize > size) {
+    errno = EINVAL;
+    goto error;
+  }
+  if (fseek(fp, 0, SEEK_SET) != 0) {
+    goto error;
   }
-  fseek(fp, 0, SEEK_SET);
 
   size = fread(buf, 1, size, fp);
   fclose(fp);
-  return size;
+  return (long)size;
+
+error:
+  fclose(fp);
+  return -errno;
 }
 
 long

diff --git a/port/linux/storage.c b/port/linux/storage.c
@@ -81,17 +81,28 @@ oc_storage_read(const char *store, uint8_t *buf, size_t size)
     return -EINVAL;
   }
 
-  fseek(fp, 0, SEEK_END);
-  size_t fsize = ftell(fp);
-  if (fsize > size) {
-    fclose(fp);
-    return -EINVAL;
+  if (fseek(fp, 0, SEEK_END) != 0) {
+    goto error;
+  }
+  long fsize = ftell(fp);
+  if (fsize < 0) {
+    goto error;
+  }
+  if ((size_t)fsize > size) {
+    errno = EINVAL;
+    goto error;
+  }
+  if (fseek(fp, 0, SEEK_SET) != 0) {
+    goto error;
   }
-  fseek(fp, 0, SEEK_SET);
 
   size = fread(buf, 1, size, fp);
   fclose(fp);
   return (long)size;
+
+error:
+  fclose(fp);
+  return -errno;
 }
 
 static long

diff --git a/port/windows/storage.c b/port/windows/storage.c
@@ -89,17 +89,28 @@ oc_storage_read(const char *store, uint8_t *buf, size_t size)
     return -EINVAL;
   }
 
-  fseek(fp, 0, SEEK_END);
-  size_t fsize = ftell(fp);
-  if (fsize > size) {
-    fclose(fp);
-    return -EINVAL;
+  if (fseek(fp, 0, SEEK_END) != 0) {
+    goto error;
+  }
+  long fsize = ftell(fp);
+  if (fsize < 0) {
+    goto error;
+  }
+  if ((size_t)fsize > size) {
+    errno = EINVAL;
+    goto error;
+  }
+  if (fseek(fp, 0, SEEK_SET) != 0) {
+    goto error;
   }
-  fseek(fp, 0, SEEK_SET);
 
   size = fread(buf, 1, size, fp);
   fclose(fp);
   return (long)size;
+
+error:
+  fclose(fp);
+  return -errno;
 }
 
 long