Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.
/ jdk21 Public archive

Commit

Permalink
8309727: Assert privileges while reading the jdk.incubator.vector.VEC…
Browse files Browse the repository at this point in the history
…TOR_ACCESS_OOB_CHECK system property

Reviewed-by: uschindler, rriggs
Backport-of: cee5724
  • Loading branch information
ChrisHegarty committed Jun 12, 2023
1 parent 005006e commit 73a9f48
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@

import jdk.internal.vm.annotation.ForceInline;

import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Objects;

/*non-public*/ class VectorIntrinsics {
static final int VECTOR_ACCESS_OOB_CHECK = Integer.getInteger("jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK", 2);
@SuppressWarnings("removal")
static final int VECTOR_ACCESS_OOB_CHECK = AccessController.doPrivileged((PrivilegedAction<Integer>) () ->
Integer.getInteger("jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK", 2));

@ForceInline
static void requireLength(int haveLength, int length) {
Expand Down
5 changes: 4 additions & 1 deletion test/jdk/jdk/incubator/vector/VectorRuns.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@

/**
* @test
* @bug 8309727
* @modules jdk.incubator.vector
* @run main VectorRuns
* @run main/othervm/java.security.policy=empty_security.policy VectorRuns
*/

public class VectorRuns {
Expand Down Expand Up @@ -68,7 +71,7 @@ static int countRunAscendingVector(int[] a) {
if (r >= a.length)
return a.length;

int length = a.length & (species.length() - 1);
int length = species.loopBound(a.length);
if (length == a.length) length -= species.length();
while (r < length) {
IntVector vl = IntVector.fromArray(species, a, r - 1);
Expand Down
25 changes: 25 additions & 0 deletions test/jdk/jdk/incubator/vector/empty_security.policy
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// Copyright (c) 2023, 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
// under the terms of the GNU General Public License version 2 only, as
// published by the Free Software Foundation.
//
// This code is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
// version 2 for more details (a copy is included in the LICENSE file that
// accompanied this code).
//
// You should have received a copy of the GNU General Public License version
// 2 along with this work; if not, write to the Free Software Foundation,
// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
//
// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
// or visit www.oracle.com if you need additional information or have any
// questions.
//

// This policy is used by tests not requiring permissions, to assert that the
// JDK implementation has the correct privileged blocks.

1 comment on commit 73a9f48

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.