Fix udev reference leak in LinuxNetworkIF (#1569)

oshi · Mar 14, 2021 · 6500d82 · 6500d82
1 parent 216a735
commit 6500d82
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * [#1562](https://github.com/oshi/oshi/pull/1562): Fix missing space in WMI process query - [@dbwiddis](https://github.com/dbwiddis).
 * [#1566](https://github.com/oshi/oshi/pull/1566): Handle new WinAPI Logical Processor Information types - [@dbwiddis](https://github.com/dbwiddis).
 * [#1567](https://github.com/oshi/oshi/pull/1567): Handle empty process performance registry query - [@dbwiddis](https://github.com/dbwiddis).
+* [#1569](https://github.com/oshi/oshi/pull/1569): Fix udev reference leak in LinuxNetworkIF - [@dbwiddis](https://github.com/dbwiddis).
 
 # 5.6.0 (2021-03-01)
 

diff --git a/oshi-core/src/main/java/oshi/hardware/platform/linux/LinuxNetworkIF.java b/oshi-core/src/main/java/oshi/hardware/platform/linux/LinuxNetworkIF.java
@@ -72,19 +72,25 @@ public LinuxNetworkIF(NetworkInterface netint) throws InstantiationException {
     private static String queryIfModel(NetworkInterface netint) {
         String name = netint.getName();
         UdevContext udev = Udev.INSTANCE.udev_new();
-        UdevDevice device = udev.deviceNewFromSyspath("/sys/class/net/" + name);
-        if (device != null) {
+        if (udev != null) {
             try {
-                String devVendor = device.getPropertyValue("ID_VENDOR_FROM_DATABASE");
-                String devModel = device.getPropertyValue("ID_MODEL_FROM_DATABASE");
-                if (!Util.isBlank(devModel)) {
-                    if (!Util.isBlank(devVendor)) {
-                        return devVendor + " " + devModel;
+                UdevDevice device = udev.deviceNewFromSyspath("/sys/class/net/" + name);
+                if (device != null) {
+                    try {
+                        String devVendor = device.getPropertyValue("ID_VENDOR_FROM_DATABASE");
+                        String devModel = device.getPropertyValue("ID_MODEL_FROM_DATABASE");
+                        if (!Util.isBlank(devModel)) {
+                            if (!Util.isBlank(devVendor)) {
+                                return devVendor + " " + devModel;
+                            }
+                            return devModel;
+                        }
+                    } finally {
+                        device.unref();
                     }
-                    return devModel;
                 }
             } finally {
-                device.unref();
+                udev.unref();
             }
         }
         return name;