unbound/backport-pre-CVE-2024-33655-Fix-possibly-unaligned-memory-access-in-parse_edns_options_from_query.patch
2024-05-17 02:26:08 +00:00

23 lines
833 B
Diff

From 2b1028bdad6da4d42f0571d0182322c3554e0bcc Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 16 Aug 2023 10:06:06 +0200
Subject: [PATCH] - Fix possibly unaligned memory access.
---
util/data/msgparse.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/data/msgparse.c b/util/data/msgparse.c
index 8cef37a17..40189d613 100644
--- a/util/data/msgparse.c
+++ b/util/data/msgparse.c
@@ -1049,7 +1049,7 @@ parse_edns_options_from_query(uint8_t* rdata_ptr, size_t rdata_len,
/* Copy client cookie, version and timestamp for
* validation and creation purposes.
*/
- memcpy(server_cookie, rdata_ptr, 16);
+ memmove(server_cookie, rdata_ptr, 16);
/* In the "if, if else" block below, we validate a
* RFC9018 cookie. If it doesn't match the recipe, or