undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
29
test/jdk/java/foreign/handles/Driver.java
Normal file
29
test/jdk/java/foreign/handles/Driver.java
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
/*
|
||||
* Copyright (c) 2021, 2024, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @build invoker_module/* lookup_module/*
|
||||
* @run testng/othervm --illegal-native-access=deny --enable-native-access=invoker_module
|
||||
* lookup_module/handle.lookup.MethodHandleLookup
|
||||
*/
|
||||
|
|
@ -0,0 +1,116 @@
|
|||
/*
|
||||
* Copyright (c) 2021, 2024, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package handle.invoker;
|
||||
|
||||
import java.lang.foreign.AddressLayout;
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.Linker;
|
||||
import java.lang.foreign.FunctionDescriptor;
|
||||
import java.lang.foreign.MemoryLayout;
|
||||
import java.lang.foreign.MemorySegment;
|
||||
import java.lang.foreign.SegmentAllocator;
|
||||
import java.lang.foreign.SymbolLookup;
|
||||
import java.lang.foreign.ValueLayout;
|
||||
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.lang.invoke.MethodType;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.file.Path;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public class MethodHandleInvoker {
|
||||
public void call(MethodHandle methodHandle) throws Throwable {
|
||||
try {
|
||||
Object[] args = makeArgs(methodHandle.type());
|
||||
methodHandle.invokeWithArguments(args);
|
||||
throw new AssertionError("Call to restricted method did not fail as expected!");
|
||||
} catch (IllegalCallerException ex) {
|
||||
if (!ex.getMessage().contains("lookup_module")) {
|
||||
throw new AssertionError("Caller module is not lookup_module!");
|
||||
}
|
||||
} catch (Throwable ex) {
|
||||
throw new AssertionError("Call to restricted method did not fail as expected!", ex);
|
||||
}
|
||||
}
|
||||
|
||||
static final Map<Class<?>, Object> DEFAULT_VALUES = new HashMap<>();
|
||||
|
||||
static void addDefaultMapping(Class<?> carrier, Object value) {
|
||||
DEFAULT_VALUES.put(carrier, value);
|
||||
}
|
||||
|
||||
static {
|
||||
addDefaultMapping(Linker.class, Linker.nativeLinker());
|
||||
addDefaultMapping(Path.class, Path.of("nonExistent"));
|
||||
addDefaultMapping(String.class, "Hello!");
|
||||
addDefaultMapping(Runnable.class, (Runnable)() -> {});
|
||||
addDefaultMapping(MethodHandle.class, MethodHandles.identity(int.class));
|
||||
addDefaultMapping(Charset.class, Charset.defaultCharset());
|
||||
addDefaultMapping(MethodType.class, MethodType.methodType(void.class));
|
||||
addDefaultMapping(MemorySegment.class, MemorySegment.NULL);
|
||||
addDefaultMapping(MemoryLayout.class, ValueLayout.JAVA_INT);
|
||||
addDefaultMapping(FunctionDescriptor.class, FunctionDescriptor.ofVoid());
|
||||
addDefaultMapping(Arena.class, Arena.ofAuto());
|
||||
addDefaultMapping(MemorySegment.Scope.class, Arena.ofAuto().scope());
|
||||
addDefaultMapping(SegmentAllocator.class, SegmentAllocator.prefixAllocator(MemorySegment.ofArray(new byte[10])));
|
||||
addDefaultMapping(ValueLayout.OfByte.class, ValueLayout.JAVA_BYTE);
|
||||
addDefaultMapping(ValueLayout.OfBoolean.class, ValueLayout.JAVA_BOOLEAN);
|
||||
addDefaultMapping(ValueLayout.OfChar.class, ValueLayout.JAVA_CHAR);
|
||||
addDefaultMapping(ValueLayout.OfShort.class, ValueLayout.JAVA_SHORT);
|
||||
addDefaultMapping(ValueLayout.OfInt.class, ValueLayout.JAVA_INT);
|
||||
addDefaultMapping(ValueLayout.OfFloat.class, ValueLayout.JAVA_FLOAT);
|
||||
addDefaultMapping(ValueLayout.OfLong.class, ValueLayout.JAVA_LONG);
|
||||
addDefaultMapping(ValueLayout.OfDouble.class, ValueLayout.JAVA_DOUBLE);
|
||||
addDefaultMapping(AddressLayout.class, ValueLayout.ADDRESS);
|
||||
addDefaultMapping(SymbolLookup.class, SymbolLookup.loaderLookup());
|
||||
addDefaultMapping(Consumer.class, (Consumer<Object>)(Object o) -> {});
|
||||
addDefaultMapping(FunctionDescriptor.class, FunctionDescriptor.ofVoid());
|
||||
addDefaultMapping(Linker.Option[].class, null);
|
||||
addDefaultMapping(Runtime.class, Runtime.getRuntime());
|
||||
addDefaultMapping(byte.class, (byte)0);
|
||||
addDefaultMapping(boolean.class, true);
|
||||
addDefaultMapping(char.class, (char)0);
|
||||
addDefaultMapping(short.class, (short)0);
|
||||
addDefaultMapping(int.class, 0);
|
||||
addDefaultMapping(float.class, 0f);
|
||||
addDefaultMapping(long.class, 0L);
|
||||
addDefaultMapping(double.class, 0d);
|
||||
}
|
||||
|
||||
static Object[] makeArgs(MethodType type) {
|
||||
return type.parameterList().stream()
|
||||
.map(MethodHandleInvoker::makeArg)
|
||||
.toArray();
|
||||
}
|
||||
|
||||
static Object makeArg(Class<?> clazz) {
|
||||
if (!DEFAULT_VALUES.containsKey(clazz)) {
|
||||
throw new UnsupportedOperationException(clazz.getName());
|
||||
}
|
||||
return DEFAULT_VALUES.get(clazz);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright (c) 2021, 2022, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
module invoker_module {
|
||||
exports handle.invoker;
|
||||
}
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
/*
|
||||
* Copyright (c) 2021, 2024, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package handle.lookup;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.Linker;
|
||||
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.lang.invoke.MethodType;
|
||||
|
||||
import java.lang.foreign.FunctionDescriptor;
|
||||
import java.lang.foreign.MemorySegment;
|
||||
import java.lang.foreign.SymbolLookup;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import org.testng.annotations.*;
|
||||
|
||||
public class MethodHandleLookup {
|
||||
|
||||
@Test(dataProvider = "restrictedMethods")
|
||||
public void testRestrictedHandles(MethodHandle handle, String testName) throws Throwable {
|
||||
new handle.invoker.MethodHandleInvoker().call(handle);
|
||||
}
|
||||
|
||||
@DataProvider(name = "restrictedMethods")
|
||||
static Object[][] restrictedMethods() {
|
||||
try {
|
||||
return new Object[][]{
|
||||
{ MethodHandles.lookup().findVirtual(Linker.class, "downcallHandle",
|
||||
MethodType.methodType(MethodHandle.class, FunctionDescriptor.class, Linker.Option[].class)), "Linker::downcallHandle/1" },
|
||||
{ MethodHandles.lookup().findVirtual(Linker.class, "downcallHandle",
|
||||
MethodType.methodType(MethodHandle.class, MemorySegment.class, FunctionDescriptor.class, Linker.Option[].class)), "Linker::downcallHandle/2" },
|
||||
{ MethodHandles.lookup().findVirtual(Linker.class, "upcallStub",
|
||||
MethodType.methodType(MemorySegment.class, MethodHandle.class, FunctionDescriptor.class, Arena.class, Linker.Option[].class)), "Linker::upcallStub" },
|
||||
{ MethodHandles.lookup().findVirtual(MemorySegment.class, "reinterpret",
|
||||
MethodType.methodType(MemorySegment.class, long.class)),
|
||||
"MemorySegment::reinterpret/1" },
|
||||
{ MethodHandles.lookup().findVirtual(MemorySegment.class, "reinterpret",
|
||||
MethodType.methodType(MemorySegment.class, Arena.class, Consumer.class)),
|
||||
"MemorySegment::reinterpret/2" },
|
||||
{ MethodHandles.lookup().findVirtual(MemorySegment.class, "reinterpret",
|
||||
MethodType.methodType(MemorySegment.class, long.class, Arena.class, Consumer.class)),
|
||||
"MemorySegment::reinterpret/3" },
|
||||
{ MethodHandles.lookup().findStatic(SymbolLookup.class, "libraryLookup",
|
||||
MethodType.methodType(SymbolLookup.class, String.class, Arena.class)),
|
||||
"SymbolLookup::libraryLookup(String)" },
|
||||
{ MethodHandles.lookup().findStatic(SymbolLookup.class, "libraryLookup",
|
||||
MethodType.methodType(SymbolLookup.class, Path.class, Arena.class)),
|
||||
"SymbolLookup::libraryLookup(Path)" },
|
||||
{ MethodHandles.lookup().findStatic(System.class, "load",
|
||||
MethodType.methodType(void.class, String.class)),
|
||||
"System::load" },
|
||||
{ MethodHandles.lookup().findStatic(System.class, "loadLibrary",
|
||||
MethodType.methodType(void.class, String.class)),
|
||||
"System::loadLibrary" },
|
||||
{ MethodHandles.lookup().findVirtual(Runtime.class, "load",
|
||||
MethodType.methodType(void.class, String.class)),
|
||||
"Runtime::load" },
|
||||
{ MethodHandles.lookup().findVirtual(Runtime.class, "loadLibrary",
|
||||
MethodType.methodType(void.class, String.class)),
|
||||
"Runtime::loadLibrary" }
|
||||
};
|
||||
} catch (Throwable ex) {
|
||||
throw new ExceptionInInitializerError((ex));
|
||||
}
|
||||
}
|
||||
}
|
||||
28
test/jdk/java/foreign/handles/lookup_module/module-info.java
Normal file
28
test/jdk/java/foreign/handles/lookup_module/module-info.java
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
/*
|
||||
* Copyright (c) 2021, 2022, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
open module lookup_module {
|
||||
requires org.testng;
|
||||
requires invoker_module;
|
||||
exports handle.lookup;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue