From a9547da138871ff019aaa51092544d9ca005dffd Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Tue, 3 Nov 2020 11:35:52 +0100 Subject: [PATCH] QUIC: fix dissection of Initial packets coalesced with 0-RTT one (#1044) * QUIC: fix dissection of Initial packets coalesced with 0-RTT one * QUIC: fix a memory leak --- src/lib/protocols/quic.c | 13 +++++++++++-- tests/pcap/quic_0RTT.pcap | Bin 0 -> 2644 bytes tests/result/quic_0RTT.pcap.out | 8 ++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 tests/pcap/quic_0RTT.pcap create mode 100644 tests/result/quic_0RTT.pcap.out diff --git a/src/lib/protocols/quic.c b/src/lib/protocols/quic.c index 924b90b8a..88c535cd0 100644 --- a/src/lib/protocols/quic.c +++ b/src/lib/protocols/quic.c @@ -856,13 +856,22 @@ static uint8_t *decrypt_initial_packet(struct ndpi_detection_module_struct *ndpi pn_offset += quic_len(&packet->payload[pn_offset], &token_length); pn_offset += token_length; /* Checks: quic_len reads 8 bytes, at most; quic_decrypt_header reads other 20 bytes */ - if(pn_offset + 8 + (4 + 16) >= packet->payload_packet_len) + if(pn_offset + 8 + (4 + 16) >= packet->payload_packet_len) { + quic_cipher_reset(&cipher); return NULL; + } pn_offset += quic_len(&packet->payload[pn_offset], &payload_length); NDPI_LOG_DBG2(ndpi_struct, "pn_offset %d token_length %d payload_length %d\n", pn_offset, token_length, payload_length); + if (pn_offset + payload_length > packet->payload_packet_len) { + NDPI_LOG_DBG(ndpi_struct, "Too short %d %d\n", pn_offset + payload_length, + packet->payload_packet_len); + quic_cipher_reset(&cipher); + return NULL; + } + if(!quic_decrypt_header(&packet->payload[0], pn_offset, cipher.hp_cipher, GCRY_CIPHER_AES128, &first_byte, &pkn32)) { quic_cipher_reset(&cipher); @@ -875,7 +884,7 @@ static uint8_t *decrypt_initial_packet(struct ndpi_detection_module_struct *ndpi packet_number = pkn32; offset = pn_offset + pkn_len; - quic_decrypt_message(&cipher, &packet->payload[0], packet->payload_packet_len, + quic_decrypt_message(&cipher, &packet->payload[0], pn_offset + payload_length, offset, first_byte, pkn_len, packet_number, &decryption); quic_cipher_reset(&cipher); diff --git a/tests/pcap/quic_0RTT.pcap b/tests/pcap/quic_0RTT.pcap new file mode 100644 index 0000000000000000000000000000000000000000..7ade886547d1a9a22beb695c049d3a89bd1677c3 GIT binary patch literal 2644 zcma)+bxa$G7spF+h834>I1I{Q42BIU6w0ts9EQta9CqlC0Ru+y3EJUOhRfk@Eii1j z4T|e1I;?EKNpiXS<9^BSo4n*nUhQ5ai$4Km0!%|1AO>7-U8?OSFr=0RV23DL|7tuYC6#=-eebl0HJ|6H;8&UbPQud_l##QMm zKnVlI*7s~C#k)p?)_t-R7t-8s#=>NA<7C8uum_NQNI?ADkHVZLO*uq}f2}=9sds=g)`&EP zX9=6w+!)MT*l$E|l>PJjl@1%`U1jS~W|6Ho{#BLJ1p5U2Wrklm-y2%5{9HbXes^fn zBvA@9CuU*pttqVag#m)|2`3Nn3V@*_WMA<)SoN`?$zgY2_qwj66V?UtePwwWzjRX4JXIgAM;{t%Q))m!^V}-|Go$1LNrely&et2 zO-^dr+$~2(L|Y|af>}AmM!oN5VUCcwHnoL-4}o1>x_@> z{ld&wQGs4m8`Hs5365$9j)a)z1FFwlhMul)3kpmzCabu2%4~Bup=`uL0j-cdKuF+H z@%{4Je0RnO>d>jmY}zTz8>wEygl*-m%5kF4i9aCNml@MW^TOeov<0klkP^C&ne#X_ zzje=oaCahc<;u=l-sPy*`GuzQHO)upmY!h#;IU#!{8Pns2XvA<^3bMOF(a#1ZrUu4 zYKv%fiuu62i6J&ZY0>Rg7s-KU^tPv#LZNdILzqcpi{aP=sebMO&Ntbuw!TcQC{Iz2 z8(ODtDFjbE5_uu1fB!N%px!1=*6>)gEB|Q$rB-QP^fDcA$!*yUaja zGzz4!L!#{!7j;ojn%lyq75y|5>q(U0j-;y$qhrzwTuRS)fi4ONR%W@QRKsJO4V^in zIi|zf<7Mtt07S{<36g%~b-*aix&;NySH`rV&53GJsj9Yk0L)vP{5 z@T7A4>##d2`G1>;V+_)?3KkqT!36&Lb*;;(YP9K248<+6oe=NEer3pKkwl#?e%guJ z6Ia&mEf;I)EH|Y0NQIEtyc}r|oorIe66xKw^^=fj@4bYm%dRa{unm$C3715lA|R+A zInl4U?@hbvG1M3#qDc4>$Y0l$w$1;-^||USUB6_=-$zwg3_Fk`*D{`&O#3Gt#hCs# z9o1w1A3B1}aNs}b82Z;Y{0&7irYc&}Kz=_*;0O4pE&Jz`+cObVp@Amu ztTH9MB_Iiw6$hsrayaObd!iPTwSF-?Qi*`or+Pam>T3|lxTNSo%n|xi+bBi zuE6~PgE`>&n#Eno?NGFn-L=E7pFBPgc`94mM)3DaBD7^l`0qyGeHaR)8pMb5^JKEZ z229|eK1~k6{fFNt(0ol1Qp1&)Ng)6YmWa3vGjB|D^kP=mp6X68`n zD0cOpws}|A&7DOd$~!E)cBOA@a;^UbRO?tJxHluDsf~1M#bfW%FXuxkxq)s> z(67)B;q#E1)nWc8wqzGp-tnlkufDE3;QG{>ZKLec^Msa^i93^PdPaZ}GoVqRM5Mjw zFzX#3a%%YXGVm^3qU_mg1h2t#)Y~^+uw;W~)K|OrEK04rR&P7y4;bxCo`fX#(4$5k z6vqYHD~^JVGzEyLmQnMcN$S>&f?;L&&R}@Fb2+ z5`2u!nQ-i3fU8S|4&Kc4;59aeduL)l5wY< zM;@XOz{kL?>{qg{0weIacXE;!P0|YB&~pwDY}A7?a(B{JbRsTx8hm7W(Upe3dcpOG z_Q8FFRwV@0YlOZSI6K=TJ^Yv?pIm#5M6i~R%7Kopu-rl0O=?Bk1DRrZPt|8KG^~Kj z(q&SBOT(BljM}Y5rx7UMKb}ooExdt|oZsfc-LMET3PV(DJZL [::1]:4443 [proto: 188/QUIC][cat: Web/5][1 pkts/1294 bytes <-> 1 pkts/1294 bytes][Goodput ratio: 95/95][0.00 sec][ALPN: h3-32][TLS Supported Versions: TLSv1.3;TLSv1.3 (draft);TLSv1.3 (draft);TLSv1.3 (draft)][TLSv1.3][Client: abcd][JA3C: a7b629a5bd67bfc25e2c78b3daa4c12f][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0]