Skip to content

Commit c3fdc7f

Browse files
committed
[GR-11350] Bind CompilerDaemon to localhost only.
PullRequest: mx/1855
2 parents a424108 + 8ce37d1 commit c3fdc7f

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

common.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+24-2950", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+25-3126", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
4545

4646
"oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+24", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+24-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+24-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+24-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+24-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+24-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+24-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+25", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+25-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+25-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+25-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+25-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+25-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+25-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

java/com.oracle.mxtool.compilerserver/src/com/oracle/mxtool/compilerserver/CompilerDaemon.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.io.IOException;
2929
import java.io.InputStreamReader;
3030
import java.io.OutputStreamWriter;
31+
import java.net.InetAddress;
3132
import java.net.ServerSocket;
3233
import java.net.Socket;
3334
import java.net.SocketException;
@@ -81,8 +82,8 @@ public void run(String[] args) throws Exception {
8182
i++;
8283
}
8384

84-
// create socket
85-
serverSocket = new ServerSocket(0);
85+
// create socket bound to localhost
86+
serverSocket = new ServerSocket(0, 0, InetAddress.getLoopbackAddress());
8687
int port = serverSocket.getLocalPort();
8788

8889
// Need at least 2 threads since we dedicate one to the control

src/mx/_impl/mx.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18224,7 +18224,7 @@ def alarm_handler(signum, frame):
1822418224
_CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache'))
1822518225

1822618226
# The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
18227-
version = VersionSpec("7.35.2") # [GR-59878] Exit CompilerDaemon when a SocketException is received
18227+
version = VersionSpec("7.35.3") # GR-11350
1822818228

1822918229
_mx_start_datetime = datetime.utcnow()
1823018230

0 commit comments

Comments
 (0)