From: Eric Leblond <eric@regit.org>
Date: Mon, 20 Jan 2014 09:41:28 +0000 (+0100)
Subject: util-device: use safe tailq foreach
X-Git-Tag: suricata-2.0rc1~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F784%2Fhead;p=thirdparty%2Fsuricata.git

util-device: use safe tailq foreach

The loop is freeing elements so we need to use the safe version
of TIALQ_FOREACH.

This fixes a valgrind error:

 Thread 1 Suricata-Main:
 Invalid read of size 8
    at 0x8E129C: LiveDeviceListClean (util-device.c:167)
    by 0x89B742: main (suricata.c:2284)
  Address 0x8382988 is 24 bytes inside a block of size 40 free'd
    at 0x4C2A70C: free (vg_replace_malloc.c:468)
    by 0x8E1297: LiveDeviceListClean (util-device.c:179)
    by 0x89B742: main (suricata.c:2284)
---

diff --git a/src/util-device.c b/src/util-device.c
index 35d3aef4dc..19db88cbcd 100644
--- a/src/util-device.c
+++ b/src/util-device.c
@@ -162,9 +162,9 @@ int LiveBuildDeviceList(char * runmode)
 int LiveDeviceListClean()
 {
     SCEnter();
-    LiveDevice *pd;
+    LiveDevice *pd, *tpd;
 
-    TAILQ_FOREACH(pd, &live_devices, next) {
+    TAILQ_FOREACH_SAFE(pd, &live_devices, next, tpd) {
         SCLogNotice("Stats for '%s':  pkts: %u, drop: %u (%.2f%%), invalid chksum: %u",
                     pd->dev,
                     SC_ATOMIC_GET(pd->pkts),