commits April 2022

commits@lists.open-mesh.org

1 participants
27 discussions

[batctl] maint's head updated: batctl: ping: Skip sleep after last packet (47d0632)
by postmaster＠open-mesh.org 26 Apr '22

26 Apr '22

Repository : ssh://git@diktynna/batctl Branch 'maint' now includes: 47d0632 batctl: ping: Skip sleep after last packet

1 0

[batctl] master: Merge branch 'maint' (447ec66)
by postmaster＠open-mesh.org 26 Apr '22

26 Apr '22

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 447ec66a7e5df2900f8bda946046b46bf3924fcd Merge: fc47792 47d0632 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Apr 26 14:16:41 2022 +0200 Merge branch 'maint' >--------------------------------------------------------------- 447ec66a7e5df2900f8bda946046b46bf3924fcd

1 0

[batctl] master: batctl: ping: Skip sleep after last packet (fc47792)
by postmaster＠open-mesh.org 26 Apr '22

26 Apr '22

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit fc477927dad5017af004712bb83a2cd0634043fb Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Apr 22 11:07:37 2022 +0200 batctl: ping: Skip sleep after last packet The -i option for ping is documented as interval between ping requests. But the sleep was also applied after all the requested pings already sent out. As result, the user had to wait additional time until the statistics for the (limited) ping test was printed. Just skip the last sleep in case there will be no next ping packet to avoid this problem. Reported-by: Roman Le bg <roman(a)romanlebg.fr> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- fc477927dad5017af004712bb83a2cd0634043fb ping.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ping.c b/ping.c index 7565dcd..3681e7e 100644 --- a/ping.c +++ b/ping.c @@ -282,6 +282,10 @@ read_packet: } sleep: + /* skip last sleep in case no more packets will be sent out */ + if (loop_count == 0) + continue; + if (loop_interval > 0) sleep(loop_interval); else if ((tv.tv_sec != 0) || (tv.tv_usec != 0))

1 0

[batctl] master: batctl: ping: Skip sleep after last packet (47d0632)
by postmaster＠open-mesh.org 26 Apr '22

26 Apr '22

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 47d063213d5843d1ca33c557bd4a874db3e90e9e Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Apr 22 11:14:08 2022 +0200 batctl: ping: Skip sleep after last packet The -i option for ping is documented as interval between ping requests. But the sleep was also applied after all the requested pings already sent out. As result, the user had to wait additional time until the statistics for the (limited) ping test was printed. Just skip the last sleep in case there will be no next ping packet to avoid this problem. Reported-by: Roman Le bg <roman(a)romanlebg.fr> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 47d063213d5843d1ca33c557bd4a874db3e90e9e ping.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ping.c b/ping.c index 7565dcd..3681e7e 100644 --- a/ping.c +++ b/ping.c @@ -282,6 +282,10 @@ read_packet: } sleep: + /* skip last sleep in case no more packets will be sent out */ + if (loop_count == 0) + continue; + if (loop_interval > 0) sleep(loop_interval); else if ((tv.tv_sec != 0) || (tv.tv_usec != 0))

1 0

[linux-merge]linux integration; annotated tag, v5.18-rc4, created. v5.18-rc4
by postmaster＠open-mesh.org 24 Apr '22

24 Apr '22

The annotated tag, v5.18-rc4 has been created at 83c145a5040cdf3d0f91e71580ace5cdabb54b46 (tag) tagging af2d861d4cd2a4da5137f795ee3509e6f944a25b (commit) replaces v5.18-rc3 tagged by Linus Torvalds on Sun Apr 24 14:51:22 2022 -0700 - Shortlog ------------------------------------------------------------ Linux 5.18-rc4 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmJlxloeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGBoIH/3b1GGuTBq8XndVl 1EaCJe/3auE8cHklNpLyTWsQY7He9CcIe4b0fGmtkUlwqAE6E5fUPfqwzjjb3eux MDPYYKbnjm/jA73dbTbr3lxMlc/caZpuRrwwuek0+vS0DLYhP917NmDvGX8q3l5U 84RCEHztrTmzOivS0BwNJV1XFpcqnODTDN4zNR43o9ZY9tVY4/OqL0+lcQIHM2Nh 6urEzWMMi+BRGaOqdgtt+NxmgKQNTRAkPan6FpJloRSxrOzl4LiYBKMfE2iyisND 91i1CGvOQjaQNIw9JYNvtSWGawMb+obTyCFHyj1Qm7LwD0VAZ+FQrvrdGz4rJrAY Sq01XYs= =Rl6l -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.18-rc3, created. v5.18-rc3
by postmaster＠open-mesh.org 17 Apr '22

17 Apr '22

The annotated tag, v5.18-rc3 has been created at 89a9eba652fe348461301ef785c3e274bc491879 (tag) tagging b2d229d4ddb17db541098b83524d901257e93845 (commit) replaces v5.18-rc2 tagged by Linus Torvalds on Sun Apr 17 13:57:31 2022 -0700 - Shortlog ------------------------------------------------------------ Linux 5.18-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmJcfzseHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGFfUH/RRwMYnMwW+56+Xl 6LYZJo+igzH0lJMBmGEwQrQVfch/Ufkx2fStBycIGVmHskV8aFPQHKkN+LzZ3dnX NJj+g+hDhfpU0LYin9UiCzoHIRkcPPhvqY3TWlZvsyh2xSpwPew9ixXKlIJvXk3A 7OBtFxvrQhYrxzapbiWlBIhS0VXndO5nwJQGDS0tPZyuSPqXHwF6ia+RabvdL/SU V4gpJXZ2NeRd7gT9vpKerjSJ8ILxL89nwvhjnC0xY9iIwDzcxM0F6px28RPnYuQA SY9PpXbLTtHPcmux5xc46udeUx7yyBwX+wgmwlPTjrc1TuGXXQA7bTfDUzvujJuZ QS1Z1a0= =POzD -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] maint's head updated: batman-adv: Don't skb_split skbuffs with frag_list (d467720a)
by postmaster＠open-mesh.org 17 Apr '22

