matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dhcp_relay] fix data type in dhcp6relay, add protection in packet data parsing (#9036)

Browse Source
This commit is contained in:
kellyyeh 2021-10-21 23:00:37 -07:00 committed by Ying Xie
parent 5868b9e17d
commit 7fb8dae264
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dhcp6relay/src/relay.cpp
View File

@ -593,7 +593,6 @@ void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *
void callback(evutil_socket_t fd, short event, void *arg) { void callback(evutil_socket_t fd, short event, void *arg) {
struct relay_config *config = (struct relay_config *)(arg); struct relay_config *config = (struct relay_config *)(arg);
static uint8_t message_buffer[4096]; static uint8_t message_buffer[4096];
std::string counterVlan = counter_table;
int32_t len = recv(config->filter, message_buffer, 4096, 0); int32_t len = recv(config->filter, message_buffer, 4096, 0);
if (len <= 0) { if (len <= 0) {
syslog(LOG_WARNING, "recv: Failed to receive data at filter socket: %s\n", strerror(errno)); syslog(LOG_WARNING, "recv: Failed to receive data at filter socket: %s\n", strerror(errno));
@ -601,7 +600,7 @@ void callback(evutil_socket_t fd, short event, void *arg) {
} }
char* ptr = (char *)message_buffer; char* ptr = (char *)message_buffer;
const uint8_t *current_position = (uint8_t *)ptr; const uint8_t *current_position = (uint8_t *)ptr;
const uint8_t *tmp = NULL; const uint8_t *tmp = NULL;
const uint8_t *prev = NULL; const uint8_t *prev = NULL;
@ -623,7 +622,7 @@ void callback(evutil_socket_t fd, short event, void *arg) {
prev = current_position; prev = current_position;
} }
while (ext_header->ip6e_nxt != IPPROTO_UDP); while (ext_header->ip6e_nxt != IPPROTO_UDP);
} }
auto udp_header = parse_udp(current_position, &tmp); auto udp_header = parse_udp(current_position, &tmp);
current_position = tmp; current_position = tmp;