WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-09-09 11:27:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect copy error

Browse Source
This commit is contained in:
TCY16
2022-06-20 14:12:19 +02:00
parent a5ca3850aa
commit 303aa68b58
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testcode/testpkts.c
+12 -11
View File
@@ -1778,17 +1778,20 @@ adjust_packet(struct entry* match, uint8_t** answer_pkt, size_t *answer_len,
if(match->server_cookie) {
/** Find the cookie option and add the server cookie if
* the client cookie is present and not already there */
res = realloc(res, reslen + 28);
uint8_t* walk_query = query_pkt;
size_t walk_query_len = query_len;
uint8_t* walk_response = res;
size_t walk_response_len = reslen+28;
uint8_t* walk_response;
size_t walk_response_len;
uint8_t* rdlen_ptr_query;
uint8_t* rdlen_ptr_response;
/* create space for the server cookie in the response packet */
res = realloc(res, reslen + 28);
reslen += 28;
walk_response = res;
walk_response_len = reslen;
if (!(walk_response)) {
log_err("testbound: out of memory; send without cookie");
return;
@@ -1818,7 +1821,6 @@ adjust_packet(struct entry* match, uint8_t** answer_pkt, size_t *answer_len,
}
/* store the location of the rdlen */
rdlen_ptr_query = walk_query + 6;
rdlen_ptr_response = walk_response + 6;
/* skip past the OPT record to get to the option */
@@ -1866,19 +1868,18 @@ adjust_packet(struct entry* match, uint8_t** answer_pkt, size_t *answer_len,
} else if (sldns_read_uint16(walk_query+2) == 24) {
/* we fake verification of the cookie and send
* it back like it's still valid. We renew the cookie
* if this desired*/
* if this desired */
if (match->server_cookie_renew) {
/* copy the cookie from the response but add a
* different cookie (by reshuffeling server cookie) */
memcpy(rdlen_ptr_response, rdlen_ptr_query, 12);
memcpy(walk_response+12, rdlen_ptr_query+12+8, 8);
memcpy(walk_response+12+8, rdlen_ptr_query+12, 8);
memcpy(walk_response, walk_query, 12);
memcpy(walk_response+12, walk_query+12+8, 8);
memcpy(walk_response+12+8, walk_query+12, 8);
} else {
memcpy(rdlen_ptr_response, rdlen_ptr_query, 28);
memcpy(walk_response, walk_query, 28);
}
} else {
log_err("testbound: the incoming EDNS cookie has the wrong length");
}
} else {
log_err("testbound: an error has occured while parsing the EDNS cookie");