Skip to content
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

Jump to bottom

fuzz: more initialized memory for MSAN #434

Merged
merged 1 commit into from
Oct 8, 2024
Merged

fuzz: more initialized memory for MSAN #434

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
10 changes: 4 additions & 6 deletions pkcs11/fuzz/fuzz_get_attribute_value.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,15 @@ void derive_ecdh_session_keys(uint8_t derived_key_count,
CK_OBJECT_HANDLE ecdh = {0};

CK_ECDH1_DERIVE_PARAMS params = {0};
memset(&params, 0, sizeof(params));
params.kdf = CKD_NULL;
params.pSharedData = NULL;
params.ulSharedDataLen = 0;
// TODO populate pPublicData and ulPublicDataLen from fuzzer generated data?
params.pPublicData = new uint8_t[50];
memset(params.pPublicData, 0, 50);
params.ulPublicDataLen = 50;

CK_MECHANISM mechanism = {0};
memset(&mechanism, 0, sizeof(mechanism));
mechanism.mechanism = CKM_ECDH1_DERIVE;
mechanism.pParameter = (void *) &params;
mechanism.ulParameterLen = sizeof(params);
Expand Down Expand Up @@ -185,8 +184,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t *data, size_t size) {

FuzzedDataProvider *fdp = new FuzzedDataProvider(data, size);

test_case_t test_case;
memset(&test_case, 0, sizeof(test_case_t));
test_case_t test_case = {0};
test_case.attribute_count = fdp->ConsumeIntegral<CK_ULONG>();
test_case.obj_handle = fdp->ConsumeIntegral<CK_OBJECT_HANDLE>();
test_case.derived_ecdh_key_count = fdp->ConsumeIntegral<uint8_t>();
Expand All @@ -198,8 +196,8 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t *data, size_t size) {
test_case.attribute_count = 10;
}

CK_ATTRIBUTE_PTR attribute_array;
CK_ATTRIBUTE_PTR ecdh_attribute_array;
CK_ATTRIBUTE_PTR attribute_array = NULL;
CK_ATTRIBUTE_PTR ecdh_attribute_array = NULL;
populate_attribute_template(&attribute_array, test_case.attribute_count, fdp);
populate_derived_ecdh_key_template(&ecdh_attribute_array, fdp);

Expand Down
Loading