fix msan-findings in libfuzzer and ikev2_pld_notify()

openiked · Dec 5, 2023 · c848d07 · c848d07
1 parent cabc947
commit c848d07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/iked/ikev2_pld.c b/iked/ikev2_pld.c
@@ -1049,8 +1049,8 @@ ikev2_pld_notify(struct iked *env, struct ikev2_payload *pld,
 	struct ikev2_notify	 n;
 	const struct iked_sa	*sa = msg->msg_sa;
 	uint8_t			*buf, md[SHA_DIGEST_LENGTH];
-	uint32_t		 spi32;
-	uint64_t		 spi64;
+	uint32_t		 spi32 = 0;
+	uint64_t		 spi64 = 0;
 	struct iked_spi		*rekey;
 	uint16_t		 type;
 	uint16_t		 signature_hash;

diff --git a/regress/parser-libfuzzer/common.c b/regress/parser-libfuzzer/common.c
@@ -162,6 +162,7 @@ ssize_t
 ikev2_nat_detection(struct iked *env, struct iked_message *msg,
     void *ptr, size_t len, u_int type, int frompeer)
 {
+	bzero(ptr, len);
 	return (0);
 }