From 2809a5cc743432696079d097a12ad6bda4b76c4f Mon Sep 17 00:00:00 2001 From: Vadim Vetrov Date: Sat, 18 Jan 2025 21:08:38 +0300 Subject: [PATCH] Fix Illegal instruction --- src/logging.h | 10 +++++----- src/quic.c | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/logging.h b/src/logging.h index 7aaf982..7fa6112 100644 --- a/src/logging.h +++ b/src/logging.h @@ -21,10 +21,6 @@ #define LOGGING_H #include "config.h" -#define LOG_ERR KERN_ERR -#define LOG_INFO KERN_INFO -#define LOG_WARN KERN_WARNING - /** * Defined in args.c */ @@ -39,6 +35,10 @@ extern int ylgh_ndnl; #define DO_SYSLOG (logging_conf.syslog) #ifdef KERNEL_SPACE +#define LOG_ERR KERN_ERR +#define LOG_INFO KERN_INFO +#define LOG_WARNING KERN_WARNING + #include #include #define printf pr_info @@ -110,7 +110,7 @@ extern int ylgh_ndnl; (log_message(LOG_ERR, msg, ##__VA_ARGS__)) #define lgwarning(msg, ...) \ -(log_message(LOG_WARN, msg, ##__VA_ARGS__)) +(log_message(LOG_WARNING, msg, ##__VA_ARGS__)) #define lginfo(msg, ...) \ diff --git a/src/quic.c b/src/quic.c index 82050d3..d4ac72f 100644 --- a/src/quic.c +++ b/src/quic.c @@ -401,9 +401,10 @@ pl_incr: curptr += fret; curptr_len -= fret; + if (fr_cr.offset <= crypto_message_len && - fr_cr.payload_length <= crypto_message_len && - fr_cr.payload_length <= crypto_message_len + fr_cr.payload_length <= crypto_message_len && + fr_cr.payload_length + fr_cr.offset <= crypto_message_len ) { memcpy(crypto_message + fr_cr.offset, @@ -418,6 +419,7 @@ pl_incr: } out: + lgtrace_addp("crypto message parsed"); *crypto_message_buf = crypto_message; *crypto_message_buf_len = crypto_message_len;