From bf6bf0705d44a0105b1c19094fe3b755dc03d7a6 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 4 Aug 2023 14:10:25 +0200 Subject: [PATCH] Fix eBPD PID detection for UDP on linux and recompile eBPF programs --- .../interception/ebpf/bandwidth/bpf_bpfeb.o | Bin 35576 -> 35544 bytes .../interception/ebpf/bandwidth/bpf_bpfel.o | Bin 35576 -> 35544 bytes .../ebpf/connection_listener/bpf_bpfeb.o | Bin 36472 -> 36560 bytes .../ebpf/connection_listener/bpf_bpfel.o | Bin 36472 -> 36560 bytes .../interception/ebpf/programs/bandwidth.c | 4 ++-- firewall/interception/ebpf/programs/monitor.c | 20 +++++++++--------- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/firewall/interception/ebpf/bandwidth/bpf_bpfeb.o b/firewall/interception/ebpf/bandwidth/bpf_bpfeb.o index 82069f79c918416b840435302ee1fea0820da665..4ceee0d952171086916737035c977f85427fa7af 100644 GIT binary patch delta 2753 zcmbW1UufG^6vxlKzio}$waq$A)y>r9-!EOTnJrjZ|BZ^v{yYSnGpK{egay~ubkDAJtsF?ld?1^CtAhS&8WvE+U8=ezBciVx_a0vK3CUq|5&Xa_PNbEpe2&D0hmu+ z>-1zg>MgJwuhNcd2ReIew8q_hj_K1(r-7Ii|m0`i9!hW3}X3V&- zOf(ei0Ae@ta+y`_p!dici0>ak>tEU$XarH(g}i063F5AyZ%Ee&41m}m#-mugp!x^B zVnJOU3}vV_bYxtX?>CTp30#bKA~$Qs7D+!{DXke>B+bee$w+03WQ5`;biDrr$S7;k z3zmTba(2Kl$o9$}$#$nl)FRnY*&^9d(IWJ#`oVpfHIT8&F3FRuOTjqEcx9L5Db}Un zB*@qBk5M$~gYEbTn+9O#T9kC;u{I@)s@c13ykaPm^EQ0T$EbOE%-==S}1d##CUl%lABQaB*hRCB3YZ{QX-rX@2SBb9_u9OmYA?{^h+ObyXi_-A&@2G335J#c zGjO?dj>QO}nWGh)QOn(^5hr|4P7HRH23;`FRjRsJ!} z_^gct<>xfZ(2^P+zV!@Uh8A`d4g&c5EV4Rialg&jFpIBg4%}Ahx4ie89b8n=5%00b z?AkG1J5=UG6&E%8%V)u6^Rt9zsoIfp_I+1V?~gRk&5xX|7jLMhOG~1lN|!RCs1oBB z)#-7!x;LIycg7pkxold!m~Bw^vIX(2%3Xe1-66W%DqsIsHC^cuDV4DHDcna@=}Pne D7n_jN delta 2604 zcmbW1UuauZ9LLW&cWxDAOYJaK)Wqh0TD#PhnX$HMiLex$6!jr8l#b~r7Ta`oQrJU^ zGIKkI4gM_D7m46QkO`UT=mm!cY+aE(tYr`B5Umfo;DdAzVqgmXe)ryZe|L{N4=3Nx z@B2IFp7Z1jPokoI2LG6?-w-WI88!C zPkcP!&A)QM1k*T0GmbrIp4?|?oTI0ho?-d}rY|x5Dbr;~KegY{(JPjIl%5j3%8YNJ zHsBrIVv(PjZZQ3qqhlJ=>@l$*_y+^|6U=>$>9?4kVtUTe9rqj^D>(Y#VMoW7m}VD_ zeQm|}(j{Zppfc#~yTwv}Vfs&||8;cyVQ3C^JrVC5gJ2>`nH|OUeUY;j^*c495~-xSL@Mbn(Zn>BNM+n5QZKR+g(rm?bC*cH%1RWj zz{a#sR-iHcblj{7*1&viy6~tt%v#+MN+)R5>JB7wzI;lkFFG(fW@SZ)>3~_A&kI#1 zf1EM-6D*(n9Aon5SU&mljLFBN(5dp~11Z5S`Tqx4W(&wKF{Ta5Hn%QNVNAZk@@ajI zG5H%Nr$rE3SfLi)v=U6F7S?UX7Oq5*cNo(KjTS?3#%$plworCjQGCnQ2DVW8ZB7ey zgIbobSr_Ui@vzOCuscIu;0$1Q@v(`jzL-s6nP3mt6&kM~@{y1auCs;oDImYDAv3&C98I!MDOdYfiP`q!0WwwAeC^4oD$}FG!3S;sO zmQQ|-G5H%Nn;q1m?hb0^S6;Uk;76$SL~+3mW7?q6VldvN4r&AL4r;@!gZL3@FHpx4 z)++p;(lW%u7UM_QIZGd55@+np?Dt3e@EJ6)Frpj(px-dbEQHAgoAKf%e`Rs#F8nj= zd(hS4Ex3HnH+sb0J7et~X>s;G#v;1Tf;Ho3iLBFZBdygByc>LeAz1z7z0(KeA~Y|2 zC+lE*n1|JZ2aXq};fUT2*9$pV)sc1lUGTtl-H^Y-{KE5c0*r+rHQ5Qxg_P7Gd6DKh KoR`74=>HEkz?KUD diff --git a/firewall/interception/ebpf/bandwidth/bpf_bpfel.o b/firewall/interception/ebpf/bandwidth/bpf_bpfel.o index f7974b55888cb2f21b1cd45d1062cd0475b17f72..e52039fc80359be3c6a6da1d13094debbe788375 100644 GIT binary patch delta 2606 zcmbW1UrgIo6vxlKKN-|Nl&%Y9nOi4i&?>s&Ohj1=%KpIgp;KeX+!Bl?qGLcA5@Mpo zn2bWQxb39Mh$c1qz%WJ@2-L(#lktGcOo_Un?qM1=7#}q8g+!Nl&ad}J&u@?WrNH-d z?m72&@AsUtp4O{reKxGdFGaSMsl77?%3Ak&zS;$#0PZ}BiKc+(Vr_wrF{$_P%chVo z90q>MJ1LDm@F3o33M3mTO629G=Q&KzZS>Pp$S!3*DD<;JcL|*k`VFDa2wlFNcLRIR zcM9>O4HF{iL!l>yo)`ME&{u^1QRp?H{}I{~DIOvaxuXanEQy914vXcdg+4Cyzy4xX zHzuNiU9XANGeW;B^auC}Wqu|ii$Z@Z^e?y)4V;fvZCw|^(tC?9-HZ*fQ2TZfsTVpb z^kJco3jLDMr||t)py4eMd0Xg=&>su^DgGAQUH*lLlyAasVwHD&FGAPwK=bbC?;`S- z&^Ls>{l4P${6g2xTx#~#%>4AizEZ3@vHzZ{g*msApQCx5FHE}4$BCzAUO(}tN*=NR zDy9|m(ZUZJU_C@LKC58Z@QxaQKvqFYa0T&M!%y(~=L*IJR}g0m572sLPQj#LFY$DN zt6_o?!ix&BCV|;UoO2jGJ;BGWP;~2e3jQ`xKizKAs)BXHVPfkVU5h?^jg!pR6;v3W z!XPhCfa>_++&_q6i-t16CB!=o+ZNSmw?$zM!)D#Ks9w7*B6eA{M>`fh z1?*V`1u|v>+oOlH+aqG*QNf}{?Y4+GXX+>L&0b?sn|53Dq~5S7P6J@Y>AupUXY__e zY5ci2sM4tVf)TcaE#RT4rnm6JRxJ}ls%X_Rw)X{-HFW^~k2J(h7PF7I!*D0BPip8C z>?7_H`CQ*8nCpi`KGzQm=6W-eNpKF}IPM%^TomvI8Ns}PGn7ufW4KeF75QAB6U_BX zHn#%U9h}yXHwnyM;#I@;kk4wkF4#xB<}hANm<}##s4^Y0hkS_!(Xc(_%Nq8`4(2tq z7@k8<;d<+#MwDGV8X1 zl<(>w@z726!-9QOpDM8FAQiYeNIWhI{8W$;%o|J^b`Id`Ak}9@KG)|2bN!OdP6xx5 zyMx55roirCz2)v8@tU)aE2m5c_gU@^wpbe-w7-M?U=mD5SJghxh_7$4b!zm9Zcp8md= t>c)7AI5n%j#tWklW1eZWUjO$BZXSzaezXib#u`-@o*QdcL%1?l_djy7i6a02 delta 2565 zcmbW1Uuau(6vuzR-`$@UT$9kc+o2=1Y1VXqoB6M!f3lJmTd=aJgX&aTq%y2)o4J;X z4=IZFw&+$k6zYSL2OlzFkeC(&n;Ni{Dn6`b59tuy9_k7*Sp~H)2A*^CyUDqG+$FvD z`#HaJe)-++Ica`YZOy8gkj$nV9xIbCWID^DPnNF-g^)r#@+!od&GN;41$vE0egi)> z2Yk_xpsS(})9@pD;C{0id}?Hn_prz-Ob;+U#Pm4R_bN*} zPeQEK49>FEB-39reHAXZnn$m*$nQ-5#q@oq%lE^-t+jh9_m{r1mgz$fZVPlbvB+~w z_cA@e^eEFGFns|&Z!^PRu*g?TUt#)3rhkU@wj<#+7OB`#I_)hMzsvN0&>1%4 z*&VDtP$~#AeVFO?OgiGJQ#Cc;_usG>EThoWS?x z7QL*B7NuZm*e_GCKJ0HGOUMEmnp*r8y2z^A$igaFbsG+i_~Vg!oSQF|IH9wMeaO9< z->3DY5`Bz)$Y)qS)sHZy`f-*|^%IP#Ue9D)I0tYXcMdSe3TT4_W7@zON~hj2+^Ns9 ze5%herut=@qe9pnOet|qClGs(^P24;pI720V;}N{!|-WLcW_aOYTY4w$d_>tHQPh} zixQ2zgV&Teu6YIS#AwKOo%1(Pr?y*4ETQ+jgEx?I4vNEm15TaO9emtycM!Q(pU>`K zjp6Pf@)^Bu8;JR?4kC{~P(Q)ghxJy0bqBG))j{MrR#1rr3C6TRQnPaaR|l~^%krr{ z$C&DuZFV{sGTa?R&g%lZg9i;cd*59cksAT?4bP{>@eIN>@tcSOu?h) z={NW^-mx?1e>fJ#NurC4p?~^sXijLJ)J!i<>z6fe!pTwpLszfDrBQ$PGxn?q(WUox zxc31j6Y0C1vyf-}EKA@U^S3+I54{`2#sZm{u|AKy2%8^$FY}Q8I1Z`FD(IMe2O6y^ wSj1-vpB)xHr;x3A`3Jl=^(-__mqB)_NmUQR-&1YUg79<%?=ig3L3+CWe|Dgkr~m)} diff --git a/firewall/interception/ebpf/connection_listener/bpf_bpfeb.o b/firewall/interception/ebpf/connection_listener/bpf_bpfeb.o index 9545daa42e82509fae977097f5c4200b6351a09f..e8e7cdb7b368369546e5e3dbddb1b97f06c90825 100644 GIT binary patch delta 4602 zcmZ9Oe{7Z28OP6g+tMF^md)B;ndQ<;f7~DKEvU3oXs<;E2-AwV)lKCt(+#AUy5Rur zdT&s%{0w-aA-XMhhPf^?4px#inUkBz5+;yzrjCmLG~$*fq7umxwq zD0SVApbo!KG_tr8uGmsD{pA0{(sz&rsCgf z-90i{l1yfrh(q&RuT;a^#e}9*NeVuX?VezqhCjoPDYXdMaN${{s+B6v!jss0lwZoP zQqi|Ii~X-~6`X@Vg=26Y{s+83tJ*V4HO>k+Q~M{xmu#%(I2)QgA|Leegrg@<4R=i!&= zzyM)PjjzI+;S~I93>%fI6Z@N7n0;LyK1YVQYmo%^7wmKSQySl=@4ZUN+BHscVbV1z z?%((^;$1`<{v2jDHU03vVRlPRR;i{kYd;J#3%vn*9u8sW#!@vkabcFBFr2WAt?5?F zt*~TKeA?kV;Y>`cPzu5NE8#m}X617?{E+39FlqDcbZpvYc@@0N@>k)k<<;G&J1e6f2&~aG{GjDW;O|)845Ot)x6*Moz&42Pq?XVr(Py{_hv7riOg-bz z^<@O1t27Nix6FXi-&pR4Pg!QbC{LzzR$2Ic>OK5(@J9skO*ju$JkJ#BgE_jpWRdCue z%i=F9RqTHA;Ih^F0ds6wQa^0Qmqq42$}qENBHP@nxFfQ-FYxzL_}lw>Y50fOnTD5z z2W^D1dK*n|M?}ZXK*uwB&kM_|Ge@}jR-DB#2Q#2f!LM5u`>67RlKmKa8;Fo}}s%>qGWp*I*VkJcq$KGG!M2 zLoWldknt}m27;e}Z?gP-d^&`Sl=lOU%U@VKvyazV`wp1Q_(>#!aR*$4t@@n)aT*DmM3Ax)J&uZQ~Xyj z{fkn)h*1PHDax`wA()vI<+1+}PmTmuPsPV9rwEQMs<&g$V!uGEWRDxhFH!UCNQr-9 zF0V-Hf10m!MlxSuU@}q?C6<>A-&EcmU-c#V~ItrY8$>CQW9tl_u zQk6LAG`wZ{S0?p&lUrFGde5N3QPMOX8pHwRHn$p9oV2;fhE#b>? zJKfGBs1gRc73lg|YPG)1dF-E0+@S6)KASju z>)UWh@|S|WeuMJLu=@v<=-s?+y=+c(+Q1^Fccq_c8S*zAceLD~H_#1tEAOcIryVW+n;k9w{nI*QJM5e`pru3B(b8ea(Q<>sju!u; zju!u%qs9NY)xT8Uu(Xd_eXm3;1LU0!;&3L=iM`4@$?I581)8g0^c5;eAzyQ2>`|}G z>J6rS-~+R6ps{u#-Tad03NK9iD%if|=E^{1OD<>$_XaKgM!_@uGpi*C>6x>7?0>bq z)1|$R?+7XWGPs)l`fkp*-A3;Vo8rNjJ*`Y`FsaMT*kHAuGE;;1gevK|go~kXFu?&B#AQ5;=rjiFWU4yzrRX8Tx1v8ma;z4X3o&Ms?!kPNHZc9JfoT)H}gmiLWJ3=L{;?+Vkq@01=jHTzfVN|WB-rq7t8`@71A{cg&uF_YLP zOwEBVoj1K)Y3Dj&CJuC!PXu0%zhlA&+n8wY!LIUSfvtSN4ch5ri#2tA+x delta 4528 zcmYk9e{hsX8OL|uBqX6gLv2igZMbrzxw~9)sm$bJ0^~x{LTPG2`-4`h838A;v`yPc zQ+~Zytr|*T((dRm*v?!>hEnYx=L97qRc|cJLI5#N@F zQj1>7wwhGYuEnbm^ZTpkJloBgqNO@%t`#L0HjC$MgR$1)6I!>8O_wAReu$1We?3aw zezKUclqyNVr?K59t>E9lUsr0m@VOV1s#2;r4PU^%0VApWBObJ^O=JHPTnT63_uv?u zgZ~aM)v9&^zMf~lmd@*Muob_BYb^f`uCsgwUSatxt9$}x619`q*IJ%}Win!)h9AoF zQi}R7^I#H7D+pJHNpFLzv2RnpQr|SF4sACo#ki`T$SF3lI>q?)?;_44df^XXR!}_v z{}a9yPAe4w1N$gkMn_-3o`V--XJ83hB*cSN)=)-duY_qBiCb=lC5mEig;&CUOskp{ zqFXB9PMEV0@EZ65%U$rJmhp`c!ocTF_$kYG!9$kWmdNv#*TLVnd^dd5@_MD#ML)3lp7y)9^)@(A8vMBB#Fy=isa6ax&ph7YCk-IMqH*txTU3`2^-f z=$ukf4>!Sq8quBp!it@Ks8DWNk6cgaimpY!Ub+m=volB};LmtHy=z&;-z;iur6 zEI*CU3gIH_Y~oeGvN`OkKcJFnwzLiZC_&5N5oh6kFMlMX-{hG#f;i zG%G2}VgCi5TnVyw4HK4AOpYU}2eGHIpQBdZ4Ys7=B4vb3YPe$lw<@9kVdAU9{=YG> zn85zAWn^4B7CY_Z^4|Y zMjthYI@;^rq-GU?3DFM$mHSPn;GbJw2fuA*I#&2+Z=?zr^xrxaMSm8(SQ1bGXalbq+t|@D_(3 zcX(%MFn%!a#$l(zIQ)jgCmep;;qwmv+2Icy{>b5vXW1OT$<0yjPEaG%4^IQ-2#KO*aIa+ch5#Butm!>1fR=diQnrVkzaf6VBba7|Ic zlDNs?Tg{m@VL#$noP{Nvy-Ymd_-u3dX@~a~cu{+S69*kW?C_8CESIN>zv)!`%%r;# z`n1V*Rn?qz?3WyV*GzRKRyj*eIOn{%xZv4r&$*1!?CfWA<5*AkU&1EQw`6QX-(w3( zxJye%O>VG3C&sP~e&XqBbM0B*kJ7G>{0*hTN0mM%(;aX$ucR8X`l`~$Ti~>#xe3*< zqow_5UN4U+J-!^~hfewrwA5#;-lVjD>T`%=1;Z(RtyI?0@^v+Cbw=q4@t?5zveJL} zG(73lOZy9smiALtUsw8?T;DT!z3i7NsW)@i)+I1BktH$Hy7kH{!ya5rqIdG^Dg#M0 z0&TL-B^JM-yjJXqF zKui1CfW-Lil!(p-M6}e~fYkj}dH#s}SlEb&VWb*;fh-djEen};wD`|B8vo$JcKqdY zb*?@B^2s`<#h+}o9}J*Fa|TZ)q$7@&2F;FULc#xv40!up$~z?foAUL67XMyHi+`V^ z#eZN{`*a`;hGq?DX^?ibG#GZY_>VeT{0})={Eu1vn(~fGeb%X$_TyG}$_m6Gmp8

!JJ!ppqI(_3MtqnSLd*Op6hL= z+4y3}tlWFpQ#0nm-h{jrbLm6KURZj{g#7z-nHlh_bj8@PUtdx(Np;!S@fR+7m2ZJ^ z^oq%((lb1?Ir828m0KY`gl22X21T3h;d?5@r_8CjB-$Jq9vo}kw?liwS4{TBU+J_N z*uR!>$M+}osF~j1QJ%q%V8+6)~? oO7($`@{xSQ^37)EK+Al8%1UKg54L#2Q)b}cYH!c`CVMdSf5mn_WB>pF diff --git a/firewall/interception/ebpf/connection_listener/bpf_bpfel.o b/firewall/interception/ebpf/connection_listener/bpf_bpfel.o index e4f9f3f88655d6f1bc52b7d06af6de5fb4d59bfb..5241f58ebd540dab34c823871c8d4fafd3b05c6e 100644 GIT binary patch delta 4520 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 diff --git a/firewall/interception/ebpf/programs/bandwidth.c b/firewall/interception/ebpf/programs/bandwidth.c index b56ce763..04222353 100644 --- a/firewall/interception/ebpf/programs/bandwidth.c +++ b/firewall/interception/ebpf/programs/bandwidth.c @@ -105,7 +105,7 @@ int BPF_PROG(udp_sendmsg, struct sock *sk, struct msghdr *msg, size_t len) { struct sock_common *skc = &sk->__sk_common; // Create a key for the map and set all the nececery information. - struct sk_key key = {0}; + struct sk_key key = {0}; key.protocol = PROTOCOL_UDP; key.src_ip[0] = skc->skc_rcv_saddr; key.dst_ip[0] = skc->skc_daddr; @@ -134,7 +134,7 @@ int BPF_PROG(udp_recvmsg, struct sock *sk, struct msghdr *msg, size_t len, int f struct sock_common *skc = &sk->__sk_common; // Create a key for the map and set all the nececery information. - struct sk_key key = {0}; + struct sk_key key = {0}; key.protocol = PROTOCOL_UDP; key.src_ip[0] = skc->skc_rcv_saddr; key.dst_ip[0] = skc->skc_daddr; diff --git a/firewall/interception/ebpf/programs/monitor.c b/firewall/interception/ebpf/programs/monitor.c index b084a5d8..70bb19de 100644 --- a/firewall/interception/ebpf/programs/monitor.c +++ b/firewall/interception/ebpf/programs/monitor.c @@ -76,7 +76,7 @@ int BPF_PROG(tcp_connect, struct sock *sk) { tcp_info->ipVersion = 6; } - // Send event + // Send event bpf_ringbuf_submit(tcp_info, 0); return 0; }; @@ -95,15 +95,15 @@ int BPF_PROG(udp_v4_connect, struct sock *sk) { return 0; } - // Allocate space for the event. + // Allocate space for the event. struct Event *udp_info; udp_info = bpf_ringbuf_reserve(&pm_connection_events, sizeof(struct Event), 0); if (!udp_info) { return 0; } - // Read PID - udp_info->pid = __builtin_bswap32((u32)bpf_get_current_pid_tgid()); + // Read PID (Careful: This is the Thread Group ID in kernel speak!) + udp_info->pid = __builtin_bswap32((u32)(bpf_get_current_pid_tgid() >> 32)); // Set src and dist ports udp_info->sport = __builtin_bswap16(sk->__sk_common.skc_num); @@ -119,7 +119,7 @@ int BPF_PROG(udp_v4_connect, struct sock *sk) { // Set protocol. No way to detect udplite for ipv4 udp_info->protocol = UDP; - // Send event + // Send event bpf_ringbuf_submit(udp_info, 0); return 0; } @@ -138,21 +138,21 @@ int BPF_PROG(udp_v6_connect, struct sock *sk) { return 0; } - // Make sure its udp6 socket + // Make sure its udp6 socket struct udp6_sock *us = bpf_skc_to_udp6_sock(sk); if (!us) { return 0; } - // Allocate space for the event. + // Allocate space for the event. struct Event *udp_info; udp_info = bpf_ringbuf_reserve(&pm_connection_events, sizeof(struct Event), 0); if (!udp_info) { return 0; } - // Read PID - udp_info->pid = __builtin_bswap32((u32)bpf_get_current_pid_tgid()); + // Read PID (Careful: This is the Thread Group ID in kernel speak!) + udp_info->pid = __builtin_bswap32((u32)(bpf_get_current_pid_tgid() >> 32)); // Set src and dist ports udp_info->sport = __builtin_bswap16(sk->__sk_common.skc_num); @@ -176,7 +176,7 @@ int BPF_PROG(udp_v6_connect, struct sock *sk) { udp_info->protocol = UDPLite; } - // Send event + // Send event bpf_ringbuf_submit(udp_info, 0); return 0; } \ No newline at end of file