archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8338452: (dc) DatagramChannelImpl.blockingReceive with timeout may block indefinitely if all datagrams blocked by SecurityManager

Browse source 
Reviewed-by: dfuchs
This commit is contained in:
Alan Bateman 2024-08-19 12:57:29 +00:00 • committed by Jaikiran Pai
parent f0fe31383a
commit 2766b09e29
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
View file

@ -683,14 +683,12 @@ class DatagramChannelImpl
} }
long startNanos = System.nanoTime(); long startNanos = System.nanoTime();
long remainingNanos = nanos;
SocketAddress sender = null; SocketAddress sender = null;
try { try {
SocketAddress remote = beginRead(true, false); SocketAddress remote = beginRead(true, false);
boolean connected = (remote != null); boolean connected = (remote != null);
do { do {
long remainingNanos = (nanos > 0)
? nanos - (System.nanoTime() - startNanos)
: 0;
ByteBuffer dst = tryBlockingReceive(connected, bufLength, remainingNanos); ByteBuffer dst = tryBlockingReceive(connected, bufLength, remainingNanos);
// if datagram received then get sender and copy to DatagramPacket // if datagram received then get sender and copy to DatagramPacket
@ -711,8 +709,8 @@ class DatagramChannelImpl
} }
} }
// copy bytes to the DatagramPacket, and set length and sender
if (sender != null) { if (sender != null) {
// copy bytes to the DatagramPacket, and set length and sender
synchronized (p) { synchronized (p) {
// re-read p.bufLength in case DatagramPacket changed // re-read p.bufLength in case DatagramPacket changed
int len = Math.min(dst.limit(), DatagramPackets.getBufLength(p)); int len = Math.min(dst.limit(), DatagramPackets.getBufLength(p));
@ -720,6 +718,14 @@ class DatagramChannelImpl
DatagramPackets.setLength(p, len); DatagramPackets.setLength(p, len);
p.setSocketAddress(sender); p.setSocketAddress(sender);
} }
} else {
// need to retry, adjusting timeout if needed
if (nanos > 0) {
remainingNanos = nanos - (System.nanoTime() - startNanos);
if (remainingNanos <= 0) {
throw new SocketTimeoutException("Receive timed out");
}
}
} }
} finally { } finally {
Util.offerFirstTemporaryDirectBuffer(dst); Util.offerFirstTemporaryDirectBuffer(dst);
@ -746,6 +752,7 @@ class DatagramChannelImpl
private ByteBuffer tryBlockingReceive(boolean connected, int len, long nanos) private ByteBuffer tryBlockingReceive(boolean connected, int len, long nanos)
throws IOException throws IOException
{ {
assert nanos >= 0;
long startNanos = System.nanoTime(); long startNanos = System.nanoTime();
ByteBuffer dst = Util.getTemporaryDirectBuffer(len); ByteBuffer dst = Util.getTemporaryDirectBuffer(len);
int n = -1; int n = -1;