Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-24 01:46:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix buffer accessed out of bounds

Browse source
This commit is contained in:
Dimitris Apostolou 2025-01-19 18:55:06 +02:00
parent c600b834e3
commit 788a7f234b
No known key found for this signature in database
GPG key ID: 4B5D20E938204A8A
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libi2pd/Identity.cpp
View file

@ -18,20 +18,33 @@ namespace data
{ {
Identity& Identity::operator=(const Keys& keys) Identity& Identity::operator=(const Keys& keys)
{ {
// Ensure the destination buffers are not accessed out of bounds
static_assert(sizeof(publicKey) >= sizeof(keys.publicKey), "publicKey buffer too small");
static_assert(sizeof(signingKey) >= sizeof(keys.signingKey), "signingKey buffer too small");
// copy public and signing keys together // copy public and signing keys together
memcpy (publicKey, keys.publicKey, sizeof (publicKey)); memcpy(publicKey, keys.publicKey, sizeof(keys.publicKey));
memcpy (signingKey, keys.signingKey, sizeof (signingKey)); memcpy(signingKey, keys.signingKey, sizeof(keys.signingKey));
memset (certificate, 0, sizeof (certificate)); memset(certificate, 0, sizeof(certificate)); // Clear certificate safely
return *this; return *this;
} }
size_t Identity::FromBuffer (const uint8_t * buf, size_t len) size_t Identity::FromBuffer(const uint8_t* buf, size_t len)
{ {
if ( len < DEFAULT_IDENTITY_SIZE ) { if (len < DEFAULT_IDENTITY_SIZE) {
// buffer too small, don't overflow // buffer too small, avoid overflow
LogPrint(eLogError, "Identity::FromBuffer: Buffer too small, expected at least ", DEFAULT_IDENTITY_SIZE, " bytes");
return 0; return 0;
} }
memcpy (publicKey, buf, DEFAULT_IDENTITY_SIZE);
// Copy only up to the size of publicKey and ensure no overflow occurs
memcpy(publicKey, buf, sizeof(publicKey));
// Log or handle unexpected large buffers
if (len > DEFAULT_IDENTITY_SIZE) {
LogPrint(eLogWarning, "Identity::FromBuffer: Extra data in buffer ignored");
}
return DEFAULT_IDENTITY_SIZE; return DEFAULT_IDENTITY_SIZE;
} }