stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8330611: AES-CTR vector intrinsic may read out of bounds (x86_64, AVX-512)

Browse Source 
Co-authored-by: Francisco Ferrari Bihurriet <fferrari@openjdk.org>
Co-authored-by: Martin Balao <mbalao@openjdk.org>
Reviewed-by: aph, sviswanathan
This commit is contained in:
Martin Balao 2024-04-24 20:23:25 +00:00
parent 0014e0e6b9
commit 8a8d928898
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hotspot/cpu/x86/assembler_x86.cpp
View File

@ -6650,6 +6650,14 @@ void Assembler::xorw(Register dst, Register src) {
emit_arith(0x33, 0xC0, dst, src); emit_arith(0x33, 0xC0, dst, src);
} }
void Assembler::xorw(Register dst, Address src) {
InstructionMark im(this);
emit_int8(0x66);
prefix(src, dst);
emit_int8(0x33);
emit_operand(dst, src, 0);
}
// AVX 3-operands scalar float-point arithmetic instructions // AVX 3-operands scalar float-point arithmetic instructions
void Assembler::vaddsd(XMMRegister dst, XMMRegister nds, Address src) { void Assembler::vaddsd(XMMRegister dst, XMMRegister nds, Address src) {

1
src/hotspot/cpu/x86/assembler_x86.hpp
View File

@ -2262,6 +2262,7 @@ private:
void xorb(Address dst, Register src); void xorb(Address dst, Register src);
void xorb(Register dst, Address src); void xorb(Register dst, Address src);
void xorw(Register dst, Register src); void xorw(Register dst, Register src);
void xorw(Register dst, Address src);
void xorq(Register dst, Address src); void xorq(Register dst, Address src);
void xorq(Address dst, int32_t imm32); void xorq(Address dst, int32_t imm32);

18
src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
View File

@ -2181,6 +2181,7 @@ void StubGenerator::aesctr_encrypt(Register src_addr, Register dest_addr, Regist
const Register rounds = rax; const Register rounds = rax;
const Register pos = r12; const Register pos = r12;
const Register tail = r15;
Label PRELOOP_START, EXIT_PRELOOP, REMAINDER, REMAINDER_16, LOOP, END, EXIT, END_LOOP, Label PRELOOP_START, EXIT_PRELOOP, REMAINDER, REMAINDER_16, LOOP, END, EXIT, END_LOOP,
AES192, AES256, AES192_REMAINDER16, REMAINDER16_END_LOOP, AES256_REMAINDER16, AES192, AES256, AES192_REMAINDER16, REMAINDER16_END_LOOP, AES256_REMAINDER16,
@ -2615,29 +2616,36 @@ void StubGenerator::aesctr_encrypt(Register src_addr, Register dest_addr, Regist
// Save encrypted counter value in xmm0 for next invocation, before XOR operation // Save encrypted counter value in xmm0 for next invocation, before XOR operation
__ movdqu(Address(saved_encCounter_start, 0), xmm0); __ movdqu(Address(saved_encCounter_start, 0), xmm0);
// XOR encryted block cipher in xmm0 with PT to produce CT // XOR encryted block cipher in xmm0 with PT to produce CT
__ evpxorq(xmm0, xmm0, Address(src_addr, pos, Address::times_1, 0), Assembler::AVX_128bit);
// extract up to 15 bytes of CT from xmm0 as specified by length register // extract up to 15 bytes of CT from xmm0 as specified by length register
__ testptr(len_reg, 8); __ testptr(len_reg, 8);
__ jcc(Assembler::zero, EXTRACT_TAIL_4BYTES); __ jcc(Assembler::zero, EXTRACT_TAIL_4BYTES);
__ pextrq(Address(dest_addr, pos), xmm0, 0); __ pextrq(tail, xmm0, 0);
__ xorq(tail, Address(src_addr, pos, Address::times_1, 0));
__ movq(Address(dest_addr, pos), tail);
__ psrldq(xmm0, 8); __ psrldq(xmm0, 8);
__ addl(pos, 8); __ addl(pos, 8);
__ bind(EXTRACT_TAIL_4BYTES); __ bind(EXTRACT_TAIL_4BYTES);
__ testptr(len_reg, 4); __ testptr(len_reg, 4);
__ jcc(Assembler::zero, EXTRACT_TAIL_2BYTES); __ jcc(Assembler::zero, EXTRACT_TAIL_2BYTES);
__ pextrd(Address(dest_addr, pos), xmm0, 0); __ pextrd(tail, xmm0, 0);
__ xorl(tail, Address(src_addr, pos, Address::times_1, 0));
__ movl(Address(dest_addr, pos), tail);
__ psrldq(xmm0, 4); __ psrldq(xmm0, 4);
__ addq(pos, 4); __ addq(pos, 4);
__ bind(EXTRACT_TAIL_2BYTES); __ bind(EXTRACT_TAIL_2BYTES);
__ testptr(len_reg, 2); __ testptr(len_reg, 2);
__ jcc(Assembler::zero, EXTRACT_TAIL_1BYTE); __ jcc(Assembler::zero, EXTRACT_TAIL_1BYTE);
__ pextrw(Address(dest_addr, pos), xmm0, 0); __ pextrw(tail, xmm0, 0);
__ xorw(tail, Address(src_addr, pos, Address::times_1, 0));
__ movw(Address(dest_addr, pos), tail);
__ psrldq(xmm0, 2); __ psrldq(xmm0, 2);
__ addl(pos, 2); __ addl(pos, 2);
__ bind(EXTRACT_TAIL_1BYTE); __ bind(EXTRACT_TAIL_1BYTE);
__ testptr(len_reg, 1); __ testptr(len_reg, 1);
__ jcc(Assembler::zero, END); __ jcc(Assembler::zero, END);
__ pextrb(Address(dest_addr, pos), xmm0, 0); __ pextrb(tail, xmm0, 0);
__ xorb(tail, Address(src_addr, pos, Address::times_1, 0));
__ movb(Address(dest_addr, pos), tail);
__ addl(pos, 1); __ addl(pos, 1);
__ bind(END); __ bind(END);