8207145: (fs) Native memory leak in WindowsNativeDispatcher.LookupPrivilegeValue0

Ivan Gerasimov · Ivan Gerasimov · commit 78f3c8a7d441 · 2018-07-12T06:04:57.000-07:00
Reviewed-by: alanb
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,9 +102,8 @@ static Privilege enablePrivilege(String priv) {
         final boolean stopImpersontating = impersontating;
         final boolean needToRevert = elevated;
 
-        return new Privilege() {
-            @Override
-            public void drop() {
+        return () -> {
+            try {
                 if (token != 0L) {
                     try {
                         if (stopImpersontating)
@@ -118,6 +117,8 @@ else if (needToRevert)
                         CloseHandle(token);
                     }
                 }
+            } finally {
+                LocalFree(pLuid);
             }
         };
     }
diff --git a/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c b/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1043,8 +1043,11 @@ Java_sun_nio_fs_WindowsNativeDispatcher_LookupPrivilegeValue0(JNIEnv* env,
     if (pLuid == NULL) {
         JNU_ThrowInternalError(env, "Unable to allocate LUID structure");
     } else {
-        if (LookupPrivilegeValueW(NULL, lpName, pLuid) == 0)
+        if (LookupPrivilegeValueW(NULL, lpName, pLuid) == 0) {
+            LocalFree(pLuid);
             throwWindowsException(env, GetLastError());
+            return (jlong)0;
+        }
     }
     return ptr_to_jlong(pLuid);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -102,9 +102,8 @@ static Privilege enablePrivilege(String priv) {`
`102`	`102`	`final boolean stopImpersontating = impersontating;`
`103`	`103`	`final boolean needToRevert = elevated;`
`104`	`104`
`105`		`- return new Privilege() {`
`106`		`- @Override`
`107`		`- public void drop() {`
	`105`	`+ return () -> {`
	`106`	`+ try {`
`108`	`107`	`if (token != 0L) {`
`109`	`108`	`try {`
`110`	`109`	`if (stopImpersontating)`
`@@ -118,6 +117,8 @@ else if (needToRevert)`
`118`	`117`	`CloseHandle(token);`
`119`	`118`	`}`
`120`	`119`	`}`
	`120`	`+ } finally {`
	`121`	`+ LocalFree(pLuid);`
`121`	`122`	`}`
`122`	`123`	`};`
`123`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -1043,8 +1043,11 @@ Java_sun_nio_fs_WindowsNativeDispatcher_LookupPrivilegeValue0(JNIEnv* env,`
`1043`	`1043`	`if (pLuid == NULL) {`
`1044`	`1044`	`JNU_ThrowInternalError(env, "Unable to allocate LUID structure");`
`1045`	`1045`	`} else {`
`1046`		`- if (LookupPrivilegeValueW(NULL, lpName, pLuid) == 0)`
	`1046`	`+ if (LookupPrivilegeValueW(NULL, lpName, pLuid) == 0) {`
	`1047`	`+ LocalFree(pLuid);`
`1047`	`1048`	`throwWindowsException(env, GetLastError());`
	`1049`	`+ return (jlong)0;`
	`1050`	`+ }`
`1048`	`1051`	`}`
`1049`	`1052`	`return ptr_to_jlong(pLuid);`
`1050`	`1053`	`}`