jruby · Apr 6, 2016 · Apr 6, 2016 · Apr 6, 2016 · Apr 6, 2016 · Apr 6, 2016
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -224,7 +224,8 @@ public class Options {
 
     public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE = bool(TRUFFLE, "truffle.platform.safe", true, "Default value for the safety of all operations.");
     public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_LOAD = bool(TRUFFLE, "truffle.platform.safe.load", TRUFFLE_PLATFORM_SAFE.load(), "Treat loading, requiring and autoloading as safe.");
-    public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_IO = bool(TRUFFLE, "truffle.platform.safe.io", TRUFFLE_PLATFORM_SAFE.load(), "Treat any methods that deal perofrm IO as safe.");
+    public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_IO = bool(TRUFFLE, "truffle.platform.safe.io", TRUFFLE_PLATFORM_SAFE.load(), "Treat any methods that deal with IO as safe.");
+    public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_MEMORY = bool(TRUFFLE, "truffle.platform.safe.memory", TRUFFLE_PLATFORM_SAFE.load(), "Treat any methods that deal with unmanaged memory as safe.");
     public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_THREADS = bool(TRUFFLE, "truffle.platform.safe.threads", TRUFFLE_PLATFORM_SAFE.load(), "Treat any methods that deal with threads as safe.");
     public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_PROCESSES = bool(TRUFFLE, "truffle.platform.safe.processes", TRUFFLE_PLATFORM_SAFE.load(), "Treat any methods that deal with processes as safe.");
     public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_SIGNALS = bool(TRUFFLE, "truffle.platform.safe.siganls", TRUFFLE_PLATFORM_SAFE.load(), "Treat any methods that deal with signals as safe.");

diff --git a/test/truffle/integration/safe.sh b/test/truffle/integration/safe.sh
@@ -14,7 +14,7 @@ function unsafe {
 
 # Things that are alway safe
 
-safe -e "14"
+safe -e 14
 
 # Check our safe_puts is safe
 
@@ -24,16 +24,17 @@ safe -e "Truffle::Primitive.safe_puts 'hello, world'"
 
 unsafe -Xtruffle.platform.safe_puts=false -e "Truffle::Primitive.safe_puts 'hello, world'"
 
-# Check default unsafe operations
+# Try some unsafe operations
 
-#unsafe -e "puts 'hello, world'"
+unsafe -e "puts 'hello, world'"
 unsafe -e '`echo foo`'
 unsafe -e 'exit!'
+unsafe -e 'Rubinius::FFI::Pointer.new(1).read_int'
+unsafe -e "File.open('bad.txt')"
 
 # Check we can enable some unsafe operations if we want to
 
-safe -Xtruffle.platform.safe.processes=true -e '`echo foo`'
-safe -Xtruffle.platform.safe.exit=true -e 'exit'
+safe -Xtruffle.platform.safe.exit=true -e 'exit!'
 
 # Check that safe_puts sanitises correctly
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreMethod.java b/truffle/src/main/java/org/jruby/truffle/core/CoreMethod.java
@@ -84,6 +84,4 @@
 
     UnsafeGroup[] unsafe() default {};
 
-    boolean unsafeNeedsAudit() default false;
-
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java b/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java
@@ -271,6 +271,9 @@ public static boolean isSafe(RubyContext context, UnsafeGroup[] groups) {
                 case IO:
                     option = options.PLATFORM_SAFE_IO;
                     break;
+                case MEMORY:
+                    option = options.PLATFORM_SAFE_MEMORY;
+                    break;
                 case THREADS:
                     option = options.PLATFORM_SAFE_THREADS;
                     break;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
@@ -144,7 +144,7 @@
 @CoreClass(name = "Kernel")
 public abstract class KernelNodes {
 
-    @CoreMethod(names = "`", isModuleFunction = true, needsSelf = false, required = 1, unsafe = UnsafeGroup.PROCESSES)
+    @CoreMethod(names = "`", isModuleFunction = true, needsSelf = false, required = 1, unsafe = {UnsafeGroup.IO, UnsafeGroup.PROCESSES})
     public abstract static class BacktickNode extends CoreMethodArrayArgumentsNode {
 
         @Child private CallDispatchHeadNode toHashNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferPrimitiveNodes.java
@@ -52,14 +52,15 @@
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.objects.AllocateObjectNode;
 import org.jruby.truffle.language.objects.AllocateObjectNodeGen;
+import org.jruby.truffle.platform.UnsafeGroup;
 import org.jruby.util.ByteList;
 
 public abstract class IOBufferPrimitiveNodes {
 
     private static final int IOBUFFER_SIZE = 32768;
     private static final int STACK_BUF_SZ = 8192;
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "iobuffer_allocate")
+    @RubiniusPrimitive(name = "iobuffer_allocate", unsafe = UnsafeGroup.IO)
     public static abstract class IOBufferAllocatePrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         @Child private AllocateObjectNode allocateNode;
@@ -80,7 +81,7 @@ public DynamicObject allocate(DynamicObject classToAllocate) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "iobuffer_unshift", lowerFixnumParameters = 1)
+    @RubiniusPrimitive(name = "iobuffer_unshift", lowerFixnumParameters = 1, unsafe = UnsafeGroup.IO)
     public static abstract class IOBufferUnshiftPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOBufferUnshiftPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -112,7 +113,7 @@ public int unshift(VirtualFrame frame, DynamicObject ioBuffer, DynamicObject str
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "iobuffer_fill")
+    @RubiniusPrimitive(name = "iobuffer_fill", unsafe = UnsafeGroup.IO)
     public static abstract class IOBufferFillPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOBufferFillPrimitiveNode(RubyContext context, SourceSection sourceSection) {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
@@ -60,6 +60,7 @@
 import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
 import org.jruby.truffle.language.objects.AllocateObjectNode;
 import org.jruby.truffle.language.objects.AllocateObjectNodeGen;
+import org.jruby.truffle.platform.UnsafeGroup;
 import org.jruby.truffle.stdlib.sockets.FDSet;
 import org.jruby.truffle.stdlib.sockets.FDSetFactory;
 import org.jruby.truffle.stdlib.sockets.FDSetFactoryFactory;
@@ -75,7 +76,7 @@ public abstract class IOPrimitiveNodes {
 
     private static int STDOUT = 1;
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_allocate")
+    @RubiniusPrimitive(name = "io_allocate", unsafe = UnsafeGroup.IO)
     public static abstract class IOAllocatePrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         @Child private CallDispatchHeadNode newBufferNode;
@@ -95,7 +96,7 @@ public DynamicObject allocate(VirtualFrame frame, DynamicObject classToAllocate)
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_connect_pipe", needsSelf = false)
+    @RubiniusPrimitive(name = "io_connect_pipe", needsSelf = false, unsafe = UnsafeGroup.IO)
     public static abstract class IOConnectPipeNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         private final int RDONLY;
@@ -150,7 +151,7 @@ private void newOpenFd(int newFd) {
         }
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_open", needsSelf = false, lowerFixnumParameters = { 1, 2 })
+    @RubiniusPrimitive(name = "io_open", needsSelf = false, lowerFixnumParameters = { 1, 2 }, unsafe = UnsafeGroup.IO)
     public static abstract class IOOpenPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOOpenPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -165,7 +166,7 @@ public int open(DynamicObject path, int mode, int permission) {
     }
 
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_truncate", needsSelf = false)
+    @RubiniusPrimitive(name = "io_truncate", needsSelf = false, unsafe = UnsafeGroup.IO)
     public static abstract class IOTruncatePrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOTruncatePrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -184,7 +185,7 @@ public int truncate(DynamicObject path, long length) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_ftruncate")
+    @RubiniusPrimitive(name = "io_ftruncate", unsafe = UnsafeGroup.IO)
     public static abstract class IOFTruncatePrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOFTruncatePrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -199,7 +200,7 @@ public int ftruncate(VirtualFrame frame, DynamicObject io, long length) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_fnmatch", needsSelf = false)
+    @RubiniusPrimitive(name = "io_fnmatch", needsSelf = false, unsafe = UnsafeGroup.IO)
     public static abstract class IOFNMatchPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOFNMatchPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -223,7 +224,7 @@ public boolean fnmatch(DynamicObject pattern, DynamicObject path, int flags) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_ensure_open")
+    @RubiniusPrimitive(name = "io_ensure_open", unsafe = UnsafeGroup.IO)
     public static abstract class IOEnsureOpenPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOEnsureOpenPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -246,7 +247,7 @@ public DynamicObject ensureOpen(VirtualFrame frame, DynamicObject file) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_read_if_available", lowerFixnumParameters = 0)
+    @RubiniusPrimitive(name = "io_read_if_available", lowerFixnumParameters = 0, unsafe = UnsafeGroup.IO)
     public static abstract class IOReadIfAvailableNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         private static final FDSetFactory fdSetFactory = FDSetFactoryFactory.create();
@@ -298,7 +299,7 @@ public Object readIfAvailable(DynamicObject file, int numberOfBytes) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_reopen")
+    @RubiniusPrimitive(name = "io_reopen", unsafe = UnsafeGroup.IO)
     public static abstract class IOReopenPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         @Child private CallDispatchHeadNode resetBufferingNode;
@@ -338,7 +339,7 @@ public Object reopen(VirtualFrame frame, DynamicObject file, DynamicObject io) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_reopen_path", lowerFixnumParameters = 1)
+    @RubiniusPrimitive(name = "io_reopen_path", lowerFixnumParameters = 1, unsafe = UnsafeGroup.IO)
     public static abstract class IOReopenPathPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         @Child private CallDispatchHeadNode resetBufferingNode;
@@ -397,7 +398,7 @@ public Object reopenPath(VirtualFrame frame, DynamicObject file, DynamicObject p
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_write")
+    @RubiniusPrimitive(name = "io_write", unsafe = UnsafeGroup.IO)
     public static abstract class IOWritePrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOWritePrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -441,7 +442,7 @@ public int write(DynamicObject file, DynamicObject string) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_close")
+    @RubiniusPrimitive(name = "io_close", unsafe = UnsafeGroup.IO)
     public static abstract class IOClosePrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         @Child private CallDispatchHeadNode ensureOpenNode;
@@ -480,7 +481,7 @@ public int close(VirtualFrame frame, DynamicObject io) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_seek", lowerFixnumParameters = {0, 1})
+    @RubiniusPrimitive(name = "io_seek", lowerFixnumParameters = {0, 1}, unsafe = UnsafeGroup.IO)
     public static abstract class IOSeekPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOSeekPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -495,7 +496,7 @@ public int seek(VirtualFrame frame, DynamicObject io, int amount, int whence) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_accept")
+    @RubiniusPrimitive(name = "io_accept", unsafe = UnsafeGroup.IO)
     public abstract static class AcceptNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public AcceptNode(RubyContext context, SourceSection sourceSection) {
@@ -529,7 +530,7 @@ public int accept(DynamicObject io) {
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_sysread")
+    @RubiniusPrimitive(name = "io_sysread", unsafe = UnsafeGroup.IO)
     public static abstract class IOSysReadPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOSysReadPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -569,7 +570,7 @@ public DynamicObject sysread(VirtualFrame frame, DynamicObject file, int length)
 
     }
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "io_select", needsSelf = false, lowerFixnumParameters = 3)
+    @RubiniusPrimitive(name = "io_select", needsSelf = false, lowerFixnumParameters = 3, unsafe = UnsafeGroup.IO)
     public static abstract class IOSelectPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         private static final FDSetFactory fdSetFactory = FDSetFactoryFactory.create();

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/NativeFunctionPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/NativeFunctionPrimitiveNodes.java
@@ -16,7 +16,7 @@
 
 public abstract class NativeFunctionPrimitiveNodes {
 
-    @RubiniusPrimitive(unsafeNeedsAudit = true, name = "nativefunction_type_size", needsSelf = false)
+    @RubiniusPrimitive(name = "nativefunction_type_size", needsSelf = false)
     public static abstract class NativeFunctionTypeSizePrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public NativeFunctionTypeSizePrimitiveNode(RubyContext context, SourceSection sourceSection) {
Original file line number	Diff line number	Diff line change
		@@ -84,6 +84,4 @@

		UnsafeGroup[] unsafe() default {};

		boolean unsafeNeedsAudit() default false;

		}