From: Jeff Lucovsky <jlucovsky@oisf.net>
Date: Fri, 17 Feb 2023 14:18:24 +0000 (-0500)
Subject: pfring: Packet structure for ts fix
X-Git-Tag: suricata-6.0.12~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8810%2Fhead;p=thirdparty%2Fsuricata.git

pfring: Packet structure for ts fix

Issue: 5818

This commit addresses the issue with using the address of a packed
member of a structure. The pfring timeval is within a packed structure.

(cherry picked from commit 2d28c09ea1fe857cfada2c5a53e67af0380654f3)
---

diff --git a/src/source-pfring.c b/src/source-pfring.c
index ece550bd85..630872062a 100644
--- a/src/source-pfring.c
+++ b/src/source-pfring.c
@@ -229,7 +229,9 @@ static inline void PfringProcessPacket(void *user, struct pfring_pkthdr *h, Pack
 
     /* PF_RING may fail to set timestamp */
     if (h->ts.tv_sec == 0) {
-        gettimeofday((struct timeval *)&h->ts, NULL);
+        struct timeval tmp_ts;
+        gettimeofday(&tmp_ts, NULL);
+        h->ts = tmp_ts;
     }
 
     p->ts.tv_sec = h->ts.tv_sec;