From 92d4e50b4855fc714d5b88cb9832fd61853f0390 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 1 Aug 2024 20:29:26 +0200 Subject: [PATCH 1/6] fuzzers: Add LDAP fuzzing LDAP supports both, UDP and TCP as separate analyzers. The corpus is identical, however. Started to hit the TLS analyzer fairly quickly, too. Closes #3860 --- src/fuzzers/CMakeLists.txt | 2 ++ src/fuzzers/corpora/ldap_tcp-corpus.zip | Bin 0 -> 13047 bytes src/fuzzers/corpora/ldap_udp-corpus.zip | Bin 0 -> 13047 bytes 3 files changed, 2 insertions(+) create mode 100644 src/fuzzers/corpora/ldap_tcp-corpus.zip create mode 100644 src/fuzzers/corpora/ldap_udp-corpus.zip diff --git a/src/fuzzers/CMakeLists.txt b/src/fuzzers/CMakeLists.txt index 41a46dc64a..5a4b13f888 100644 --- a/src/fuzzers/CMakeLists.txt +++ b/src/fuzzers/CMakeLists.txt @@ -107,6 +107,8 @@ add_generic_analyzer_fuzz_target(dhcp udp) add_generic_analyzer_fuzz_target(dnp3_tcp) add_generic_analyzer_fuzz_target(dtls udp) add_generic_analyzer_fuzz_target(irc) +add_generic_analyzer_fuzz_target(ldap_udp udp) +add_generic_analyzer_fuzz_target(ldap_tcp tcp) add_generic_analyzer_fuzz_target(modbus) add_generic_analyzer_fuzz_target(mqtt) add_generic_analyzer_fuzz_target(mysql) diff --git a/src/fuzzers/corpora/ldap_tcp-corpus.zip b/src/fuzzers/corpora/ldap_tcp-corpus.zip new file mode 100644 index 0000000000000000000000000000000000000000..e95f0c4b5360a75e72bb526f1d6e582fbf7bd7db GIT binary patch literal 13047 zcmeIYWpEu^vL$?kmUJXb7K23=Gn2*4%*@Qp%w#b$Gc%LL%*@OzSr(1D`@Ju&JNixB z`R4D`iCrh^&&t?YwKLYrTr%Qd;K%>~017ab1ELBW`U3$L1OWI91^`e1z5?_e9I5Or z4XNnpsGLo$Sac1j=%_3VbZw{{^lhk^XlWVgsBQFhZK!R`9TXLy0bs#XWk&y4jxIm| z2>8(l%0F-VuvedT8BKI`bgqo_^i-k&dTjJ`^mVk9kaXiJ&1?Stj{aaT8tbpBj4ym1 z9{&Dd=;*$3vuUh2blD)x1Cg~nVOd{H$dQH=gk+;jLh(>p&^?0};I`u-Y*68H{8M2^j5Q%RXAI@(_T3^;TyUG*9E{PZKShEstyN6Djz& zeE|l)$q_@p^5;ZXhS?lz^3ap)dc(X;;>C%Y3y~pi1`8I8K;lE`p2L(QD1Q4U79@}7 zOa3J>Z$yGtC<02yFjWEkHX9jTWhe)^L<6xrI?o0&%;#E<6g6 zHC7>4j;~k&-&@f*Pk~hC$2W-B&O-F?VmWyfF=W);5IKCXUF~n%={#@WR6=zubb2XB zwejP^@@YXWw0iw`cwN9L#e(+a2q8f7e%cvyg7St6s*e1WIT=z+C0GJ0C*0di@y}5p zl_ihMMQ6YWr-O(}HAThIr=zC&L?c{rlyKUu&4R`p67uV|evv+BuIHA^rD{j|KIo zI7}!9EIOK5GIG!!b?WYRG9|2EA7C4`)<&bX;a|NtQ-ThTO}n+YCoPzc_)56-g&cI2GuEv?-$w=%(OD=Ab zq6=&fz(s(hKn#7~eTMw~$rgtO5DrD^UnMgXFf4|SNYIVwe!xRYD9cACTTKcV(GQUD zDKNE(CMSbd0u`^+2;2Fd!w8{NEaL~pUT9aot2aAkyEUm%13O^ZO}Yk6=nF9euj5B6 z2SLHW)7&LOpGW zx2U5}sB{Jz!4Kib!-bZt@9Yecg@*W>nieh;HAvtZw9l6<7z^_oLaVS12lV#=iu3sF zWKiN=j0hG?OzJ5I*NAl!n$vDSZbmIVQXuVJMDi`xdIX@|e;QTriZ1~6Ob7^r9Dv|) zD)eCKM~+?mW{n+1NOyJ8JyoIkzReU3sTDMn!kNa)TGzYDr=vmNqjdv#Ab5X3H9-zK zZbh^qi{>i?opI8*b2GGN5@JAN6q=2U)QlV!5{kEroEB&uFwuB|{q3O7kktN^+GA?~ z6Nqr@kjrKSJ%q^|sHc?!^5_HU5tj|ZNgy#q*aGP=#gyHVE{2a~S`#i92t6Odh?2JN z1b0uJpR-YDUd-Zf0{yVy#@y(~58r!_TmkRd$k{y^{+g9Z>2A)6cL3MVQLrPy{7XQB zf^kkDJ7+-IMTr|~RpoR+ErFn2v_L51aR|71b;M&MxR|6QKZbjE2S-&@^z}zGXPH;+ znByi%M~9K5p4MqQ4Re~~vfHYW>fpuL%i89x#4b_OY#u~LOh2dYE_J%PtLgCm?^N?M zN%-fD3-VZGOXdUc21X7GM9-UT=~O|R+QXebWjpcnS`TS#g|C~I2hLnIt9@db3<(F8 z4Z63-ovx>s)nzDX$0dXF>vdp@R_gNWsR@coO=hRR4Q|BR>U|pq)tWrG{R{BnpMMT6 zgFBbbGE{jlvnWitljuite&U!}N_~}B;dH!tKouo8mq$Z$5((a0%jY@obMD+x_TD<( z$gMG4b6;>`i}fD(CDKP{Idi^Kn&wew`6B~b=h`Kvbjj8{rtDbQnTlC+1+`f$B)%)s z>fVwb`{cmsJIbC<;D)*O9&{KVO$9pYGF{eqm?o0?j0PS>wS%3iYtn8NrlS1}qG(wr zgB5L`A7>KAIXhWmVLcl{VWp?aa_iX@J~xWBUbsHgj8Z&9R||n&%86}xmy_fBw#CMV zFFip zFP!(q9wYXwv&NSo0_}duO&vaK`jY}5eg-C#)4|C&OX>sE^d=6RdCnfT7lEqsJ)Mr2 zzB#jBw^<6C*j?SW=uFry{X*yTxQF5rsLK$!4v`l!Y!YL;X0 z?3TmtY_CtTx`C_TWz`AY?``fIln%2+DU!4@l9gJ_i;b^t1}Df8hDz8PdpxSP18ZO6 z&ad$qo?|x?^?mB&nwYi*5QA8T2kTpxrSiC<`P3=|jZo4!(Gj$?| zp7i1%vf}Q=A!O?xi_mR?HTZ_jZf0KLv8=64R;?au75jyIkNKs#(qOQuqCcfjIpPZ= zYg?Om9DBvjQ!nhvLxmYn`sc(;b>*TYE$5atj{3Vp4duecmhM}Aki$lo&)#jVWNa{YCEZj1?5cdF9DnY^SKN50Dgb>zWh%3}21YlhZ6wX{@&Ie$l*ckG1nP4cc## zL957|bv$;3z1t*0DweVzo!km6C>F2!v^Lz#HJ?PQ6{X?UC&Xid5MtRA(O z-2$IqiJz^%F07}$n%O;d2pZGKuVp@MG-=wLJal*jPl>Z6^(s%mVg@!w z+=rQKf0>X*txVq&hiyNwA{6DZ z&Da*LAAW@|2Yxc&ie1xUv&qbLeDsoQ2EVmw%Vd-)9zVUaEVA}m;9Jb8xogz~+7?vrD_UCyjP~PF*JEVM%EdG7qB1AOYFu4s7OXI>y>%X%S9v-(AxZyEnaA$hvhz9xm>M6a|LzDpUpq_4UCGl06CQO& z69n0HHA2Pmr+x$dlNtUBs@`_}pyGz00Kk_IX82Fqt!rTLw+Odq^r$!(9m0U*cdk>Q z_OC*`oiedTwJCnyQ%T;iqjg4h%e=PXSOY~4Q~1o6yz$m>8F=EPVS~<;O^PvIpl zqCMTTSj2Le`7K>aMJ8l8k9}K2T~rwCu0E_Cq-)R-;troEsc8JGq?fy2zj6Z}xVUsB ziy~1^_*j?x9ha%&9iP7hB7JFMR`HFUg&s4V-52Y$C2821?uh*%2{vy^3rXP0;sn@7 zsGy}E4)b$V>6ja_EtyjIzM>#^3Z^h2Qs0%V@LBI+xMH(zkz}ztZlro!HeOKi6~0xP zdAT3YiE0o>bV{W{M;DVStlbKySf&R#KCRu7LeLIq^i?SNuD&;o(JBwxNZ0K#Amc*un8ACk-qZqM?I!TG)@v&J^ z(MHJ%kujBZ~FBU;?NCfgN2L8=CnKhXy znK_xzP*@n~U}XH+OQ0BFWT?=vq6`cSobsFmAtft31mttsg-)Y|d#c+`a6jdgvePoq z|4p$3=Re_FeFgx2eysm*PxcPFb`A~}_J3RZpyym{~=&JR| zb+~rxQ%DMw3Bv;Q>#?AtoDosY=a9oB6ULdbySWj;AR}8I#Zv`~$t5!9o0#$eK(xHS zqYi-v`jO!QhTlmV-=SqzyD< zxN651J@KxCjoMayjqOE=4HLG)xAvsFLBpV+K*IoEkOi)5)bzk&f=GqRN#u|U25`Ql zgv1Jf%Lq||QG*oxl;c4xM(;zS@S)>N9vDM8E?g=7R`6bRORh3V;T{;7dDnL-<62 z2FUi2l4e&k#N$Ok3W-7o_7w9hsiLExsDk@~mhb7;`mk(?HqMdhb&f|CmOj*)?%5t4 z9AHf&k1jihOHK1kepm2bxrT1wI?aTW)Z&LMvXOr}HJgAbT{W0OcDtqRWc^`Ub-O7B z(G1c#Uq3S=;(qL;~~qI@d5f2 z`+Cm`OhC(kg7|=vI<&F0mMu`}U4epJ(h5^0qtg(h?;K$F=|NG2y3NWE-*Vgg;XTvg zcSSsGIzt~LOIn4(k6Kd6mZ*r52VPV+%uDXI?E&ifwCHTHyeLjwv@d`}Hg6?8(-SYw z+$rE%^ZgfE))Pxhm!v*uDbc3*GGSfO5(XkyG&H}ok$T0LTOK**J*OPzR$?E2$)h=i z@YCSR(k#*b>xA~$(nRN>;hu|nqGO0uQM-qN=C&3O<0hRV{k6b8-q4J*V7N?LQ|4|@oE2t0 z80KV(Atqa!` zMqxpYHn5aDKqlHL*MhHn)uwm zCl>4i?g?-S=_nvNQIxTYJz2V=Z5-!WuS2(o_o=c+Dy;~t8m^k0s=8K`T(#n&#AXhf zqlkas#VSce+RW~xkJX(&ZdI>ae;MYwj*2sVMSnWdjd>EYGHn)lXeFzo#>Wz57%reO z$#z7drDpbuo=I;AZr?1>zT>Jx3M?1{gE*gkNcAFi-hS2zx!yd^Cl69z##G@(OIE+$ zb^JBt)WC%PJk!m=>5Ykf+L1{&zT{?3-=V?->CG{mNlM zrn&ecz-bo*7G^N@_TO3ch>Gm`!-vL-|p>|pI$#nOfOJwbn)UM zq+acfxWt%p%ArFob6nCcIs2^XFN?`dSa>4d_;8X@Ik^Xm%<2`PsovRa_~9VMu_T|S{>-dH>T(q7qAzMEeQ2NG~lU}DhUd>-hER5Pe`UFADcd&@ILKAy*`ibPiPAI-I!qJzhYO1YxRSkqa{{;&Nb(wAZ z(%ss5aaaWYtUebq>^vCsF7%qh+I?;%)$a8_5GPhMcmq2BU|_)4|lGQB`iQK``bzFxQdJyvTQZz%Ch?P}BjKHA~A+%JlQ)Re2MeZ4& z{Z2A?t>|b_g_W&VU>!GS*E4#T_2CkxkYh#bs6kJuz@A@o#18)!M%9>$&an`l+u!0uLd$A zWDqJwE!J^O*ZcgeWcrb{cMRE3<(b_CRqXDbt^oC$t(LgT*(hQCUd=vK(}X?!yD^6m zarIXO9+*O@@nsDwqJd#UYsy3DAua9rOlm!fy`Y~BDw#7_9vDANfdVF+3#odPRRIT;Y{!2fFhKJh~$dnRLsfpT_?QD{hWV)kM4~)aP+`- zqq}eLlPQI{nlq=NNjJmpqiK${EpEYeE<<{ZutU02#_?kW@}L_Rx5o^_ak*Xm(e-}t z>BXM7hK0zxRYmzVku!)~0y6Pypp%T$*3haSWa^tL5bqcyyfzEP9DajAKeVQ0(1VK- zA-FDhmKx>K>mbrA6*R|Kawx|u=1`5K5^%Sco~=`tM!~hly!X%OaM={IC3_(&%VG`Hceabu&#d`;0gOToP)!f?BgE zFlukcz~>=w)Vf)vWaz{C_ad)pcn0Ov!Hd1cS&AwNp5Vvv76`*Qp%`ISqRn&!GfXq7 zJm29@17s1E2oq%|TF0=ou!4pChP(K~vqe>0*88$>$7PYJSuqEVy+4iz@KQeui(vZR z>l$I9{yMXYMJG_Z_bYf`mQ zsk2pE=tEUH7jyldFgLMbS9|Y!siVAIT&F-6)mGa`eS~l6v)P=*`*3r_bE6qm`>m;Y zvf^oh=ETFros3y_2Mm052x``x>LlZJ$+}@fx}HD%=kMBzJJ3#*L%WG%cl8RZDWwQa zFP*-1uEag=<}#V?QImqkoS^9)>)|(aXE;XzR~`3nLFS&g5b|*CJ0^*x7B-{gzK#4n z@m7Y^^8%vT{oewy9)){F9kZvE?sF-H8SlVYwJTD(YjGn zJtnHk#k%T?&!0zli)5J|-H=Gs2rJt_AoMjJBdTXIX6|C(SR*QYM`=cuf!M3I;ok!G z&59pRF*YKyeyE$lSiqhPnS{c5a~s)t&lEO2-Sy`ocaivNGbLPQ)PR1*z!-wMc-_t~ zxI{S3fQf+SxQU#A3^z-(VeK*8ai#U5h+z6r{BYQdIb9|st};K zz~4^ye1yTfK2(ib=KenmkPQ{-8&>&W6z}`YjS&Y=pKi?Sjwl+_&3n{y^>;A z65f?@?$%#Y(^ya5=VT};4Y0&Tjm2Q;FIDXGkIv7D|;psH)Uh=Oc8u`U%vZK!ot?Y|;Dhx8GS;4X^1 zTwIRzV!5k1TYtMYfwIqMcHhY0Qlg$Rj-tEClTflXEW}!rXs5pK$DybJ)Z|lYPOHpO zKoAtgoT4;vysU;(^;uN0yrIOe6yQB1ikRC;v9P;I3?rD28x)$MX+3`{M@AQdOFcy#HE`Uj2D9v zXA*zwDzl??xgoWF2%#cYV{$UyzLBP6Xm3OzZ{BgRHsW}hsXEk9Sj!C-->BQL8Kaho zzEA+(dG-C+`yzfYV8vOnyy_>nqv!JZ!GiMv-XQt$gj`JD7UuOR)f#Y|Q`yOMQ@E%) zG;F0ZcB=JpJe9GAV)>!%`N614-pX&N%_nSY`L z*1W?D8h-&3+s*t{c{{I3Z|j@{DcvQ~c2drD41Ui^@Tqgn*>@+#ZM-G+`R_}t@S?%{ zQ1A1-%Q<}y!p1XiNsd+PyWUV1`JXX*ph#Yxppr~82F2~Nr%F!Yn?ZChvp}yMH2iJL zX`duxwxzmIeHV8hs%N-i!F8ox9pQ%e!$q#foF}X;r|+cr-aq}R$l(x?zdC-X@uI&f za%U53DqTw|)4!!&|250}zft60|0hL`E|A46BO8dRpxtC4mWg8Zj5kmVs=5CY@NW_v zx~~B{>|?g7^a%h!{AerK>)KmTSvgo({;dsU#7kPQ37`)ew@(_yd5X?3^K8zjRlul2 zt=o#oV0|H@5kVG-3z1ah@u6qWJZp8~q=UfypACuUExM!#;WYJn3yD(Zs!$W6_i2(6m2=7)>JSGoBI2zLo0S)*(rXpT84* zW;a|Ht5@8|2fM#co&gSuwpw-`N!-@CccK7Qa<7HiS~F*wOxY5(@EIvpqv+a5B@sKA zqvBJSH`x0NPi7nQ5UMIknaak1TH2X`$Vd?P_qkj!Z0-+q%~K;va6V1!B-{@srz@$TS?R`{9O9K98Sr()&tfUdbJ8vg2M!iK5I( z?X|-M0yNAM4_EtivZA1juq-~`gg7E?kAF#qYA z%ny)r9wmZbVaM<;zoly{%l7(<3|wS}tt;pY3Wh*jb1kBAP_WDDx*w8i!Q{(hFt zRwnK!b2q0bAoiWV%tbn*o9{LgaO#lvr~};CE|j7Lg=OlK`IhlOr@IXfTwD0X$rrD6 zH(wM>0}3@?yTq|?owOm+wVJnD1T?GB;5L+mNDF67X|9q63~ebrEVmvfr1Ly zrCo6Y%4gh380RUM4eX8yC?LI1#y@@Ur6CM5EJKhQFa;rkfgH*=Q;IxErrfK>0 znaBB(15zqaU_j#3&@S4g0gzRn>w4_Fn#Mh`Hq7%8or^I+`?#`BzFXLiGsVq(nwbQH zLfh>8k^zQBCHINTu6O$%L}&9Wpd3G7dPUjE*Fa-7op{R?Ee@Qsni_8>>-1pSe-0BS zmhe#tHc7sOd9(ipiYuq*Q{cj#T#$;_2BX(i+)Z!u`Y}DIH-|N?zg8;nfllHEqVtK#=0K#pu42o zZJ!I#@7>|t(dD$-!IM(njM((lP%rzozi`^%z;7ld*SfGN_(|Abucf5XkwB4YRFu4q zZ+QI+P(4<`^nPZ4OtsB$?#a;Uj}ZwAINk#Z^@*)eh3C9O(PJ%bmw}XYe9?^#1D+9!Tp|G+gQ`_U^xq z%Na}HoRVl-31>feirwB}erTp%gd=x8@Z>dIL3nfQRGO#GCK@XgTSJ_{NtHykk}=(~ za1Dbpjs5u^d+z9fUBIkYt!$IPj6CUd)K10JA6IbtAP}m`ZcoygG$~}Dy#sRDDTryl z=A_L5U|*!jcw$&;Q=LhQ>9n)9e6mvUCe$FOpf0i4)L3h!M#OGPHeG&Fu1T}J?$Jw% zpk!}KH+yy&%nDLzKgsxIZI%fmgRD_Mhw#1Ri@R2c-IwVt0;m`kpa3>rq-i1_Sww)E zJBNyLC3KKuGI(4_E-rqhpLztVj?|*or!t+GW>1K;Ll_3=ARrIkjwPTK>J>JLS7Grd zyN**VV?gBQ@A_++ExPMHP66V2_-@Z%4wx^r;NA~hQZ=8ehqn+z5T(<>n))ngK~Nn8 zm=+ygBzKgzWMgy+lhIo|IM#G3cc2&+1@7!9iL~be@%%11<&)UZm>Jj|5FrzCu&0yCj=;SsKBb+hK10b(3 zS1|^9W8UfuoLxffc7J+q`P!Lcv@yMY7bL?2D#vv7nlJ|pk@bzFe^ildxXuRt90%~5 zM_GOLZLfk&|D}xQ3~f5)Z%fdwOq@1D1YquNSmCuZVq1EBg3XNHRw%dWd&qNBC&oKO zR~qUgL~_O+c)0I~hl{h|p&hHbd~ZitZx#0h3!V`IR)R#5e<(X*Quj`3S1q&X1Hzbk zzV%L`FQvE!z+eS7!?OggP@sDigH&ROVJ7Z(x=5B?3y zpXE(O{#B<40s!EL{Fl?|pQOd!&W7s$2m6xI|HnMU;A0-5t3uh|`}Hew_qVa`?(WHM zxrEeII3kP>|5#WGY-;kT&j?al@@)(HlM1@Zj32hYCnGFl1#*~pT%3G(_^g;ca+qAW zxV>08vRJr$csVl9Z)~wRv0E`QM>yDfISNF3pq<=(?5#ZtOxO)jE?kV0d9?x>Bs`o++FF(N)^d06Q^Ec*(6WjgSn*)QyvM12S#yIry6J=V zH8I7ysmPi&i&oJiF?s%gk!)d8*}K9mhpfgfmFsa2JBOQsq$>sI(G0>Gdhwj*T|A6{ zhE1-&cpJ$JOJNx3Iaz3IRR;&@_Y zd$S-&;NbV5U&T6}uljj~AY1Cgr`J1`+2Q<+ijo5E2Cxy?2?lIUDk$ao3BrHfJi|ur zSnp9G!wLlW<9gGb8JW~*{ETTEE}M~(^1IbHvKY8cT&1f-?V=P9C|uQApsm_oZEU?! z%M{mmdPuU*)59P}Nf&YEe$p@U+9lC_Z6P{gHZLbGqMmu)T%BouYqt&`3ulox!@XE6 zcBS97SUm*NJS%=@nAGOHJTBofJ#1QZ92Up9=Wgvx?OL6+7V3>ttU5o{3`k|6lpXaR zHu{n^-to<&zX-^7i+$l>Ow^D{y}i)(oH%J!@Yt&qlgyPfHxDhT?fIHG4(0rkZ-GJ9 zZmxyE-#4pryl;2$c#=8E-u`>G={`y7u-%|JD=pRp>ukH&yjVV7EjmsGBP&)dHdP}w zC95bdML9NAD_&L3^mP05s2nI8NQ}ORv2}8qYi?rXL%n;dR~na|m6Vtgo2nd}k_;AW zV+%Kcz%W336e2iAM$*MWRmTd(-@8o5DzG>;#7DwX^R0xDimIWQwT^s#VQg-0DdJ1I zavD0?hclCik#53oZ;^N)H2Ul6&n1wtT&f6Ir!~}GkP4E=Yut>?xKoEMjfA7l_rvu? zrjB&CBgd*T;b2+m*TE15pwaIMZJgqz7yCuC3aOO7^23hHs|vc~Dc5(!O2s4bNYRDd zBu z3*on$QmsZQngv$2X&IUwzqR8PQB9$yL+FWWk?ZB7dQwlmKY1LuYxx_Ds(p1AC{$HqcNv^HPy{nDF z7H4i=yve3@Q(VX52P#r1oqOPT1sSzZ>jo5l})yIHOwxjMmsU7_Z7KPxonR(gU#+X$stxLnYUKICQtZ%DAG;dfxGE6~=Ge=g8Pl@z$Hn{^h^vWT!t(78O`q;<- zY-wU^CQBCrGOtqZKk2G7JJ+2L+UgjDCreHEiPztc426L-*B3tx0TM=QWNj8N|KofY zYRAi^S7cep=tb+vSok2qkC9&gyW;V5z5 z|9|9fhxnJj{olOpGU9&*{L|6>*MPPkpa1{P-~IRS|MUg@6+avZ_)jjOzX$uLRpqa+ z(s2I;`yY%ee-Hal%gA4`2|i3D|1>uJ2Ls99!~V0O_gC!gum6Sp9|-2(!~V0+_E+pe zY`}l)y8S)eKb8JpaXs+=3-^E0{eLgOpIrN|0n~~AJHUTt-hU7OujL3E@K<~#$`Abi peR=;s4}tVYh-9k2hWJbU`=5XzJ`@K40Q~rU`Dm|9QUBxVe*tQbgarTq literal 0 HcmV?d00001 diff --git a/src/fuzzers/corpora/ldap_udp-corpus.zip b/src/fuzzers/corpora/ldap_udp-corpus.zip new file mode 100644 index 0000000000000000000000000000000000000000..e95f0c4b5360a75e72bb526f1d6e582fbf7bd7db GIT binary patch literal 13047 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 literal 0 HcmV?d00001 From 83a2eb366500ea78d7c7a1392df4cdb501d33943 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 1 Aug 2024 21:11:38 +0200 Subject: [PATCH 2/6] ldap: Avoid unset m$opcode Initial fuzzing caused a bind response to arrive before a bind request, resulting in an unset field expression error: expression error in base/protocols/ldap/main.zeek, line 270: field value missing (LDAP::m$opcode) Prevent this by ensuring m$opcode is set and raising instead. --- scripts/base/protocols/ldap/main.zeek | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/base/protocols/ldap/main.zeek b/scripts/base/protocols/ldap/main.zeek index da4a21871c..1e23c7bf84 100644 --- a/scripts/base/protocols/ldap/main.zeek +++ b/scripts/base/protocols/ldap/main.zeek @@ -229,6 +229,10 @@ event LDAP::message(c: connection, fmt("%s: %s -> %s", message_id, m$opcode, opcode_str), "LDAP"); } + m$opcode = opcode_str; + } else if ( ! m?$opcode ) { + # This can happen if we see a bind response before the bind request. + Reporter::conn_weird("LDAP_bind_without_opcode", c, fmt("%s: %s", message_id, opcode_str), "LDAP"); m$opcode = opcode_str; } From f1167fc87fe00977c8ad9f32b14038ebfb03dabc Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 2 Aug 2024 09:15:05 +0200 Subject: [PATCH 3/6] cirrus: Do not disable Spicy for sanitizer builds --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 88ffb16c76..446116bb5b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,9 +14,9 @@ config: &CONFIG --build-type=release --disable-broker-tests --prefix=$CIRRUS_WOR no_spicy_config: &NO_SPICY_CONFIG --build-type=release --disable-broker-tests --disable-spicy --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror static_config: &STATIC_CONFIG --build-type=release --disable-broker-tests --enable-static-broker --enable-static-binpac --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror binary_config: &BINARY_CONFIG --prefix=$CIRRUS_WORKING_DIR/install --libdir=$CIRRUS_WORKING_DIR/install/lib --binary-package --enable-static-broker --enable-static-binpac --disable-broker-tests --build-type=Release --ccache --enable-werror -asan_sanitizer_config: &ASAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=address --enable-fuzzers --enable-coverage --disable-spicy --ccache -ubsan_sanitizer_config: &UBSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=undefined --enable-fuzzers --disable-spicy --ccache --enable-werror -tsan_sanitizer_config: &TSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=thread --enable-fuzzers --disable-spicy --ccache --enable-werror +asan_sanitizer_config: &ASAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=address --enable-fuzzers --enable-coverage --ccache --enable-werror +ubsan_sanitizer_config: &UBSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=undefined --enable-fuzzers --ccache --enable-werror +tsan_sanitizer_config: &TSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=thread --enable-fuzzers --ccache --enable-werror resources_template: &RESOURCES_TEMPLATE cpu: *CPUS From 11bc233f45e102fa06fba576eacd400506098fb1 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 2 Aug 2024 17:18:02 +0200 Subject: [PATCH 4/6] coverage/lcov_html: Ignore testing/btest/.tmp gcda/gcno files in the btest/.tmp directory are from .htlo files referencing ephemeral cc files. No need to include these. --- testing/coverage/lcov_html.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/coverage/lcov_html.sh b/testing/coverage/lcov_html.sh index ba8c8a37df..be65e4add4 100755 --- a/testing/coverage/lcov_html.sh +++ b/testing/coverage/lcov_html.sh @@ -116,7 +116,7 @@ verify_run "which lcov" \ # 4. Create a "tracefile" through lcov, which is necessary to create output later on. echo -n "Creating tracefile for output generation... " -verify_run "lcov --no-external --capture --directory . --output-file $COVERAGE_FILE" +verify_run "lcov --no-external --capture --directory . --exclude 'testing/btest/.tmp/*' --output-file $COVERAGE_FILE" # 5. Remove a number of 3rdparty and "extra" files that shouldn't be included in the # Zeek coverage numbers. From 9f5f8b809a96708e1cad0c6def5d45f26b03e7ff Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Tue, 6 Aug 2024 17:45:58 +0200 Subject: [PATCH 5/6] spicy/runtime-support: Switch ParameterMismatch::_fmt to static UBSAN's vptr sanitize isn't happy with the call to _fmt() in its member initializer list. $ zeek -r Traces/ssh/single-conn.trace .tmp/spicy.event-args-mismatch/test.hlto .tmp/spicy.event-args-mismatch/event-args-mismatch.zeek <...>/src/include/zeek/spicy/runtime-support.h:80:29: runtime error: member call on address 0x511000369540 which does not point to an object of type 'zeek::spicy::rt::ParameterMismatch' 0x511000369540: note: object has invalid vptr 00 00 00 00 be be be be be be be be be be be be be be be be be be be be be be be be be be be be ^~~~~~~~~~~~~~~~~~~~~~~ invalid vptr #0 0x7f9c9977b019 in zeek::spicy::rt::ParameterMismatch::ParameterMismatch(std::basic_string_view>, zeek::IntrusivePtr const&, std::basic_string_view>) <...>/src/include/zeek/spicy/runtime-support.h:80:29 #1 0x7f9c9977a6a2 in zeek::spicy::rt::to_val(hilti::rt::Bytes const&, zeek::IntrusivePtr const&) <...>/src/include/zeek/spicy/runtime-support.h:562:15 --- src/spicy/runtime-support.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spicy/runtime-support.h b/src/spicy/runtime-support.h index 9ffef2d9d0..0397dc86cc 100644 --- a/src/spicy/runtime-support.h +++ b/src/spicy/runtime-support.h @@ -80,7 +80,7 @@ public: : ParameterMismatch(_fmt(have, want)) {} private: - std::string _fmt(const std::string_view& have, const TypePtr& want) { + static std::string _fmt(const std::string_view& have, const TypePtr& want) { ODesc d; want->Describe(&d); return hilti::rt::fmt("cannot convert Spicy value of type '%s' to Zeek value of type '%s'", have, From 821d460c2e99042327adc097e7daec40ea77678f Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Tue, 6 Aug 2024 13:50:22 +0200 Subject: [PATCH 6/6] Bump auxil/spicy to latest development snapshot --- auxil/spicy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auxil/spicy b/auxil/spicy index 4c5c26bf34..7cddc357ff 160000 --- a/auxil/spicy +++ b/auxil/spicy @@ -1 +1 @@ -Subproject commit 4c5c26bf34c2cf2cedf56270e84f1271fcf94465 +Subproject commit 7cddc357ff83175984e19037f1f8062a69cf2030