From 23594f036536468072198a57c59b6e9d63caf6ce Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Wed, 17 Jun 2020 23:00:20 +0200 Subject: [PATCH] Fixed stack overflow caused by missing length check Signed-off-by: Toni Uhlig --- src/lib/protocols/tls.c | 10 +++++++++- tests/pcap/tls-rdn-extract.pcap | Bin 0 -> 7325 bytes tests/result/tls-rdn-extract.pcap.out | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 tests/pcap/tls-rdn-extract.pcap create mode 100644 tests/result/tls-rdn-extract.pcap.out diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index 816b23a50..c8a0e43b2 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -196,6 +196,14 @@ static int extractRDNSequence(struct ndpi_packet_struct *packet, char *str; u_int len, j; + if (*rdnSeqBuf_offset >= rdnSeqBuf_len) { +#ifdef DEBUG_TLS + printf("[TLS] %s() [buffer capacity reached][%u]\n", + __FUNCTION__, rdnSeqBuf_len); +#endif + return -1; + } + // packet is truncated... further inspection is not needed if((offset+4+str_len) >= packet->payload_packet_len) return(-1); @@ -235,7 +243,7 @@ static void processCertificateElements(struct ndpi_detection_module_struct *ndpi u_int16_t p_offset, u_int16_t certificate_len) { struct ndpi_packet_struct *packet = &flow->packet; u_int num_found = 0, i; - char buffer[64] = { '\0' }, rdnSeqBuf[1024] = { '\0' }; + char buffer[64] = { '\0' }, rdnSeqBuf[2048] = { '\0' }; u_int rdn_len = 0; #ifdef DEBUG_TLS diff --git a/tests/pcap/tls-rdn-extract.pcap b/tests/pcap/tls-rdn-extract.pcap new file mode 100644 index 0000000000000000000000000000000000000000..6f93e145073725001118f2d4a1bb0f655a1872f7 GIT binary patch literal 7325 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 literal 0 HcmV?d00001 diff --git a/tests/result/tls-rdn-extract.pcap.out b/tests/result/tls-rdn-extract.pcap.out new file mode 100644 index 000000000..9bfdef48b --- /dev/null +++ b/tests/result/tls-rdn-extract.pcap.out @@ -0,0 +1,7 @@ +Microsoft 6 7205 1 + +JA3 Host Stats: + IP Address # JA3C + + + 1 TCP 10.0.0.1:31337 <-> 213.199.149.251:443 [proto: 91.212/TLS.Microsoft][cat: Web/5][1 pkts/181 bytes <-> 5 pkts/7024 bytes][Goodput ratio: 70/96][< 1 sec][bytes ratio: -0.950 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 0/0 0/0 0/0][Pkt Len c2s/s2c min/avg/max/stddev: 181/968 181/1405 181/1514 0/218][Risk: ** Obsolete TLS version (< 1.1) **** Weak TLS cipher **** TLS Expired Certificate **][TLSv1][Client: ads1.msads.net][ServerNames: *.vo.msecnd.net,*.officeapps.live.com,*.msads.net,*.ads2.msads.net,*.stc.s-msn.com,cdn.dc2files.*.livefilestore-int.com,cdn.*.livefilestore.com,*.marketplace.windowsmobile.com,*.marketplace.windowsmobile-int.com,*.marketplace.windowsmobile-perf.com,*.stj.s-msn.com,ajax.microsoft.com,*.microsoft-sbs-domains.com,*.live.net,*.msn.com,*.msn-int.com,*.f1ds.shared.live-int.com,*.f1ds.wlxrs-int.com,*.shared.live-int.com,*.shared.live.com,*.microsoft.com,*.live.com,*.live-int.com,*.wlxrs.com,*.wlxrs-int.com,*.st.s-msn.com,*.stb.s-msn.com,images.moxy.windowsphone-int.com,*.wlxrsu-int.com,images.partner.windowsphone-int.com,images.partner.windowsphone.com,*.jp.msn.com,*.c3scs.jp.msn.com,*.aspnetcdn.com,*.hotmail.com,*.partner-df.windowsphone-int.com,*.s-msn.com,*.live-int.net,*.windowsphone-int.com,*.windowsphone.com,*.partner-pc.windowsphone-int.com,*.manage.microsoft.com][JA3S: 18e962e106761869a61045bed0e81c2c (WEAK)][Issuer: CN=Microsoft Secure Server Authority][Subject: C=US, L=Redmond, O=Microsoft, OU=GFS, CN=*.officeapps.live.com, CN=*.msads.net, CN=*.ads2.msads.net, CN=*.stc.s-msn.com, CN=cdn.dc2files.*.livefilestore-int.com, CN=cdn.*.livefilestore.com, CN=*.marketplace.windowsmobile.com, CN=*.marketplace.windowsmobile-int.com, CN=*.marketplace.windowsmobile-perf.com, CN=*.stj.s-msn.com, CN=ajax.microsoft.com, CN=*.microsoft-sbs-domains.com, CN=*.live.net, CN=*.msn.com, CN=*.msn-int.com, CN=*.f1ds.shared.live-int.com, CN=*.f1ds.wlxrs-int.com, CN=*.shared.live-int.com, CN=*.shared.live.com, CN=*.microsoft.com, CN=*.live.com, CN=*.live-int.com, CN=*.wlxrs.com, CN=*.wlxrs-int.com, CN=*.st.s-msn.com, CN=*.stb.s-msn.com, CN=images.moxy.windowsphone-int.com, CN=*.wlxrsu-int.com, CN=images.partner.windowsphone-int.com, CN=images.partner.windowsphone.com, CN=*.jp.msn.com, CN=*.c3scs.jp.msn.com, CN=*.aspnetcdn.com, CN=*.hotmail.com, CN=*.partner-df.windowsphone-int.com, CN=*.s-msn.com, CN=*.live-int.net, CN=*.windowsphone-int.com, CN=*.windowsphone.com, CN=*.partner-pc.windowsphone-int.com, CN=*.manage.microsoft.com, CN=*.vo.msecnd.net][Certificate SHA-1: FF:BF:9A:69:8F:C8:44:FF:89:F2:61:49:A7:D1:9A:98:DE:32:84:3B][Validity: 2011-10-21 16:42:03 - 2013-10-20 16:42:03][Cipher: TLS_RSA_WITH_AES_128_CBC_SHA]