Fix more warnings

Author: ipatix

src/access-daemon/accessDaemon.c

@@ -2120,8 +2120,7 @@ static int getBusFromSocketByNameDevid(const uint32_t socket, PciDevice* pcidev,
     struct dirent *pDirent, *pDirentInner;
     DIR *pDir, *pDirInner;
     FILE* fp = NULL;
-    int tmplen = 200;
-    char tmpPath[200], buff[200];
+    char tmpPath[512], buff[512];
     size_t ret = 0;
     int bus_id = -1;
     int numa_ctr = 0;
@@ -2137,12 +2136,10 @@ static int getBusFromSocketByNameDevid(const uint32_t socket, PciDevice* pcidev,
     {
         if (strncmp(pDirent->d_name, "pci0", 4) == 0)
         {
-            memset(tmpPath, '\0', tmplen*sizeof(char));
-            sprintf(tmpPath, "/sys/devices/%s", pDirent->d_name);
+            snprintf(tmpPath, sizeof(tmpPath), "/sys/devices/%s", pDirent->d_name);
 
             char bus[4];
-            strncpy(bus, &(pDirent->d_name[strlen(pDirent->d_name)-2]), 2);
-            bus[2] = '\0';
+            snprintf(bus, sizeof(bus), "%s", &pDirent->d_name[strlen(pDirent->d_name)-2]);
 
             pDirInner = opendir (tmpPath);
             if (pDir == NULL)
@@ -2156,33 +2153,33 @@ static int getBusFromSocketByNameDevid(const uint32_t socket, PciDevice* pcidev,
                 {
                     uint32_t dev_id = 0x0;
                     int numa_node = 0;
-                    memset(tmpPath, '\0', tmplen*sizeof(char));
-                    sprintf(tmpPath, "/sys/devices/%s/%s/device", pDirent->d_name, pDirentInner->d_name);
+                    snprintf(tmpPath, sizeof(tmpPath), "/sys/devices/%s/%s/device", pDirent->d_name, pDirentInner->d_name);
                     if (pcidev->path && strcmp(&(pDirentInner->d_name[strlen(pDirentInner->d_name)-4]), pcidev->path) != 0)
                     {
                         continue;
                     }
                     fp = fopen(tmpPath,"r");
                     if( fp != NULL )
                     {
-                        memset(buff, '\0', tmplen*sizeof(char));
-                        ret = fread(buff, sizeof(char), tmplen-1, fp);
+                        char *buffRead = fgets(buff, sizeof(buff), fp);
                         fclose(fp);
-                        if (ret > 0)
+                        if (buffRead)
                         {
                             dev_id = strtoul(buff, NULL, 16);
 
                             if (dev_id == pcidev->devid)
                             {
-                                memset(tmpPath, '\0', tmplen*sizeof(char));
-                                sprintf(tmpPath, "/sys/devices/%s/%s/numa_node", pDirent->d_name, pDirentInner->d_name);
+                                snprintf(tmpPath, sizeof(tmpPath), "/sys/devices/%s/%s/numa_node", pDirent->d_name, pDirentInner->d_name);
                                 fp = fopen(tmpPath,"r");
                                 if( fp != NULL )
                                 {
-                                    memset(buff, '\0', tmplen*sizeof(char));
-                                    ret = fread(buff, sizeof(char), tmplen-1, fp);
+                                    buffRead = fgets(buff, sizeof(buff), fp);
                                     fclose(fp);
-                                    numa_node = atoi(buff);
+                                    if (buffRead)
+                                        numa_node = atoi(buff);
+                                    else
+                                        numa_node = -1;
+
                                     if (numa_node < 0)
                                     {
                                         numa_node = numa_ctr;

src/affinity.c

@@ -778,6 +778,7 @@ static int affinity_addRocmDomain(int nodeId, AffinityDomain* domain, int offset
                 err = _affinity_addMemoryDomain(rocmdev->numaNode, domain, help);
                 if (err == 0)
                 {
+                    // TODO where does 9 come from? Please replace this with a meaningful constant
                     snprintf(domain->tag, 9, "G%d", nodeId+offset);
                     DEBUG_PRINT(DEBUGLEV_DEVELOP, "Affinity domain %s: %d HW threads on %d cores", domain->tag, domain->numberOfProcessors, domain->numberOfCores);
                     return 0;

src/pci_hwloc.c

@@ -143,7 +143,11 @@ int sysfs_pci_init(uint16_t testDevice, char** socket_bus, int* nrSockets)
                     {
                         continue;
                     }
-                    fread(buff, sizeof(char), 99, fp);
+
+                    if (fgets(buff, sizeof(buff), fp) == NULL) {
+                        fclose(fp);
+                        continue;
+                    }
                     dev_id = strtoul(buff, NULL, 16);
                     if (dev_id == SKYLAKE_SERVER_SOCKETID_MBOX_DID)
                     {
@@ -155,7 +159,10 @@ int sysfs_pci_init(uint16_t testDevice, char** socket_bus, int* nrSockets)
                         {
                             continue;
                         }
-                        fread(buff, sizeof(char), 99, fp);
+                        if (fgets(buff, sizeof(char), fp) == NULL) {
+                            fclose(fp);
+                            continue;
+                        }
                         numa_node = atoi(buff);
                         socket_bus[numa_node] = lw_strndup(bus, 3);
                         nrSocks++;

src/pthread-overload/pthread-overload.c

@@ -220,7 +220,13 @@ pthread_create(pthread_t* thread,
             }
             else
             {
-                fgets(buff, 512, fpipe);
+                if (fgets(buff, sizeof(buff), fpipe) == NULL) {
+                    // TODO, how should we handle this error correctly?
+                    fprintf(stderr, "Problems reading symbols for shepard thread detection\n");
+                    fclose(fpipe);
+                    return -1;
+                }
+
                 char* tmp = strstr(buff, "monitor");
                 if (tmp != NULL)
                 {

src/topology.c

@@ -221,14 +221,26 @@ initTopologyFile(FILE* file)
     CacheLevel* cacheLevels;
     TreeNode* currentNode;
 
-    fread((void*) &cpuid_topology, sizeof(CpuTopology), 1, file);
+    // TODO, may raise errors. Though, the signature currently does not allow to
+    // return them. So let's abort for now.
+
+    if (fread(&cpuid_topology, sizeof(cpuid_topology), 1, file) != sizeof(cpuid_topology)) {
+        ERROR_PRINT("Cannot read cpuid topology, not enough bytes");
+        abort();
+    }
 
     hwThreadPool = lw_calloc(cpuid_topology.numHWThreads, sizeof(*hwThreadPool));
-    fread((void*) hwThreadPool, sizeof(HWThread), cpuid_topology.numHWThreads, file);
+    if (fread(hwThreadPool, sizeof(*hwThreadPool), cpuid_topology.numHWThreads, file) != sizeof(sizeof(*hwThreadPool))) {
+        ERROR_PRINT("Cannot read thread pool, not enough bytes");
+        abort();
+    }
     cpuid_topology.threadPool = hwThreadPool;
 
     cacheLevels = lw_calloc(cpuid_topology.numCacheLevels, sizeof(*cacheLevels));
-    fread((void*) cacheLevels, sizeof(CacheLevel), cpuid_topology.numCacheLevels, file);
+    if (fread(cacheLevels, sizeof(*cacheLevels), cpuid_topology.numCacheLevels, file) != sizeof(*cacheLevels)) {
+        ERROR_PRINT("Cannot read cache levels, not enough bytes");
+        abort();
+    }
     cpuid_topology.cacheLevels = cacheLevels;
     cpuid_topology.topologyTree = NULL;