From af40e814a44a1eb5011bdd0cb185b095df3f638d Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Tue, 31 May 2022 00:50:47 +0300 Subject: [PATCH] Remove `len` and `cap` fields --- tap/tlstapper/bpf/golang_uprobes.c | 6 ------ tap/tlstapper/tlstapper_bpfeb.go | 4 +--- tap/tlstapper/tlstapper_bpfeb.o | Bin 125400 -> 124960 bytes tap/tlstapper/tlstapper_bpfel.go | 4 +--- tap/tlstapper/tlstapper_bpfel.o | Bin 125400 -> 124960 bytes 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/tap/tlstapper/bpf/golang_uprobes.c b/tap/tlstapper/bpf/golang_uprobes.c index 079449029..12bfd6eb7 100644 --- a/tap/tlstapper/bpf/golang_uprobes.c +++ b/tap/tlstapper/bpf/golang_uprobes.c @@ -17,8 +17,6 @@ struct golang_read_write { __u32 fd; __u32 conn_addr; bool is_request; - __u32 len; - __u32 cap; __u8 data[BUFFER_SIZE_READ_WRITE]; }; @@ -54,8 +52,6 @@ static __always_inline int golang_crypto_tls_write_uprobe(struct pt_regs *ctx) { // ctx->rsi is common between golang_crypto_tls_write_uprobe and golang_crypto_tls_read_uprobe b->conn_addr = ctx->rsi; // go.itab.*net.TCPConn,net.Conn address b->is_request = true; - b->len = ctx->rcx; - b->cap = ctx->rdi; status = bpf_probe_read_str(&b->data, sizeof(b->data), (void*)ctx->rbx); if (status < 0) { @@ -82,8 +78,6 @@ static __always_inline int golang_crypto_tls_read_uprobe(struct pt_regs *ctx) { // ctx->rsi is common between golang_crypto_tls_write_uprobe and golang_crypto_tls_read_uprobe b->conn_addr = ctx->rsi; // go.itab.*net.TCPConn,net.Conn address b->is_request = false; - b->len = ctx->rax; - b->cap = ctx->r10; // Address at ctx->rbx - 0x2bf holds the data __u32 status = bpf_probe_read_str(&b->data, sizeof(b->data), (void*)(ctx->rbx - 0x2bf)); diff --git a/tap/tlstapper/tlstapper_bpfeb.go b/tap/tlstapper/tlstapper_bpfeb.go index bd214cc5e..7f2111e7f 100644 --- a/tap/tlstapper/tlstapper_bpfeb.go +++ b/tap/tlstapper/tlstapper_bpfeb.go @@ -18,10 +18,8 @@ type tlsTapperGolangReadWrite struct { Fd uint32 ConnAddr uint32 IsRequest bool - _ [3]byte - Len uint32 - Cap uint32 Data [524288]uint8 + _ [3]byte } type tlsTapperTlsChunk struct { diff --git a/tap/tlstapper/tlstapper_bpfeb.o b/tap/tlstapper/tlstapper_bpfeb.o index 70d3f7719fb646afef971a0802d3738e8710977f..89aeec42e57179b26acf043a4dcbe43e14efd076 100644 GIT binary patch delta 6375 zcmb7{4{%h)9mjva_YO(IpCp8E7m|<*1c(TD#u!dOJ*~E=IEKO42>wYCEiev^Gp$~y z*ozP~WzfcXt;u-QVu_{eJtBkyoa64NdJ_?);_YnV7q?GD0YkBKiHS^hMFmqav?yXE_&p zckR3`+(5Nre<3WtL{rU-8Q$2=+Zf|^m2;tY*RG4afnD=>#^KDaV-@)rQh;Y+?cqaR zKMnES-n#B8{+4$)et+ma+8r*tH$*fAi(%#PZqzGeWwd|d4Rp_06#fO;7vo8z>sP2@ zW>n#H9)3~cX#dvxqJktwo>{X`60T5sO-=ed6=2&!Mnd_o>Mm9{kSJww*7PG z4flj+v}1LEUNeb(_9!KYVLv1SBxh?R5{JNWq%dKx^I8DY}5bY zW*D=Q-kJU3g?s-eFUtB-%*yiEgPZ`;wu-nBs)o+0WLw)SGA?X$vd#$J3C(Xlz;4$Jot4PvX@sX0Z((g8JjuN?pfFJYhD z<>P7K1D1P;UM&On`WV5@Y0J=eqy#)@c-A>Y8Elq^e7q2hjTc^@Lg>o?L>Z6S0qcn- za8EgThWS0>JP1BZUUVTIsi4fPL&PFnR@9;lafK+AFm@=xQDHcj@lb+eP(lJ#^F74% zDM&%hz78lM(WwXY5U<8bv#+99Skk!F*k^r0oWM!5ucjnIycUkA&Db^LFx27W^T1YV zv8UF`5f0b|*As8S$ti7EPX0}tT!(Zi`cY(KCHwX3m2bx6$=c;)QESJ%&Ps5tkHvA! z#}bZlN|^;^0^V^}Dzr?oQq8U=4g@9ZptMTNZbf)3z!V#Vnnl?*<52U3V5`KWy%X^37hy{O44PtOJ z2isGIE6I`6$)+Fz&smDW`mQ`5lTadscovzfThtMD{z|lY28>W=l3|lCvalP%Jy=Rp zb>u|~)jPHP#2wjwq&*FpacG$`VmNX$E=4)}m|bTFQ9H)V{$<^%h_$`&%TdEqAVZhf zYwi4Qb>>{&I0Zu^-D=$uUezSck8w5PtHfC^!Uf<_JImT7NW@DSp6Aha?5g7B7`!+! zYhSNUEHPfn)~n0U<5gQRBU{`yGYVSL5H_yAGv^ztUj3{-j*c{8Xvv{mEja}5J}r5= zTmss=UrL_-1yaskhFdXLO0LP3lH<8ja>6I&+r~){ACQzqn2KF<5f}la`C6iYeG#9d?89mJ;-+2ywQ7=GMV!&Pw63O{Z#z#W$Hg=foQmA=$>xny0oU2^iJr#iL-JzO%tPKd^^!+c3(ex#YEf}5IdP1~ z`_z6kBah_sBz|#mJFDfk!JJ8!+a`*CQuRTsLnM;s>gnWMiG#4!0@^rhu|aOJ_M6oG z4K~WEZ&Jf(XY-&Xj4+ym7%Xll){O#l%tMe*fYbcQA464dHZdj@LDRM@zt!%Q*KTA#q zG3rY;XH;ac%Pm+;&gnY!a2Q}6nz6pyVi-B& z7D-YKT3$_VRFcXbcha8m*|A^bgiX2*a%+)PzNB#Lkwl@0b-0JzrNU9eWJ@S!7)j;U z!xoDB81E^x#&C86*&M1mLT+5_N$UWC<0f#TP@9>s;GjCV(k2z!`K!2x(|x_G`1&%= zd#s78ct}N?ILwj0coTnEm`XxzY$jXs+rf2NBFcXpyu`=Pg6n;p24Cvqm%uB0JOWh$NQ3ylu&!0AG+LTst@|;4J|bP5tY21bA;Qt9j4yaHz?lG#<+9rTJP)J>(P{5r*~eE$0z4Yv@my}s3veXBwE>Rja^KTO z_--d9M_DNTP1ztv@pC4?aulC^Bc|nWQGlZXj^%RSzO?M3AH9pr4&?V1(Z^C z??rybP08M|ziinod-t>K-Oup=uL*E-fVTuVnah30f5!uyYDBO6!)nW&Edg!~a9e;o z1Kbth-TBX`0bc8AYHM!U+N8GYFz4#jVk^()VCC=q^?_4ztp$I)VQuYRs8SZuQjTqu3^`8n;O@3mx}*G z?7b=}^(Jgq*R5(?*YH1z{@Y_JscX#FHThS;cWi?vC#x)Yu2}s6%ru*AFhH8m^D!^EXkNvtrmz?z&5a?MPRVm|?H(y0R#rnpobt zQLmFv4VrW99bJ_od}N^O<>Cx1mWfYw&ylYW{3IlvvUB#8iBonRzTdak?8`4W9U_{7 znHZFR4s|`Rg7zo&&V6~a!qd@Sf=>d*<)MaHpb8hK;~ND^!xi?6`{pkUFPY}ZmU6$r zUqs7^3NyY)!)1OA_Em$WMq!D)aWKE&#OKc2GnjvA3ajgl75&+MZg4K_IWw3ytK@5# zWTk6Z>oS%VK|RsA5qdjtGTfKLQ?EWmFE z_`}O+zE@#&rhhaHUn zA9!qf&8B%P?%n(iYq`~Wf9Jdv-)!w%MivUXTQ_!0cDLPqWarVa2#((P*`wP}rtBu#mavb%^0U~B*Z`j_mk7~}zo2$`AyFP1=kg*%X`_diAzS8o zcqLIWhq60<6+)Ne!ez|0IA>j6jl8QUJn~-hzBQ2|^rK`U>aw;F-OqrWRXj}8Sp~-3 zqWDdsZn?Wcl*PI^Fr!X)Hn#f&pCN*ihh=|2_xf(SNiw{VIaahwiNT7#{8uuCrJ`alNiP5oRdo32>!|@^### z`2iBE;7Wd5l$;qG=af=BNMbcS41p%stx~*OFMvJB;fA%)DTa z<~v9~4Pa28bZso+Bnqve!Qhx0EdqZaw;@uI6=e2#c(v)heJ ziIUDRw45^LaCn4h2Rj7&QOn@+@5XrEKXV$QuODiK()#Iu~eC#f&=o_>ND&9cH7$WmP2Fky&Po zhoQ&p(7b^}2lSYo0q)U^_pTekYz}DdC-K9p!H4iJvms^ffDz9CR*=$s7H==ES99Fq z%&jDb3c=dYvX4j%Fl$3e7fx?pUyZl$`#sykkcF%Utw3)eRO7H!fEStvG&#(kd=?gl znzekZ%(+6WS0`d^mD{fn^*5Y@(ke$W>nxw9eyw?9$H?`^j*$x$eEslv1c_1Xiyb#- zjACeZW2d|kFAe9!xHAnoV=Uqv(ymYpGu_xJ-cLpY#^X4Z8pX&VewkP;?r7sne9>sv zDCUdC!e8Xd4y_PL+w z3TuVqWY#iU4wEjSh{MPsa}i{r1`p$0LX8f)8*ozwDP%UVyi+ScpqTvdh2qYHswr~& z5}iY6pIRaYMQXTnsko^?)X34BMOgvP${2+ah(~WR8h)`>e3%vMh1;<^w`4p4Ug#20 z#e03(w6Z|_|mrVSG6?HCQ+ZI^=BH`Xl zOcr>P+>+TaJklnP-F#&Y`YpGYXf0gqW4PGI&CK%Phj`jwfQJG+65!DQj|F(#&vNk#;&?29PX41wms^to zP6c?v&&`Ivbcq8lC6fd(WUS?Cge8JDRrw2G3;2J*< zZ#l-hIE3D6*6)-%5&=#II2GUtKl8tTdDpu$JHVEohu6I%_J|nUJ_}QIxr=T0GTZKD zw%x-mY`d4)b}zH-UT*O7@RpawVH1D(lepa715q3A-OE;hBLR*ExGBIb0q*egaNnpn zE@F-7#eUtgr8&Uu0qzWNPk{RaJQUy&KM()@gm_H(0z25&0wJDWw`}7rdpRE9-T)5- z_)vfo0ZwXOLGjQh=D*B~=C06x%#X~E&EJ}*%va6R=EI>!LS3OpL*1dC(1+&E(7(<1 z&A*xdG|!tKn146_YEGE%ng1C6@o&VoEYTp--w^fu9}ucc$i_FsVxv1O<8O!+#v>7# z;JPQ$_oi4WMr4$$sEl(pDif;eO947%l&b+5=c-*MxN7PE5!pM47QHDx+^f`)%Vg&h`3qnNW3m-`l_qH8QH|9vSEQ z&PJI~^-$kgU`xAk~wMCnL6>d8AQ{hgO3!``na~HrBh?CO`0-oQfbsmS`(4xVbnDJe|z?D&)u11 zvNL;kf8Y1*>)UU45A?p49El~j2aWo_ADHOfHpb5=`ME5He!30DeAZXD<@1r&gWK-P zS|60E6OFb-GR#L_a%#_$n`-fB6Om*N|a_Q=6Q&qto~@J8#d zjspH|Ycqa-Y(3eLo%2XGW5XEpP`^7+pQ(oanRUD)d;BjU`4S{i#Sir}P2>4-4oicTae?H`8gJEjyT(7!_!k<#qVeBs=A2mz_K!8r6i~YzIDSj8!3@MZi1l=Yl&Cst(Ts2kgK@jjmQE8EaNNA3XXLV{M8b250v$)^2l{ zksu9%UCO`$`%W_!ad9empW?mH=e*8Xmy1V%qlzy>pV`Y;kK!b3QB5CXF&B>m_el=p zpuiv6+=uIwRyYVb_i{#i4U~!GFM?SXA9AboL>`yd2I-|I0$lDJvGhb4 zm(fcsJrSQS;AhVheZH*tnw`4JA%}P(a4BY18 zQZRN?jz{`%76kj0K(2fvmp3>KC|CY1E~6TOEECB)(U3OSi-K6Ltd+BX;z8*1+c^um zxD;IG;$mo5e3MLZu|?_$zBUX1*!HNlrFnE4+M!N*Vjs9y=@)@VzknCf#Tj7Q7{{L4``~EeO|Tz< z5G_+IH|8j#jYyUTNAkp{Q~AOqGDdw#8DF@X>M{y3EBdPWGCHS3^7&vI&8t{C<9*E; z-~?yfbetjn6Xee>qJCt=K^{~6ppeN~Xc*%J5Khj*|LwwONGTkBG2q8SE>ZEF%4Pxn$ zC>}n=J?M4nMtlOe*Z?;uW(7D?4S47@Zc|(c{m53%B8q2&?|2&TmWh{+26POLxC{&! z^eJvbgY?}v6^b9g--EgPuuR2!pwEq9nTnkSd2#rtf3gq2-sfU3IN+IS8#ogPDuZL_ z(E9?uiWJLWI*gAZ#i`=X3LG=)J5}th;4|-{Z{T7zE{VIq46jZ?^x&oOK}>pihk+BK zC(n=%!mDFs^vJ!D(F3^?J(tn%XuLrEsvmibD)2(N*avo^M;@a}+zu)Nh%>-m#q#E# zjd{6vI5@!B3^`F}K)TRq;%S8lxp{c66-(DF#(S-Jm3VZ93b9q<465-%R%hTZ1IBL0 zR4Gw!=fSL5b5pD4CUAnAb|$zfe#jtq+$0CUPp=v$|5ilVk+_@WA&bV{v>E!)DT5AK zD$Pr=$P4l5RU~);1|xcnp_BFj*yyvr3`j5C(2ow48%m1M;blYY4DtE0M@R4`di?BD zx7ZvybsNw_>P>tosh}oK0z0Qr#;ng|JxVW6RlsDuiXFXkh)8chk3(UfI(e#sX2Pk+ ztuUEi1^G@4m^;bDDY5s;@oAZ2d8%Mv>0&RqMzJ#i=Mc$5RcW#&`rpQo&#Fz`#V{OemHgf1EBHql;ieQvV!s5f zE)HR9cDr~Y_^^vBz)=_920rcLnc!X*PXS+W@g&afU;{3}G#K1;aXHu5#2UoTX9^;KhIJ!FC%Q(y;rg5Lf0~)it6WjYV4rpAK$lW4Jvp8~ZyqEEqMUTe4 z8ux2_O=ItUiT(LC4kmK<_TTcScsRBu-l_z%=+k&WV^*JN@6$M-ahb-|iQFw-;Rnnx z{YmDeAZFp$IH+-@#x)w(X}nS6rbO=k{U7*A9ADaW_ zd*%n`f6c4rp!u$O#k_33-@PKn*Jp6Qc=;Tknc{7+7Zej81C8Dm5$fZ&83T`rEwbD$ z4x;2u;%XnC%b6(uCyF-FXcq^ls1#SJs2AmLqX>#dDtzJq71iP@6-!0=c|JE~MZ_Mg zR($6?#_sr&jrHPXpy8b*2G3*ct~wFAfHGDmwoqBNN*qMV2Snoqo+&&R`6Q$EZV|c& zo$p?;h02C|#X%~|)`&qW+t-NDzfjh$6L5~vCZM=lO zPhCRa4eP|9)U6Yte(1`?RnoQg^GUoxl=qVz>c+r&F$n$eDE_9S6xk$Zy~Af1^=HJE ScOZZEj4eNzCa%BD$NnF9GOXeN delta 6870 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 X5gi}%1ukDi96`P7mWUYpm{0p3X?U(r