CVE-2024-55626

commit 470795e65ba77cffba3aed850313a5f23c4b278d
Author: Philippe Antoine <pantoine@oisf.net>
Date:   Mon Nov 4 17:09:32 2024 +0100

    suricata/bpf: fix -Wshorten-64-to-32 warning

    Ticket: 7366
    Ticket: 6186
    (cherry picked from commit dd71ef0af222a566e54dfc479dd1951dd17d7ceb)

Gbp-Pq: Name CVE-2024-55626.patch

diff --git a/src/suricata.c b/src/suricata.c
index 3d6faf15c8b660c9c6d3dfbf9736b65d6e8aa901..722a9b3b3e1a47ab7be1a67ecd881c4ecaf729a2 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -458,7 +458,7 @@ static void SetBpfStringFromFile(char *filename)
     char *bpf_filter = NULL;
     char *bpf_comment_tmp = NULL;
     char *bpf_comment_start =  NULL;
-    uint32_t bpf_len = 0;
+    size_t bpf_len = 0;
 #ifdef OS_WIN32
     struct _stat st;
 #else
@@ -481,7 +481,8 @@ static void SetBpfStringFromFile(char *filename)
         SCLogError(SC_ERR_FOPEN, "Failed to stat file %s", filename);
         exit(EXIT_FAILURE);
     }
-    bpf_len = st.st_size + 1;
+    // st.st_size is signed on Windows
+    bpf_len = ((size_t)(st.st_size)) + 1;
 
     // coverity[toctou : FALSE]
     fp = fopen(filename,"r");