]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
af-packet: PacketSetData can't fail; remove check
authorVictor Julien <victor@inliniac.net>
Thu, 4 Nov 2021 06:52:59 +0000 (07:52 +0100)
committerVictor Julien <victor@inliniac.net>
Thu, 11 Nov 2021 14:55:49 +0000 (15:55 +0100)
PacketSetData() can't fail unless the input pointer is NULL, which is
impossible from the af-packet paths calling it. Remove error check to
avoid possible branching.

src/source-af-packet.c

index e7c645c8b373f25a24ec310127332fdc809f5393..e6a214bfc107fff6a2ee8ad0f7b3e554ef18dba3 100644 (file)
@@ -949,9 +949,7 @@ static bool AFPReadFromRingSetupPacket(
         p->vlan_idx = 1;
     }
 
-    if (PacketSetData(p, (unsigned char *)h.raw + h.h2->tp_mac, h.h2->tp_snaplen) == -1) {
-        return false;
-    }
+    (void)PacketSetData(p, (unsigned char *)h.raw + h.h2->tp_mac, h.h2->tp_snaplen);
 
     p->afp_v.relptr = h.raw;
     p->ReleasePacket = AFPReleasePacket;
@@ -1122,10 +1120,8 @@ static inline int AFPParsePacketV3(AFPThreadVars *ptv, struct tpacket_block_desc
         p->vlan_idx = 1;
     }
 
-    if (PacketSetData(p, (unsigned char *)ppd + ppd->tp_mac, ppd->tp_snaplen) == -1) {
-        TmqhOutputPacketpool(ptv->tv, p);
-        SCReturnInt(AFP_SURI_FAILURE);
-    }
+    (void)PacketSetData(p, (unsigned char *)ppd + ppd->tp_mac, ppd->tp_snaplen);
+
     p->afp_v.relptr = ppd;
     p->ReleasePacket = AFPReleasePacketV3;
     p->afp_v.mpeer = ptv->mpeer;