8334719: (se) Deferred close of SelectableChannel may result in a Selector doing the final close before concurrent I/O on channel has completed

Co-authored-by: Alan Bateman <[email protected]>
Reviewed-by: alanb, dfuchs

Author: jaikiran

src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java

@@ -1945,6 +1945,11 @@ protected void implCloseSelectableChannel() throws IOException {
 
     @Override
     public void kill() {
+        // wait for any read/write operations to complete before trying to close
+        readLock.lock();
+        readLock.unlock();
+        writeLock.lock();
+        writeLock.unlock();
         synchronized (stateLock) {
             if (state == ST_CLOSING) {
                 tryFinishClose();

src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java

@@ -654,6 +654,9 @@ protected void implCloseSelectableChannel() throws IOException {
 
     @Override
     public void kill() {
+        // wait for any accept operation to complete before trying to close
+        acceptLock.lock();
+        acceptLock.unlock();
         synchronized (stateLock) {
             if (state == ST_CLOSING) {
                 tryFinishClose();

src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java

@@ -1216,6 +1216,11 @@ protected void implCloseSelectableChannel() throws IOException {
 
     @Override
     public void kill() {
+        // wait for any read/write operations to complete before trying to close
+        readLock.lock();
+        readLock.unlock();
+        writeLock.lock();
+        writeLock.unlock();
         synchronized (stateLock) {
             if (state == ST_CLOSING) {
                 tryFinishClose();

src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java

@@ -201,6 +201,9 @@ protected void implCloseSelectableChannel() throws IOException {
 
     @Override
     public void kill() {
+        // wait for any write operation to complete before trying to close
+        writeLock.lock();
+        writeLock.unlock();
         synchronized (stateLock) {
             if (state == ST_CLOSING) {
                 tryFinishClose();

src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java

@@ -200,6 +200,9 @@ protected void implCloseSelectableChannel() throws IOException {
     }
     @Override
     public void kill() {
+        // wait for any read operation to complete before trying to close
+        readLock.lock();
+        readLock.unlock();
         synchronized (stateLock) {
             assert !isOpen();
             if (state == ST_CLOSING) {