8350201: Out of bounds access on Linux aarch64 in os::print_register_info

MBaesken · MBaesken · commit 59810ad745b2 · 2025-02-19T12:14:04.000Z
Reviewed-by: dholmes, mdoerr
diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
@@ -447,7 +447,7 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 32 /* r0-r32 */ + 3 /* pc, lr, sp */;
+  const int register_count = 32 /* r0-r31 */ + 3 /* pc, lr, sp */;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {
diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
@@ -354,7 +354,7 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 32 /* r0-r31 */;
+  const int register_count = 31 /* r0-r30 */;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {
diff --git a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
@@ -467,7 +467,7 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 32 /* r0-r32 */ + 3 /* pc, lr, ctr */;
+  const int register_count = 32 /* r0-r31 */ + 3 /* pc, lr, ctr */;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ void os::print_context(outputStream st, const void context) {`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`void os::print_register_info(outputStream st, const void context, int& continuation) {`
`450`		`- const int register_count = 32 /* r0-r32 / + 3 / pc, lr, sp */;`
	`450`	`+ const int register_count = 32 /* r0-r31 / + 3 / pc, lr, sp */;`
`451`	`451`	`int n = continuation;`
`452`	`452`	`assert(n >= 0 && n <= register_count, "Invalid continuation value");`
`453`	`453`	`if (context == nullptr \|\| n == register_count) {`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ void os::print_context(outputStream st, const void context) {`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`void os::print_register_info(outputStream st, const void context, int& continuation) {`
`357`		`- const int register_count = 32 /* r0-r31 */;`
	`357`	`+ const int register_count = 31 /* r0-r30 */;`
`358`	`358`	`int n = continuation;`
`359`	`359`	`assert(n >= 0 && n <= register_count, "Invalid continuation value");`
`360`	`360`	`if (context == nullptr \|\| n == register_count) {`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ void os::print_context(outputStream st, const void context) {`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`void os::print_register_info(outputStream st, const void context, int& continuation) {`
`470`		`- const int register_count = 32 /* r0-r32 / + 3 / pc, lr, ctr */;`
	`470`	`+ const int register_count = 32 /* r0-r31 / + 3 / pc, lr, ctr */;`
`471`	`471`	`int n = continuation;`
`472`	`472`	`assert(n >= 0 && n <= register_count, "Invalid continuation value");`
`473`	`473`	`if (context == nullptr \|\| n == register_count) {`