Paths

Table of Contentst

aesni: Avoid a potential out-of-bounds load in AES_GCM_encrypt()
ClosedPublic
Actions

Authored by markj on Nov 16 2021, 2:17 PM.

Details

Reviewers

cem
jhb

Commits

rG4285655adb74: aesni: Avoid a potential out-of-bounds load in AES_GCM_encrypt()

Summary

This is effectively the same problem as the one fixed in 564b6aa7fccd
("aesni: Avoid a potential out-of-bounds load in aes_encrypt_icm()")
but I didn't have a reproducer before.

Reported by: Jenkins

Test Plan

The ktls tests trigger this when KASAN is enabled. With this
change they pass. cryptocheck -d aesni0 -z -a aes-gcm{,192,256} also
runs successfully.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markj created this revision.Nov 16 2021, 2:17 PM

Herald added subscribers: jmg, imp. · View Herald TranscriptNov 16 2021, 2:17 PM

markj requested review of this revision.Nov 16 2021, 2:17 PM

Harbormaster completed remote builds in B42808: Diff 98576.Nov 16 2021, 2:17 PM

markj edited the test plan for this revision. (Show Details)Nov 16 2021, 2:19 PM

cem accepted this revision.Nov 16 2021, 3:19 PM

cem added inline comments.

sys/crypto/aesni/aesni_ghash.c
510	Can we not use `_mm_xor_si128(tmp1, last_block)`? Or we assume `^` generates the same instruction?

This revision is now accepted and ready to land.Nov 16 2021, 3:19 PM

markj marked an inline comment as done.Nov 16 2021, 3:43 PM

markj added inline comments.

sys/crypto/aesni/aesni_ghash.c
510	The aesni code does both but we should stay consistent within this function, I'll switch to the intrinsic.

Use the xor intrinsic

This revision now requires review to proceed.Nov 16 2021, 3:44 PM

Harbormaster completed remote builds in B42809: Diff 98577.Nov 16 2021, 3:44 PM

Cool

This revision is now accepted and ready to land.Nov 16 2021, 4:20 PM

jhb accepted this revision.Nov 16 2021, 5:57 PM

Closed by commit rG4285655adb74: aesni: Avoid a potential out-of-bounds load in AES_GCM_encrypt() (authored by markj). · Explain WhyNov 16 2021, 6:53 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rG4285655adb74: aesni: Avoid a potential out-of-bounds load in AES_GCM_encrypt().

Revision Contents
Changeset List

Path

Size

sys/

crypto/

aesni/

aesni_ghash.c

7 lines

Diff 98593

View Options

sys/crypto/aesni/aesni_ghash.c

aesni: Avoid a potential out-of-bounds load in AES_GCM_encrypt()ClosedPublicActions