crypt/opencryptoki
1
0
Fork 0
mirror of https://github.com/opencryptoki/opencryptoki.git synced 2026-10-24 05:39:17 +03:00
Code Releases Activity

COMMON/PKCSCCA/PKCSTOK_MIGRATE: Prevent overflow when reading old token objects

Browse Source 
Check that the decrypted data is large enough to also hold the digest.

Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
This commit is contained in:
Ingo Franzki
2026-08-10 09:36:02 +02:00
parent 9cbe772cf0
commit bf8cf2fbaa
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
usr/lib/common/loadsave.c
View File

@@ -1709,8 +1709,9 @@ CK_RV restore_private_token_object_old(STDLL_TokData_t *tokdata, CK_BYTE *data,
obj_data_len = *(CK_ULONG_32 *) ptr;
// prevent buffer overflow in sha_update
if (obj_data_len > clear_len) {
// prevent buffer overflow in sha_update and memcmp
if (obj_data_len > clear_len ||
sizeof(CK_ULONG_32) + obj_data_len + SHA1_HASH_SIZE > clear_len) {
TRACE_ERROR("stripped length is greater than clear length\n");
rc = CKR_FUNCTION_FAILED;
goto done;

3
usr/sbin/pkcscca/pkcscca.c
View File

@@ -342,7 +342,8 @@ int reencrypt_private_token_object(unsigned char *data, unsigned long len,
/* Validate the hash */
memcpy(&obj_data_len_32, clear, sizeof(CK_ULONG_32));
if (obj_data_len_32 >= clear_len) {
if (obj_data_len_32 >= clear_len ||
sizeof(CK_ULONG_32) + (unsigned long)obj_data_len_32 + SHA1_HASH_SIZE > clear_len) {
fprintf(stderr, "Decrypted object data is inconsistent. Possibly already migrated?\n");
ret = CKR_FUNCTION_FAILED;
goto done;

8
usr/sbin/pkcstok_migrate/pkcstok_migrate.c
View File

@@ -398,9 +398,13 @@ static CK_RV decrypt_OBJECT_PRIV_00(unsigned char **clear, unsigned int *clear_l
goto done;
}
/* Validate the length */
/* Validate the length: the decrypted buffer must hold
* | CK_ULONG_32 | object[obj_data_len_32] | SHA1[SHA1_HASH_SIZE] |
* so check that all three regions fit within enc_len.
*/
memcpy(&obj_data_len_32, tmp_clear, sizeof(CK_ULONG_32));
if (obj_data_len_32 >= enc_len) {
if (obj_data_len_32 >= enc_len ||
obj_data_len_32 > enc_len - sizeof(CK_ULONG_32) - SHA1_HASH_SIZE) {
TRACE_ERROR("Decrypted object data length %d inconsistent\n",
obj_data_len_32);
ret = CKR_FUNCTION_FAILED;