Skip to content

Fix buffer overflow on section handling #12

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

Merged
frozer merged 1 commit into from
Jan 10, 2025
Merged

Fix buffer overflow on section handling #12

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion libdozor/device-event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ unsigned short int getDeviceEvents(const uint8_t * raw, long int bufSize, Device

blobToHexStr(hexStr, &raw[index], eventSize);

logger(LOG_LEVEL_DEBUG, "device-event(getDeviceEvents)", "event id 0x%x: %s", raw[index], hexStr);
logger(LOG_LEVEL_DEBUG, "device-event(getDeviceEvents)", "[%d] event id 0x%x: %s", eventCount, raw[index], hexStr);

free(hexStr);
}
Expand Down
4 changes: 2 additions & 2 deletions libdozor/event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,10 @@ static char * getAuthEventData(uint8_t type, uint8_t * data, uint8_t len)
static char * getSecurityEventData(uint8_t type, uint8_t * data, uint8_t len)
{
char * template = ",\"user\":%s,\"event\":\"%s\",\"scope\":\"Security\",\"sections\":%s";
char * res = malloc(sizeof(char) * (strlen(template) + MAX_EVENT_NAME_LENGTH + 2));
char * res = malloc(sizeof(char) * (strlen(template) + MAX_EVENT_NAME_LENGTH + MAX_SECTION_LENGTH + 2));
char * extractedData = getData(data, USER_DATA_POSITION, len);
uint8_t state_byte = data[0];
char affectedSections[50];
char affectedSections[MAX_SECTION_LENGTH];

get_affected_sections(state_byte, affectedSections);

Expand Down
1 change: 1 addition & 0 deletions libdozor/event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#define EVENT_COUNT 64
#define EVENT_TIMESTAMP_LENGTH 25
#define MAX_EVENT_NAME_LENGTH 25
#define MAX_SECTION_LENGTH 22 // like, "[1, 2, 3, 4, 5, 7, 8]"
#define COMMAND_RESULT_COUNT 8
#define MAX_COMMAND_RESULT_NAME_LENGTH 32
#define COMMON_EVENT_SCOPE "Common"
Expand Down
8 changes: 4 additions & 4 deletions libdozor/rc4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ void codec(unsigned char* data, CryptoSession * crypto, const size_t msgLength)
unsigned short int data_index;
unsigned char old;

logger(LOG_LEVEL_DEBUG, "rc4(codec)", "called for - %s\n", data);
logger(LOG_LEVEL_DEBUG, "rc4(codec)", "iterator %d\n", i);
logger(LOG_LEVEL_DEBUG, "rc4(codec)", "pointer %d\n", j);
// logger(LOG_LEVEL_DEBUG, "rc4(codec)", "called for - %s\n", data);
// logger(LOG_LEVEL_DEBUG, "rc4(codec)", "iterator %d\n", i);
// logger(LOG_LEVEL_DEBUG, "rc4(codec)", "pointer %d\n", j);

// convert data
for (data_index = 0; data_index < msgLength; data_index++) {
Expand All @@ -67,7 +67,7 @@ void codec(unsigned char* data, CryptoSession * crypto, const size_t msgLength)
kword = crypto->pool[(crypto->pool[i] + crypto->pool[j]) % POOL_SIZE];
data[data_index] = old ^ kword;

logger(LOG_LEVEL_DEBUG, "rc4(codec)", "[%d] 0x%x -> 0x%x\n", data_index, old, data[data_index]);
// logger(LOG_LEVEL_DEBUG, "rc4(codec)", "[%d] 0x%x -> 0x%x\n", data_index, old, data[data_index]);
}

crypto->iterator = i;
Expand Down
Loading