17 Apr '22

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: d467720a batman-adv: Don't skb_split skbuffs with frag_list

1 0

[batman-adv] master: batman-adv: Don't skb_split skbuffs with frag_list (d467720a)
by postmaster＠open-mesh.org 17 Apr '22

17 Apr '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit d467720acaf1b22b0cee58144eeaf9ef6c5e285c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Apr 16 14:24:34 2022 +0200 batman-adv: Don't skb_split skbuffs with frag_list The receiving interface might have used GRO to receive more fragments than MAX_SKB_FRAGS fragments. In this case, these will not be stored in skb_shinfo(skb)->frags but merged into the frag list. batman-adv relies on the function skb_split to split packets up into multiple smaller packets which are not larger than the MTU on the outgoing interface. But this function cannot handle frag_list entries and is only operating on skb_shinfo(skb)->frags. If it is still trying to split such an skb and xmit'ing it on an interface without support for NETIF_F_FRAGLIST, then validate_xmit_skb() will try to linearize it. But this fails due to inconsistent information. And __pskb_pull_tail will trigger a BUG_ON after skb_copy_bits() returns an error. In case of entries in frag_list, just linearize the skb before operating on it with skb_split(). Reported-by: Felix Kaechele <felix(a)kaechele.ca> Tested-by: Felix Kaechele <felix(a)kaechele.ca> Fixes: 9de347143505 ("batman-adv: layer2 unicast packet fragmentation") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d467720acaf1b22b0cee58144eeaf9ef6c5e285c net/batman-adv/fragmentation.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 0899a729..c120c7c6 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -475,6 +475,17 @@ int batadv_frag_send_packet(struct sk_buff *skb, goto free_skb; } + /* GRO might have added fragments to the fragment list instead of + * frags[]. But this is not handled by skb_split and must be + * linearized to avoid incorrect length information after all + * batman-adv fragments were created and submitted to the + * hard-interface + */ + if (skb_has_frag_list(skb) && __skb_linearize(skb)) { + ret = -ENOMEM; + goto free_skb; + } + /* Create one header to be copied to all fragments */ frag_header.packet_type = BATADV_UNICAST_FRAG; frag_header.version = BATADV_COMPAT_VERSION;

1 0

[batman-adv] master: Merge branch 'maint' (e009ae23)
by postmaster＠open-mesh.org 17 Apr '22

17 Apr '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit e009ae23675ec3109906d1a997a0516f0d823173 Merge: 350adcae d467720a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 17 23:40:00 2022 +0200 Merge branch 'maint' >--------------------------------------------------------------- e009ae23675ec3109906d1a997a0516f0d823173 net/batman-adv/fragmentation.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

1 0

[linux-merge]linux integration; annotated tag, v4.9.310, created. v4.9.310
by postmaster＠open-mesh.org 17 Apr '22

17 Apr '22

The annotated tag, v4.9.310 has been created at e219eab37158a19583d6e977cbd0a0a0c6ec5ddf (tag) tagging 6348ae07835a05f78ab3ada1f7293665a410a273 (commit) replaces v4.9.309 tagged by Greg Kroah-Hartman on Tue Apr 12 07:52:29 2022 +0200 - Shortlog ------------------------------------------------------------ This is the 4.9.310 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmJVE50ACgkQONu9yGCS aT4mRQ/9FdAGtRk9Q4Rp8EcNqHBx8LxJaAoBHZdcRZnOp09SXYuigNlunxetcK8w ndHpz9oq/JRumuO7gsm9t46rkmiQahjVPVlmMY1PwoBzoKzyOfqGWy6ui//cxvG3 WAheQCLIbI5xCho+rpJc2zRgEdnLx3FIbmuQ+rcMb/SrreDo+U7FXJUVUmMDzLQX uMzaQrrBltNzETg/ScmUBsFAJjcGFnA3PjDZfMJdKexhfOFyn2m3ViSesdn/qWl/ uTcRuqc7li+rRbVQKMaFktPQduGwKZnr/C4Z3quAh0JRHxDplWaNuyabf33i7etv xGBcqz10dG6aRzTtVhrjkpflTosCWiT+cCW51Fgfz80qB2KXAniykGhGb6KKaAzf 6frlB66gVc3NOEp1ECBUu/8uzsMppdWPAcWHiyGXLhv4NrmCBvPGqcLPSc4o1ZLG h3f78+aFDOxH7YD2+J1zxHi/voy8ZwqEoZUfc/HEfVjm6LSDAmVJHzggCQ1CZ2vr Cj0YJ9mqGxm7UFT0Itfy4l5btoJ0x8+v8pzq7yFRHn1AimoWSrYyYJkFKIgSpKrE OxRGvixPGV8kNiA3/Xh8BNVRWH8ciZZGcL2ihi25rNGQoxAK/vrfhBkasxqgbyMv 1XUjUhqiDCkTWs623aNHirvl8dApoT1LDR5IEtCp1UzaVfjY9wk= =paQa -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2022