Ticket #10226: 0001-Fixed-resource-leak-and-possible-strings-without-nul.patch

src/system/kernel/vm/VMAnonymousCache.cpp

@@ -1452 +1452 @@
     dev_t swapDeviceID = -1;
     VolumeInfo selectedVolume = {};
 
+    bool settingsUnloaded = false;
     void* settings = load_driver_settings("virtual_memory");
 
     if (settings != NULL) {
@@ -1484 +1485 @@
                     // User specified a size / volume that seems valid
                     swapAutomatic = false;
                     swapSize = atoll(size);
-                    strncpy(selectedVolume.name, volume,
+                    strlcpy(selectedVolume.name, volume,
                         sizeof(selectedVolume.name));
-                    strncpy(selectedVolume.device, device,
+                    strlcpy(selectedVolume.device, device,
                         sizeof(selectedVolume.device));
-                    strncpy(selectedVolume.filesystem, filesystem,
+                    strlcpy(selectedVolume.filesystem, filesystem,
                         sizeof(selectedVolume.filesystem));
                     selectedVolume.capacity = atoll(capacity);
                 } else {
@@ -1499 +1500 @@
                 }
             }
             unload_driver_settings(settings);
+            settingsUnloaded = true;
         }
     }
 
@@ -1514 +1516 @@
 
     if (!swapEnabled || swapSize < B_PAGE_SIZE) {
         dprintf("%s: virtual_memory is disabled\n", __func__);
+        if(!settingsUnloaded)
+            unload_driver_settings(settings);
         return;
     }
 
@@ -1593 +1597 @@
     if (fd < 0) {
         dprintf("%s: Can't open/create %s: %s\n", __func__,
             swapPath, strerror(errno));
+        if(!settingsUnloaded)
+            unload_driver_settings(settings);
         return;
     }