Skip to content

Commit

Permalink
detect: inspect all packets in multi-layer tunneling
Browse files Browse the repository at this point in the history
When the decoders encounter multiple layers of tunneling, multiple tunnel
packets are created. These are then stored in ThreadVars::decode_pq, where
they are processed after the current thread "slot" is done. However, due
to a logic error, the tunnel packets after the first, where not called
for the correct position in the packet pipeline. This would lead to these
packets not going through the FlowWorker module, so skipping everything
from flow tracking, detection and logging.

This would only happen for single and workers, due to how the pipelines
are constructed.

The "slot" holding the decoder, would contain 2 packets in
ThreadVars::decode_pq. Then it would call the pipeline on the first
packet with the next slot of the pipeline through a indirect call to
TmThreadsSlotVarRun(), so it would be called for the FlowWorker.
However when that first (the most inner) packet was done, the call
to TmThreadsSlotVarRun() would again service the ThreadVars::decode_pq
and process it, again moving the slot pointer forward, so past the
FlowWorker.

This patch addresses the issue by making sure only a "decode" thread
slot will service the ThreadVars::decode_pq, thus never moving the
slot past the FlowWorker.

Bug: OISF#6402.
(cherry picked from commit 15947f2)
  • Loading branch information
victorjulien committed Oct 17, 2023
1 parent 55f408e commit 3ad50fc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
9 changes: 6 additions & 3 deletions src/tm-threads.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,11 @@ TmEcode TmThreadsSlotVarRun(ThreadVars *tv, Packet *p, TmSlot *slot)
TmThreadsSlotProcessPktFail(tv, s, NULL);
return TM_ECODE_FAILED;
}

if (TmThreadsProcessDecodePseudoPackets(tv, &tv->decode_pq, s->slot_next) != TM_ECODE_OK) {
return TM_ECODE_FAILED;
if (s->tm_flags & TM_FLAG_DECODE_TM) {
if (TmThreadsProcessDecodePseudoPackets(tv, &tv->decode_pq, s->slot_next) !=
TM_ECODE_OK) {
return TM_ECODE_FAILED;
}
}
}

Expand Down Expand Up @@ -683,6 +685,7 @@ void TmSlotSetFuncAppend(ThreadVars *tv, TmModule *tm, const void *data)
/* we don't have to check for the return value "-1". We wouldn't have
* received a TM as arg, if it didn't exist */
slot->tm_id = TmModuleGetIDForTM(tm);
slot->tm_flags |= tm->flags;

tv->tmm_flags |= tm->flags;
tv->cap_flags |= tm->cap_flags;
Expand Down
8 changes: 6 additions & 2 deletions src/tm-threads.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,18 @@ typedef struct TmSlot_ {

SC_ATOMIC_DECLARE(void *, slot_data);

/** copy of the TmModule::flags */
uint8_t tm_flags;

/* store the thread module id */
int tm_id;

TmEcode (*SlotThreadInit)(ThreadVars *, const void *, void **);
void (*SlotThreadExitPrintStats)(ThreadVars *, void *);
TmEcode (*SlotThreadDeinit)(ThreadVars *, void *);

/* data storage */
const void *slot_initdata;
/* store the thread module id */
int tm_id;

} TmSlot;

Expand Down

0 comments on commit 3ad50fc

Please sign in to comment.