Skip to content

Commit

Permalink
8272472: StackGuardPages test doesn't build with glibc 2.34
Browse files Browse the repository at this point in the history 
Reviewed-by: shade, stuefe, jiefu
  • Loading branch information
David Holmes committed Aug 22, 2021
1 parent 04a806e commit f77a1a1
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2021, 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
Expand Down Expand Up @@ -68,8 +68,17 @@ static void handler(int sig, siginfo_t *si, void *unused) {
longjmp(context, 1);
}

static char* altstack = NULL;

void set_signal_handler() {
static char altstack[SIGSTKSZ];
if (altstack == NULL) {
// Dynamically allocated in case SIGSTKSZ is not constant
altstack = malloc(SIGSTKSZ);
if (altstack == NULL) {
fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
exit(7);
}
}

stack_t ss = {
.ss_size = SIGSTKSZ,
Expand Down

3 comments on commit f77a1a1

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@dholmes-ora
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk17u

@openjdk
Copy link

@openjdk openjdk bot commented on f77a1a1 Aug 22, 2021

Choose a reason for hiding this comment

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

@dholmes-ora the backport was successfully created on the branch dholmes-ora-backport-f77a1a15 in my personal fork of openjdk/jdk17u. To create a pull request with this backport targeting openjdk/jdk17u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit f77a1a15 from the openjdk/jdk repository.

The commit being backported was authored by David Holmes on 22 Aug 2021 and was reviewed by Aleksey Shipilev, Thomas Stuefe and Jie Fu.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u:

$ git fetch https://github.com/openjdk-bots/jdk17u dholmes-ora-backport-f77a1a15:dholmes-ora-backport-f77a1a15
$ git checkout dholmes-ora-backport-f77a1a15
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u dholmes-ora-backport-f77a1a15

Please sign in to comment.