d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge(4): fix license validation check for V3 licenses

Browse Source 
Length consistency checks were failing for ECC hashes.

Submitted by:   Richard Houldsworth <rhouldsworth at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
MFC after:      1 week
This commit is contained in:
Andrew Rybchenko 2016-05-16 07:12:04 +00:00
parent dfb5178f9b
commit 95c6a8211c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/sfxge/common/efx_lic.c
View File

@ -1103,7 +1103,6 @@ fail1:
/* V3 format uses Huntington TLV format partition. See SF-108797-SW */
#define EFX_LICENSE_V3_KEY_LENGTH_MIN (64)
#define EFX_LICENSE_V3_KEY_LENGTH_MAX (160)
#define EFX_LICENSE_V3_HASH_LENGTH (64)
__checkReturn efx_rc_t
efx_lic_v3_find_start(
@ -1169,16 +1168,17 @@ efx_lic_v3_validate_key(
goto fail1;
}
key_type = ((uint8_t*)keyp)[0];
key_length = ((uint8_t*)keyp)[1] + EFX_LICENSE_V3_HASH_LENGTH;
if(key_length > EFX_LICENSE_V3_KEY_LENGTH_MAX) {
if (length > EFX_LICENSE_V3_KEY_LENGTH_MAX) {
goto fail2;
}
key_type = ((uint8_t*)keyp)[0];
key_length = ((uint8_t*)keyp)[1];
if (key_type < 3) {
goto fail3;
}
if (key_length != length) {
if (key_length > length) {
goto fail4;
}
return (B_TRUE);