8357268: Use JavaNioAccess.getBufferAddress rather than DirectBuffer.address()

Reviewed-by: alanb, valeriep

Author: minborg

src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.security.*;
@@ -910,26 +911,26 @@ int doLastBlock(GCMOperation op, ByteBuffer buffer, ByteBuffer src,
          */
         ByteBuffer overlapDetection(ByteBuffer src, ByteBuffer dst) {
             if (src.isDirect() && dst.isDirect()) {
-                // The use of DirectBuffer::address below need not be guarded as
+                // The use of addresses below need not be guarded as
                 // no access is made to actual memory.
                 DirectBuffer dsrc = (DirectBuffer) src;
                 DirectBuffer ddst = (DirectBuffer) dst;
 
                 // Get the current memory address for the given ByteBuffers
-                long srcaddr = dsrc.address();
-                long dstaddr = ddst.address();
+                long srcaddr = NIO_ACCESS.getBufferAddress(src);
+                long dstaddr = NIO_ACCESS.getBufferAddress(dst);
 
                 // Find the lowest attachment that is the base memory address
                 // of the shared memory for the src object
                 while (dsrc.attachment() != null) {
-                    srcaddr = ((DirectBuffer) dsrc.attachment()).address();
+                    srcaddr = NIO_ACCESS.getBufferAddress((Buffer) dsrc.attachment());
                     dsrc = (DirectBuffer) dsrc.attachment();
                 }
 
                 // Find the lowest attachment that is the base memory address
                 // of the shared memory for the dst object
                 while (ddst.attachment() != null) {
-                    dstaddr = ((DirectBuffer) ddst.attachment()).address();
+                    dstaddr = NIO_ACCESS.getBufferAddress((Buffer) ddst.attachment());
                     ddst = (DirectBuffer) ddst.attachment();
                 }
 
@@ -947,8 +948,8 @@ ByteBuffer overlapDetection(ByteBuffer src, ByteBuffer dst) {
                 // side, we are not in overlap.
                 // NOTE: inPlaceArray does not apply here as direct buffers run
                 // through a byte[] to get to the combined intrinsic
-                if (((DirectBuffer) src).address() - srcaddr + src.position() >=
-                    ((DirectBuffer) dst).address() - dstaddr + dst.position()) {
+                if (NIO_ACCESS.getBufferAddress(src) - srcaddr + src.position() >=
+                    NIO_ACCESS.getBufferAddress(dst) - dstaddr + dst.position()) {
                     return dst;
                 }
 
@@ -1602,7 +1603,7 @@ public int doFinal(ByteBuffer src, ByteBuffer dst)
                         NIO_ACCESS.acquireSession(dst);
                         try {
                             Unsafe.getUnsafe().setMemory(
-                                ((DirectBuffer)dst).address(),
+                                NIO_ACCESS.getBufferAddress(dst),
                                 len + dst.position(), (byte) 0);
                         } finally {
                             NIO_ACCESS.releaseSession(dst);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -484,7 +484,7 @@ static void acquireScope(ByteBuffer bb, boolean async) {
         NIO_ACCESS.acquireSession(bb);
     }
 
-    private static void releaseScope(ByteBuffer bb) {
+    static void releaseScope(ByteBuffer bb) {
         try {
             NIO_ACCESS.releaseSession(bb);
         } catch (Exception e) {

src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java

@@ -166,10 +166,10 @@ public int read(String name, ByteBuffer dst) throws IOException {
         assert (pos <= lim);
         int rem = (pos <= lim ? lim - pos : 0);
 
-        if (dst instanceof sun.nio.ch.DirectBuffer ddst) {
+        if (dst.isDirect()) {
             NIO_ACCESS.acquireSession(dst);
             try {
-                long address = ddst.address() + pos;
+                long address = NIO_ACCESS.getBufferAddress(dst) + pos;
                 int n = read(name, address, rem);
                 dst.position(pos + n);
                 return n;
@@ -225,10 +225,10 @@ public int write(String name, ByteBuffer src) throws IOException {
         assert (pos <= lim);
         int rem = (pos <= lim ? lim - pos : 0);
 
-        if (src instanceof sun.nio.ch.DirectBuffer buf) {
+        if (src.isDirect()) {
             NIO_ACCESS.acquireSession(src);
             try {
-                long address = buf.address() + pos;
+                long address = NIO_ACCESS.getBufferAddress(src) + pos;
                 write(name, address, rem);
                 src.position(pos + rem);
                 return rem;

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package sun.security.pkcs11;
 
 import java.io.ByteArrayOutputStream;
@@ -743,8 +744,8 @@ private int implDoFinal(ByteBuffer inBuffer, ByteBuffer outBuffer)
                         inOfs = 0;
                         inLen = in.length;
                     } else {
-                        if (inBuffer instanceof DirectBuffer dInBuffer) {
-                            inAddr = dInBuffer.address();
+                        if (inBuffer instanceof DirectBuffer) {
+                            inAddr = NIO_ACCESS.getBufferAddress(inBuffer);
                             inOfs = inBuffer.position();
                         } else {
                             if (inBuffer.hasArray()) {
@@ -759,8 +760,8 @@ private int implDoFinal(ByteBuffer inBuffer, ByteBuffer outBuffer)
                     long outAddr = 0;
                     byte[] outArray = null;
                     int outOfs = 0;
-                    if (outBuffer instanceof DirectBuffer dOutBuffer) {
-                        outAddr = dOutBuffer.address();
+                    if (outBuffer instanceof DirectBuffer) {
+                        outAddr = NIO_ACCESS.getBufferAddress(outBuffer);
                         outOfs = outBuffer.position();
                     } else {
                         if (outBuffer.hasArray()) {

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package sun.security.pkcs11;
 
 import java.nio.ByteBuffer;
@@ -742,8 +743,8 @@ private int implUpdate(ByteBuffer inBuffer, ByteBuffer outBuffer)
                 int inOfs = 0;
                 byte[] inArray = null;
 
-                if (inBuffer instanceof DirectBuffer dInBuffer) {
-                    inAddr = dInBuffer.address();
+                if (inBuffer instanceof DirectBuffer) {
+                    inAddr = NIO_ACCESS.getBufferAddress(inBuffer);
                     inOfs = origPos;
                 } else if (inBuffer.hasArray()) {
                     inArray = inBuffer.array();
@@ -753,8 +754,8 @@ private int implUpdate(ByteBuffer inBuffer, ByteBuffer outBuffer)
                 long outAddr = 0;
                 int outOfs = 0;
                 byte[] outArray = null;
-                if (outBuffer instanceof DirectBuffer dOutBuffer) {
-                    outAddr = dOutBuffer.address();
+                if (outBuffer instanceof DirectBuffer) {
+                    outAddr = NIO_ACCESS.getBufferAddress(outBuffer);
                     outOfs = outBuffer.position();
                 } else {
                     if (outBuffer.hasArray()) {
@@ -1012,8 +1013,8 @@ private int implDoFinal(ByteBuffer outBuffer)
                 long outAddr = 0;
                 byte[] outArray = null;
                 int outOfs = 0;
-                if (outBuffer instanceof DirectBuffer dOutBuffer) {
-                    outAddr = dOutBuffer.address();
+                if (outBuffer instanceof DirectBuffer) {
+                    outAddr = NIO_ACCESS.getBufferAddress(outBuffer);
                     outOfs = outBuffer.position();
                 } else {
                     if (outBuffer.hasArray()) {

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -271,7 +271,7 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
             return;
         }
 
-        if (!(byteBuffer instanceof DirectBuffer dByteBuffer)) {
+        if (!(byteBuffer instanceof DirectBuffer)) {
             super.engineUpdate(byteBuffer);
             return;
         }
@@ -289,7 +289,8 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
             }
             NIO_ACCESS.acquireSession(byteBuffer);
             try {
-                token.p11.C_DigestUpdate(session.id(), dByteBuffer.address() + ofs, null, 0, len);
+                final long address = NIO_ACCESS.getBufferAddress(byteBuffer);
+                token.p11.C_DigestUpdate(session.id(), address + ofs, null, 0, len);
             } finally {
                 NIO_ACCESS.releaseSession(byteBuffer);
             }

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyWrapCipher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package sun.security.pkcs11;
 
 import java.io.ByteArrayOutputStream;
@@ -577,8 +578,8 @@ private int implDoFinal(ByteBuffer inBuffer, ByteBuffer outBuffer)
                         inOfs = 0;
                         inLen = in.length;
                     } else {
-                        if (inBuffer instanceof DirectBuffer dInBuffer) {
-                            inAddr = dInBuffer.address();
+                        if (inBuffer instanceof DirectBuffer) {
+                            inAddr = NIO_ACCESS.getBufferAddress(inBuffer);
                             inOfs = inBuffer.position();
                         } else {
                             if (inBuffer.hasArray()) {
@@ -593,8 +594,8 @@ private int implDoFinal(ByteBuffer inBuffer, ByteBuffer outBuffer)
                     long outAddr = 0;
                     byte[] outArray = null;
                     int outOfs = 0;
-                    if (outBuffer instanceof DirectBuffer dOutBuffer) {
-                        outAddr = dOutBuffer.address();
+                    if (outBuffer instanceof DirectBuffer) {
+                        outAddr = NIO_ACCESS.getBufferAddress(outBuffer);
                         outOfs = outBuffer.position();
                     } else {
                         if (outBuffer.hasArray()) {

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java

@@ -279,14 +279,15 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
             if (len <= 0) {
                 return;
             }
-            if (!(byteBuffer instanceof DirectBuffer dByteBuffer)) {
+            if (!(byteBuffer instanceof DirectBuffer)) {
                 super.engineUpdate(byteBuffer);
                 return;
             }
             int ofs = byteBuffer.position();
             NIO_ACCESS.acquireSession(byteBuffer);
             try  {
-                token.p11.C_SignUpdate(session.id(), dByteBuffer.address() + ofs, null, 0, len);
+                final long address = NIO_ACCESS.getBufferAddress(byteBuffer);
+                token.p11.C_SignUpdate(session.id(), address + ofs, null, 0, len);
             } finally {
                 NIO_ACCESS.releaseSession(byteBuffer);
             }

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -614,15 +614,15 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
         isActive = true;
         switch (type) {
             case T_UPDATE -> {
-                if (!(byteBuffer instanceof DirectBuffer dByteBuffer)) {
+                if (!(byteBuffer instanceof DirectBuffer)) {
                     // cannot do better than default impl
                     super.engineUpdate(byteBuffer);
                     return;
                 }
                 int ofs = byteBuffer.position();
                 NIO_ACCESS.acquireSession(byteBuffer);
                 try {
-                    long addr = dByteBuffer.address();
+                    long addr = NIO_ACCESS.getBufferAddress(byteBuffer);
                     if (mode == M_SIGN) {
                         if (DEBUG) System.out.println(this + ": Calling C_SignUpdate");
                         token.p11.C_SignUpdate

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -579,15 +579,15 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
         }
         switch (type) {
             case T_UPDATE -> {
-                if (!(byteBuffer instanceof DirectBuffer dByteBuffer)) {
+                if (!(byteBuffer instanceof DirectBuffer)) {
                     // cannot do better than default impl
                     super.engineUpdate(byteBuffer);
                     return;
                 }
                 int ofs = byteBuffer.position();
                 NIO_ACCESS.acquireSession(byteBuffer);
                 try {
-                    long addr = dByteBuffer.address();
+                    long addr = NIO_ACCESS.getBufferAddress(byteBuffer);
                     if (mode == M_SIGN) {
                         token.p11.C_SignUpdate
                                 (session.id(), addr + ofs, null, 0, len);