From 05d7400563e23bffd4b1226ffe9d93eb8fa7d601 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Mon, 29 Jun 2020 21:51:46 +0200 Subject: [PATCH] Fixed heap overflow in tls esni extraction triggered by manipulated packets. Signed-off-by: Toni Uhlig --- src/lib/protocols/tls.c | 3 ++- tests/pcap/tls-esni-fuzzed.pcap | Bin 0 -> 2382 bytes tests/result/tls-esni-fuzzed.pcap.out | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/pcap/tls-esni-fuzzed.pcap create mode 100644 tests/result/tls-esni-fuzzed.pcap.out diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index 007931e19..830232554 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -1298,7 +1298,8 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct, e_sni_len = ntohs(*((u_int16_t*)&packet->payload[e_offset])); e_offset += 2; - if((e_offset+e_sni_len-extension_len-initial_offset) >= 0) { + if((e_offset+e_sni_len-extension_len-initial_offset) >= 0 && + e_offset+e_sni_len < packet->payload_packet_len) { #ifdef DEBUG_ENCRYPTED_SNI printf("Client SSL [Encrypted Server Name len: %u]\n", e_sni_len); #endif diff --git a/tests/pcap/tls-esni-fuzzed.pcap b/tests/pcap/tls-esni-fuzzed.pcap new file mode 100644 index 0000000000000000000000000000000000000000..ec8de8aba83fe8b68e5d977f3c4fa9d0a7af7600 GIT binary patch literal 2382 zcmc)Jc{tQt9{}+4o2{`n3_@Wr_H8UzSt@UYiI9{l29;&-TJI!`sbn{H3U7sEUvpi9 zWM)W|QC?nKDNC-_k<@e(;tuzZ_ql)dzW1Mdp6C2=zUMjL^ZlOZd`9p6d=mx`;J*U_ zApYXe)R5=W02;vHV0&V)`pYJf>U;Ns;0I`M7{GV{SO5!D`YU!dBuw5NceH03>O60m zJF%GsmvoZGf!p!`NWmdkKLlX+;P5>5kg2_mTR>9y(l1IHFP@s%r@THsvT}p7X4OUz z`MeLe*bvKr5zB;fV9OQ#A4cjI^gC|y`k3yjioSd7-5int9t&aNSQuN2tv6URSk2aE z6WD@m0XCK`0Sti&&;vgJLH=bY!7czcp{+IqfhZ6La{Pcakl{xlAOv9ixH7*(%+?-^ zY=90R+?zHL@g zOiCdJ^Jat%()WAi3t_Im(^Rt@|f1-iU&Nb5;qQvb&fXS*p*8i)K%HI77bN{=liqKMsJ-wf5l@)Y z&DD($Q;Uj0<}nO{P!> z@Lg@tCN8e&ZSUV9;@@Fc)KOLWzjUcN#U@TDihNa9H}}~8sQV?x?M&av^9Q#@sFuUt zZc=0JuMSrX*L52GIyq~kf!aBl;aPl-N%%+)B`cN*JeB{EY$a=^5?L=(zvt+5CXLQ^ zJ}0^1%{w3~@Rvm(A2gJcNUZ~P7VbW)PgsvcOdiH#>k=#~s4>^GH0FH&7ZDu*IGDV) zEBxG;e7h9KC2mZHYT42Qf2L2DT!~ctc;3=)I{T%EeKp!IRqTv)BG*2+ulsaOEc3GZ zZgzrNK+G*>pvA%m!6EwDc@2H4s6(QUj#FK7_DdOBrA~>vfyuM``Fo=;z9LuP9*%}@ z)ZN@m`c3|b$?d$e98574UzL|&d-eHnP{^yPg~$niDY+;e>Tesp$4gJ;?$5})wzOXG zdf}grvUOn_MRyD0isiD?yvzvsJeJD47<`T6)V;YK<;v}yMhZ&VJE>jCQKAF}_fy_R z``YF^m;RDc|ATY2!&D_XyGAV+22j_az2Q;-V=h{BXJPee#Vmq55{#wYte; zkjhDJ7PVu-Zna6}8P8bL^_+LC`9e=miL^<;A0lk{A{rrq?~3T7Y>SYxx!>~!>J(BH zH6n(TI&X;(@%)nr0bMWO^*1D^tGg?!D7|lkTOyj~_ZcVM!IJu2c~x5W zcttBbu;3=QgQ8Yst97`n(v-gxo8^^)&0KBTdb=PC#zT-Yn4!j zEq(Gs3=5{DxhjIL|AywI#;t4jgER@(>_Jf^1YZCr|t68k6g;jy^_!TL&Wcf C0gLef literal 0 HcmV?d00001 diff --git a/tests/result/tls-esni-fuzzed.pcap.out b/tests/result/tls-esni-fuzzed.pcap.out new file mode 100644 index 000000000..ddf36dd68 --- /dev/null +++ b/tests/result/tls-esni-fuzzed.pcap.out @@ -0,0 +1,10 @@ +Cloudflare 3 2310 3 + +JA3 Host Stats: + IP Address # JA3C + 1 192.168.1.12 1 + + + 1 TCP 192.168.1.12:49886 -> 104.27.129.77:443 [proto: 91.220/TLS.Cloudflare][cat: Web/5][1 pkts/770 bytes -> 0 pkts/0 bytes][Goodput ratio: 93/0][< 1 sec][ALPN: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2;TLSv1.1;TLSv1][TLSv1.2][JA3C: e5ef852e686954ba9fe060fbfa881e15][ESNI: 9624CB3C4E230827F78CF5BF640D22DEA33FCC598EA6A32D939905586FBE997B9E68661F8956D4893072E19DE24CD1FB88A9F71FC4CC01BAB5C914FDF96A647D671B5E89859BAEEAB122218688496DF4DF0C328C3D5F940B109CEB2A2743D5CBE3594288A229B8C7E2F88303E3FE1A26A89E5001F2BD936890FEF78F06E05ECC063A68BDB8C18DFAC114CF1FECDB8BE1FC2FEECB2315D27998D682B129FD1E3EB5D7985DCBDC452A1082CCC038E0BF69570FEFAC6BC6FB951F89B6792CADA76403C02CEB5DCE1CE6EDDD16D5F7FB6B85D2B92485448DE0088E421E83F1E28B267FBE3B59AE0496FB845213C271D4C5AC5E9E7E5F6A3072445307FCCEB7306710459991C40CC4DC1FC325154C7974DD780371397805456A19AE23EE88475C1DF07697B666][ESNI Cipher: TLS_AES_128_GCM_SHA256][PLAIN TEXT (http/1.1)][Plen Bins: 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 2 TCP 192.168.1.12:49887 -> 104.16.125.175:443 [proto: 91.220/TLS.Cloudflare][cat: Web/5][1 pkts/770 bytes -> 0 pkts/0 bytes][Goodput ratio: 93/0][< 1 sec][ALPN: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2;TLSv1.1;TLSv1][TLSv1.2][JA3C: e5ef852e686954ba9fe060fbfa881e15][ESNI: B900004E39E84B98F5AE87B0A020EC49FED86F2B488B6AB28BDE9F957621F2774366DE90E65C4CA808668911624685EC4C6DC6C161A97CBE82281BC08427697AA3BE6A40E5F00ACF8B63E329317B0E4E85642D50AB8790E6197DA62D9F5B3239DCC59437797FE768A520C9D471FEABA1375DF61E4A39B09363CB109E7B24A793844896DDD16B6EE7DBE576D767161D782D7BF6FEC453A05A923D8D8E9BEFFC97E8E56C4F1AAB70FE99BC97819E1D908A5F3B3094F4BF25EB7A24A94FDBC3E107A423B8BB341F22900F7BBD87780E30B6ECF393FEB8FBFFEB54C79FA0673FE1AAD17B221D4BFF6450AA0CD4AF513066B66080B602147F3ACB7145A436C5689DA20BACB8BF9BABD851012556EC8F7BB9D74BFAAF25DCF4362A5775607C3CE5C2C29F183969][ESNI Cipher: TLS_AES_128_GCM_SHA256][PLAIN TEXT (http/1.1)][Plen Bins: 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 3 TCP 192.168.1.12:49897 -> 104.22.71.197:443 [proto: 91.220/TLS.Cloudflare][cat: Web/5][1 pkts/770 bytes -> 0 pkts/0 bytes][Goodput ratio: 93/0][< 1 sec][ALPN: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2;TLSv1.1;TLSv1][TLSv1.2][JA3C: e5ef852e686954ba9fe060fbfa881e15][PLAIN TEXT (http/1.1)][Plen Bins: 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]