Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fuzz protodetect sip 7435 v1 #12232

Closed
wants to merge 3 commits into from
Closed

Fuzz protodetect sip 7435 v1 #12232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
647f92d
fuzz: better init for protocol detection
catenacyber Oct 29, 2024
029bf34
fuzz: simplify target for protocol detection
catenacyber Oct 29, 2024
ebbdf2f
sip: remove UPDATE method for detection
catenacyber Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion rust/src/sip/sip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,6 @@ fn register_pattern_probe(proto: u8) -> i8 {
"ACK\0",
"BYE\0",
"CANCEL\0",
"UPDATE\0",
"REFER\0",
"PRACK\0",
"SUBSCRIBE\0",
Expand Down Expand Up @@ -526,6 +525,16 @@ fn register_pattern_probe(proto: u8) -> i8 {
0,
core::Direction::ToClient as u8,
);
if proto == core::IPPROTO_UDP {
r |= AppLayerProtoDetectPMRegisterPatternCS(
proto,
ALPROTO_SIP,
"UPDATE\0".as_ptr() as *const std::os::raw::c_char,
"UPDATE".len() as u16,
0,
core::Direction::ToServer as u8,
);
}
}

if r == 0 {
Expand Down
33 changes: 3 additions & 30 deletions src/tests/fuzz/fuzz_applayerprotodetectgetproto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "suricata.h"
#include "app-layer-detect-proto.h"
#include "flow-util.h"
#include "app-layer-parser.h"
#include "app-layer.h"
#include "util-unittest-helper.h"
#include "conf-yaml-loader.h"

Expand All @@ -30,8 +30,6 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
Flow *f;
TcpSession ssn;
bool reverse;
AppProto alproto;
AppProto alproto2;

if (alpd_tctx == NULL) {
//global init
Expand All @@ -43,9 +41,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
MpmTableSetup();
SpmTableSetup();
EngineModeSetIDS();
AppLayerProtoDetectSetup();
AppLayerParserSetup();
AppLayerParserRegisterProtocolParsers();
AppLayerSetup();
alpd_tctx = AppLayerProtoDetectGetCtxThread();
SC_ATOMIC_SET(engine_stage, SURICATA_RUNTIME);
}
Expand All @@ -68,31 +64,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
if (data[0] & STREAM_TOSERVER) {
flags = STREAM_TOSERVER;
}
alproto = AppLayerProtoDetectGetProto(
AppLayerProtoDetectGetProto(
alpd_tctx, f, data + HEADER_LEN, size - HEADER_LEN, f->proto, flags, &reverse);
if (alproto != ALPROTO_UNKNOWN && alproto != ALPROTO_FAILED && f->proto == IPPROTO_TCP) {
/* If we find a valid protocol at the start of a stream :
* check that with smaller input
* we find the same protocol or ALPROTO_UNKNOWN.
* Otherwise, we have evasion with TCP splitting
*/
for (size_t i = 0; i < size-HEADER_LEN && i < PROTO_DETECT_MAX_LEN; i++) {
// reset detection at each try cf probing_parser_toserver_alproto_masks
AppLayerProtoDetectReset(f);
alproto2 = AppLayerProtoDetectGetProto(
alpd_tctx, f, data + HEADER_LEN, i, f->proto, flags, &reverse);
if (alproto2 != ALPROTO_UNKNOWN && alproto2 != alproto) {
printf("Failed with input length %" PRIuMAX " versus %" PRIuMAX
", found %s instead of %s\n",
(uintmax_t)i, (uintmax_t)size - HEADER_LEN, AppProtoToString(alproto2),
AppProtoToString(alproto));
printf("Assertion failure: %s-%s\n", AppProtoToString(alproto2),
AppProtoToString(alproto));
fflush(stdout);
abort();
}
}
}
FlowFree(f);

return 0;
Expand Down
Loading