Skip to content

8166140: C1: Possible integer overflow in LIRGenerator::generate_address on several platforms #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8166140: C1: Possible integer overflow in LIRGenerator::generate_address on several platforms #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,11 @@ LIR_Opr LIRGenerator::safepoint_poll_register() {
LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
int shift, int disp, BasicType type) {
assert(base->is_register(), "must be");
intx large_disp = disp;

// accumulate fixed displacements
if (index->is_constant()) {
disp += index->as_constant_ptr()->as_jint() << shift;
large_disp += (intx)(index->as_constant_ptr()->as_jint()) << shift;
index = LIR_OprFact::illegalOpr;
}

Expand All @@ -154,31 +155,31 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
__ shift_left(index, shift, tmp);
index = tmp;
}
if (disp != 0) {
if (large_disp != 0) {
LIR_Opr tmp = new_pointer_register();
if (Assembler::operand_valid_for_add_sub_immediate(disp)) {
__ add(tmp, tmp, LIR_OprFact::intptrConst(disp));
if (Assembler::operand_valid_for_add_sub_immediate(large_disp)) {
__ add(tmp, tmp, LIR_OprFact::intptrConst(large_disp));
index = tmp;
} else {
__ move(tmp, LIR_OprFact::intptrConst(disp));
__ move(tmp, LIR_OprFact::intptrConst(large_disp));
__ add(tmp, index, tmp);
index = tmp;
}
disp = 0;
large_disp = 0;
}
} else if (disp != 0 && !Address::offset_ok_for_immed(disp, shift)) {
} else if (large_disp != 0 && !Address::offset_ok_for_immed(large_disp, shift)) {
// index is illegal so replace it with the displacement loaded into a register
index = new_pointer_register();
__ move(LIR_OprFact::intptrConst(disp), index);
disp = 0;
__ move(LIR_OprFact::intptrConst(large_disp), index);
large_disp = 0;
}

// at this point we either have base + index or base + displacement
if (disp == 0) {
if (large_disp == 0) {
return new LIR_Address(base, index, type);
} else {
assert(Address::offset_ok_for_immed(disp, 0), "must be");
return new LIR_Address(base, disp, type);
assert(Address::offset_ok_for_immed(large_disp, 0), "must be");
return new LIR_Address(base, large_disp, type);
}
}

Expand All @@ -192,7 +193,7 @@ LIR_Address* LIRGenerator::emit_array_address(LIR_Opr array_opr, LIR_Opr index_o
LIR_Address* addr;
if (index_opr->is_constant()) {
addr = new LIR_Address(array_opr,
offset_in_bytes + index_opr->as_jint() * elem_size, type);
offset_in_bytes + (intx)(index_opr->as_jint()) * elem_size, type);
} else {
// #ifdef _LP64
// if (index_opr->type() == T_INT) {
Expand Down
31 changes: 16 additions & 15 deletions hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,11 @@ LIR_Opr LIRGenerator::safepoint_poll_register() {
LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
int shift, int disp, BasicType type) {
assert(base->is_register(), "must be");
intx large_disp = disp;

// accumulate fixed displacements
if (index->is_constant()) {
disp += index->as_constant_ptr()->as_jint() << shift;
large_disp += (intx)(index->as_constant_ptr()->as_jint()) << shift;
index = LIR_OprFact::illegalOpr;
}

Expand All @@ -160,31 +161,31 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
__ shift_left(index, shift, tmp);
index = tmp;
}
if (disp != 0) {
if (large_disp != 0) {
LIR_Opr tmp = new_pointer_register();
if (Assembler::is_simm13(disp)) {
__ add(tmp, LIR_OprFact::intptrConst(disp), tmp);
if (Assembler::is_simm13(large_disp)) {
__ add(tmp, LIR_OprFact::intptrConst(large_disp), tmp);
index = tmp;
} else {
__ move(LIR_OprFact::intptrConst(disp), tmp);
__ move(LIR_OprFact::intptrConst(large_disp), tmp);
__ add(tmp, index, tmp);
index = tmp;
}
disp = 0;
large_disp = 0;
}
} else if (disp != 0 && !Assembler::is_simm13(disp)) {
} else if (large_disp != 0 && !Assembler::is_simm13(large_disp)) {
// index is illegal so replace it with the displacement loaded into a register
index = new_pointer_register();
__ move(LIR_OprFact::intptrConst(disp), index);
disp = 0;
__ move(LIR_OprFact::intptrConst(large_disp), index);
large_disp = 0;
}

// at this point we either have base + index or base + displacement
if (disp == 0) {
if (large_disp == 0) {
return new LIR_Address(base, index, type);
} else {
assert(Assembler::is_simm13(disp), "must be");
return new LIR_Address(base, disp, type);
assert(Assembler::is_simm13(large_disp), "must be");
return new LIR_Address(base, large_disp, type);
}
}

Expand All @@ -195,11 +196,11 @@ LIR_Address* LIRGenerator::emit_array_address(LIR_Opr array_opr, LIR_Opr index_o
int shift = exact_log2(elem_size);

LIR_Opr base_opr;
int offset = arrayOopDesc::base_offset_in_bytes(type);
intx offset = arrayOopDesc::base_offset_in_bytes(type);

if (index_opr->is_constant()) {
int i = index_opr->as_constant_ptr()->as_jint();
int array_offset = i * elem_size;
intx i = index_opr->as_constant_ptr()->as_jint();
intx array_offset = i * elem_size;
if (Assembler::is_simm13(array_offset + offset)) {
base_opr = array_opr;
offset = array_offset + offset;
Expand Down
2 changes: 1 addition & 1 deletion hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
assert(base->is_register(), "must be");
if (index->is_constant()) {
return new LIR_Address(base,
(index->as_constant_ptr()->as_jint() << shift) + disp,
((intx)(index->as_constant_ptr()->as_jint()) << shift) + disp,
type);
} else {
return new LIR_Address(base, index, (LIR_Address::Scale)shift, disp, type);
Expand Down