Skip to content

Commit

Permalink
Merge pull request #2174 from tokiwa-software/jvm_disable_unsafe_intr…
Browse files Browse the repository at this point in the history 
…insics

jvm: Enable support for option -unsafeIntrinsics=off
  • Loading branch information
@michaellilltokiwa
michaellilltokiwa authored Nov 3, 2023
2 parents 25be341 + 8c94525 commit bc589da
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 9 deletions.
6 changes: 6 additions & 0 deletions src/dev/flang/be/jvm/JVM.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import dev.flang.be.jvm.classfile.Expr;
import dev.flang.be.jvm.classfile.Label;

import dev.flang.be.jvm.runtime.Runtime;

import dev.flang.util.ANY;
import dev.flang.util.Errors;
import dev.flang.util.List;
Expand Down Expand Up @@ -472,6 +474,10 @@ void prepare(JVM jvm)
{
Errors.showAndExit();
jvm._runner = new Runner();
if (!jvm._options.enableUnsafeIntrinsics())
{
Runtime.disableUnsafeIntrinsics();
}
}
void compile(JVM jvm, int cl)
{
Expand Down
39 changes: 32 additions & 7 deletions src/dev/flang/be/jvm/runtime/Intrinsics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,11 @@ public static double u64_as_f64 (long a ) { return
public static double f64_type_tan (double a ) { return Math.tan ( a); }
public static double f64_type_tanh (double a ) { return Math.tanh ( a); }

public static void fuzion_std_exit (int code) { System.exit(code); }
public static void fuzion_std_exit (int code)
{
Runtime.unsafeIntrinsic();
System.exit(code);
}

public static void fuzion_std_date_time(Object data)
{
Expand All @@ -287,6 +291,7 @@ public static void fuzion_std_date_time(Object data)

public static int fuzion_sys_net_bind0(int family, int socketType, int protocol, Object host0, Object port0, Object res)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(res);

Expand Down Expand Up @@ -333,11 +338,13 @@ public static int fuzion_sys_net_bind0(int family, int socketType, int protocol,

public static int fuzion_sys_net_listen(long sockfd, int backlog)
{
Runtime.unsafeIntrinsic();
return 0;
}

public static boolean fuzion_sys_net_accept(long sockfd, Object res)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(res);

Expand Down Expand Up @@ -366,6 +373,7 @@ else if(asc instanceof DatagramChannel dc)

public static int fuzion_sys_net_connect0(int family, int socketType, int protocol, Object host0, Object port0, Object res)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(res);

Expand Down Expand Up @@ -406,6 +414,7 @@ public static int fuzion_sys_net_connect0(int family, int socketType, int protoc

public static int fuzion_sys_net_get_peer_address(long sockfd, Object res)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(res);

Expand All @@ -428,6 +437,7 @@ public static int fuzion_sys_net_get_peer_address(long sockfd, Object res)

public static char fuzion_sys_net_get_peer_port(long sockfd)
{
Runtime.unsafeIntrinsic();
try
{
if (Runtime._openStreams_.get(sockfd) instanceof SocketChannel sc)
Expand All @@ -444,6 +454,7 @@ public static char fuzion_sys_net_get_peer_port(long sockfd)

public static boolean fuzion_sys_net_read(long sockfd, Object b, int length, Object res)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
{
Runtime.ensure_not_frozen(b);
Expand Down Expand Up @@ -486,6 +497,7 @@ else if (desc instanceof ByteChannel sc)

public static int fuzion_sys_net_write(long sockfd, Object fileContent, int l)
{
Runtime.unsafeIntrinsic();
try
{
var sc = (ByteChannel)Runtime._openStreams_.get(sockfd);
Expand All @@ -500,13 +512,15 @@ public static int fuzion_sys_net_write(long sockfd, Object fileContent, int l)

public static int fuzion_sys_net_close0(long sockfd)
{
Runtime.unsafeIntrinsic();
return Runtime._openStreams_.remove(sockfd)
? 0
: -1;
}

public static int fuzion_sys_net_set_blocking0(long sockfd, int blocking)
{
Runtime.unsafeIntrinsic();
var asc = (AbstractSelectableChannel)Runtime._openStreams_.get(sockfd);
try
{
Expand All @@ -521,6 +535,7 @@ public static int fuzion_sys_net_set_blocking0(long sockfd, int blocking)

public static int fuzion_sys_fileio_flush(long fd)
{
Runtime.unsafeIntrinsic();
var s = Runtime._openStreams_.get(fd);
if (s instanceof PrintStream ps)
{
Expand All @@ -531,6 +546,7 @@ public static int fuzion_sys_fileio_flush(long fd)

public static int fuzion_sys_fileio_read(long fd, Object d, int l)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(d);

Expand Down Expand Up @@ -564,12 +580,7 @@ public static int fuzion_sys_fileio_write(long f, Object data, int l)
var s = Runtime._openStreams_.get(f);
if (s instanceof RandomAccessFile raf)
{
/* NYI:
if (!ENABLE_UNSAFE_INTRINSICS)
{
Errors.fatal("*** error: unsafe feature "+innerClazz+" disabled");
}
*/
Runtime.unsafeIntrinsic();
raf.write(fileContent);
}
else if (s instanceof OutputStream os)
Expand All @@ -586,6 +597,7 @@ else if (s instanceof OutputStream os)

public static boolean fuzion_sys_fileio_delete(Object s)
{
Runtime.unsafeIntrinsic();
Path path = Path.of(Runtime.utf8ByteArrayDataToString((byte[]) s));
try
{
Expand All @@ -599,6 +611,7 @@ public static boolean fuzion_sys_fileio_delete(Object s)

public static boolean fuzion_sys_fileio_move(Object o, Object n)
{
Runtime.unsafeIntrinsic();
Path oldPath = Path.of(Runtime.utf8ByteArrayDataToString((byte[]) o));
Path newPath = Path.of(Runtime.utf8ByteArrayDataToString((byte[]) n));
try
Expand All @@ -614,6 +627,7 @@ public static boolean fuzion_sys_fileio_move(Object o, Object n)

public static boolean fuzion_sys_fileio_create_dir(Object s)
{
Runtime.unsafeIntrinsic();
Path path = Path.of(Runtime.utf8ByteArrayDataToString((byte[]) s));
try
{
Expand All @@ -628,6 +642,7 @@ public static boolean fuzion_sys_fileio_create_dir(Object s)

public static void fuzion_sys_fileio_open(Object s, Object res, byte mode)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(res);

Expand Down Expand Up @@ -665,18 +680,21 @@ public static void fuzion_sys_fileio_open(Object s, Object res, byte mode)

public static byte fuzion_sys_fileio_close(long fd)
{
Runtime.unsafeIntrinsic();
return (byte) (Runtime._openStreams_.remove(fd)
? 0
: -1);
}

public static boolean fuzion_sys_fileio_lstats(Object s, Object stats) // NYI : should be altered in the future to not resolve symbolic links
{
Runtime.unsafeIntrinsic();
return fuzion_sys_fileio_stats(s, stats);
}

public static boolean fuzion_sys_fileio_stats(Object s, Object res)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(res);

Expand Down Expand Up @@ -714,6 +732,7 @@ public static boolean fuzion_sys_fileio_stats(Object s, Object res)

public static void fuzion_sys_fileio_seek(long fd, short s, Object res)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(res);

Expand All @@ -734,6 +753,7 @@ public static void fuzion_sys_fileio_seek(long fd, short s, Object res)

public static void fuzion_sys_fileio_file_position(long fd, Object res)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(res);

Expand All @@ -752,6 +772,7 @@ public static void fuzion_sys_fileio_file_position(long fd, Object res)

public static Object fuzion_sys_fileio_mmap(long fd, long offset, long size, Object res)
{
Runtime.unsafeIntrinsic();
if (CHECKS)
Runtime.ensure_not_frozen(res);

Expand Down Expand Up @@ -783,15 +804,18 @@ public static Object fuzion_sys_fileio_mmap(long fd, long offset, long size, Obj

public static int fuzion_sys_fileio_munmap(Object adr, long size)
{
Runtime.unsafeIntrinsic();
return 0;
}

public static byte fuzion_sys_fileio_mapped_buffer_get(Object buf, long i)
{
Runtime.unsafeIntrinsic();
return ((ByteBuffer)buf).get((int) i);
}
public static void fuzion_sys_fileio_mapped_buffer_set(Object buf, long i, byte b)
{
Runtime.unsafeIntrinsic();
((ByteBuffer)buf).put((int) i, b);
}

Expand All @@ -809,6 +833,7 @@ public static void fuzion_std_nano_sleep(long d)

public static boolean fuzion_sys_env_vars_has0(Object s)
{
Runtime.unsafeIntrinsic();
return System.getenv(Runtime.utf8ByteArrayDataToString((byte[]) s)) != null;
}

Expand Down
28 changes: 28 additions & 0 deletions src/dev/flang/be/jvm/runtime/Runtime.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,34 @@ private SystemErrNo(final int errno)
/*-------------------------- static fields --------------------------*/


/**
* Flag to disallow intrinsics that would permit to take over the world via
* file or network access, system function calls etc.
*/
private static boolean _enable_unsafe_intrinsics_ = true;

/**
* Disable unsafe intrinsics.
*/
public static void disableUnsafeIntrinsics()
{
_enable_unsafe_intrinsics_ = false;
}


/**
* Check if unsafe intrinsics are enabled. If not, terminate with a fatal
* error.
*/
public static void unsafeIntrinsic()
{
if (!_enable_unsafe_intrinsics_)
{
Errors.fatal("unsafe operation not permitted", stackTrace());
}
}


/**
* This contains all open files/streams.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/dev/flang/tools/Fuzion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ void process(FuzionOptions options, FUIR fuir)
* Flag to enable intrinsic functions such as fuzion.java.call_virtual. These are
* not allowed if run in a web playground.
*/
boolean _enableUnsafeIntrinsics = Boolean.getBoolean(FuzionConstants.FUZION_ENABLE_UNSAFE_INTRINSICS_PROPERTY);
boolean _enableUnsafeIntrinsics = true;


/**
Expand Down
1 change: 0 additions & 1 deletion src/dev/flang/util/FuzionConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public class FuzionConstants extends ANY
* Names of Java properties accepted by fz command:
*/
public static final String FUZION_DEBUG_LEVEL_PROPERTY = "fuzion.debugLevel";
public static final String FUZION_ENABLE_UNSAFE_INTRINSICS_PROPERTY = "fuzion.enableUnsafeIntrinsics";
public static final String FUZION_HOME_PROPERTY = "fuzion.home";
public static final String FUZION_SAFETY_PROPERTY = "fuzion.safety";

Expand Down

0 comments on commit bc589da

Please sign in to comment.