commits

commits@lists.open-mesh.org

1 participants
12414 discussions

[linux-merge]linux integration; annotated tag, v5.3-rc8, created. v5.3-rc8
by postmaster＠open-mesh.org 08 Sep '19

08 Sep '19

The annotated tag, v5.3-rc8 has been created at ed9a681803ae0aac98b7932541dde8f17e3da543 (tag) tagging f74c2bb98776e2de508f4d607cd519873065118e (commit) replaces v5.3-rc7 tagged by Linus Torvalds on Sun Sep 8 13:33:22 2019 -0700 - Shortlog ------------------------------------------------------------ Linux 5.3-rc8 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl11ZZIeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGUEYH/3dOHJ00BhSQNL39 KSk1cuVq0UHIGcdOK+qp+3YLzaO6rpKJ7HYuQQ4ddLJwZ8wWGUZ03eDkp689axkb XMMhcbuaQ5AZT017UPPU/9ECqJtKmLHZEm3y4cU2ybFhI76eDD4S07xfC/L5h/xc aWyRRPBQhjZHIdCejg9eSJNMQJycW7l7npMEBeE9qDRmCWxZUHten2jBcL0XpXPw BJ0T7XKFHsbh/RP7K/7GHFxVZXPO8rl8pIlRaX+3bKqgUV721LwR+gyHbFYYntlC 7tfL4KcG9lQvCoUuh1cMtnZuMzc88TGdI5xb7Y1Gq6HtR7LTLLrfpp3nwqst912u xq8iHpw= =WnfD -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.3-rc7, created. v5.3-rc7
by postmaster＠open-mesh.org 02 Sep '19

02 Sep '19

The annotated tag, v5.3-rc7 has been created at 980d0783eab87f4dea7f03737641ead5121ec738 (tag) tagging 089cf7f6ecb266b6a4164919a2e69bd2f938374a (commit) replaces v5.3-rc6 tagged by Linus Torvalds on Mon Sep 2 09:57:50 2019 -0700 - Shortlog ------------------------------------------------------------ Linux 5.3-rc7 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl1tSg4eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG018IAJGV7SbXggW/iC+e cSMlo8kPnuU7dKCUW+ngXnZY1xuDYWPhXMX9+yDYf2NfMYGdDGYZ+GRjSFim816w HsNsovnYiyxhkh+wA/DmZPWKdTgYrIxbPRO+MlO5ZfbxWNaLgSjqirz0iBITSv3S r2XLmFw8GVACv/GkNGrWBM53wpkJLHzvwaV9hg6dr8HFDipaEn7vEY9/LAN3S3fw reVwW6Q4N4+RSofM1eIGgAZsTYbYBDfri94mRQZ3y+Q8EkRGkJ270WKA0OAVFYS7 KA6nrjvGSYVtmDK3HORjbINQn3bXwIKeMZHl15c+LGM9ePwoHbsN3+smBswRX+R3 JDQjkhY= =DV37 -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_netlink_get_ifindex() Sven Eckelmann (2): batman-adv: Only read OGM tvlv_len after buffer len check batman-adv: Only read OGM2 tvlv_len after buffer len check ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master: batctl: Add missing detached license text for ISC (3c98a91)
by postmaster＠open-mesh.org 02 Sep '19

02 Sep '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 3c98a91c7989b22f77869bcb089d6353d6fe2954 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Sep 2 15:48:28 2019 +0200 batctl: Add missing detached license text for ISC Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3c98a91c7989b22f77869bcb089d6353d6fe2954 LICENSES/deprecated/ISC | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/LICENSES/deprecated/ISC b/LICENSES/deprecated/ISC new file mode 100644 index 0000000..8953c31 --- /dev/null +++ b/LICENSES/deprecated/ISC @@ -0,0 +1,24 @@ +Valid-License-Identifier: ISC +SPDX-URL: https://spdx.org/licenses/ISC.html +Usage-Guide: + To use the ISC License put the following SPDX tag/value pair into a + comment according to the placement guidelines in the licensing rules + documentation: + SPDX-License-Identifier: ISC +License-Text: + +ISC License + +Copyright (c) <year> <copyright holders> + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

1 0

[batman-adv] maint, master: batman-adv: Only read OGM2 tvlv_len after buffer len check (18f77da3)
by postmaster＠open-mesh.org 01 Sep '19

01 Sep '19

Repository : ssh://git@open-mesh.org/batman-adv On branches: maint,master >--------------------------------------------------------------- commit 18f77da3761c5550f42a2d131f0fe5cac62e022d Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Aug 23 14:34:28 2019 +0200 batman-adv: Only read OGM2 tvlv_len after buffer len check Multiple batadv_ogm2_packet can be stored in an skbuff. The functions batadv_v_ogm_send_to_if() uses batadv_v_ogm_aggr_packet() to check if there is another additional batadv_ogm2_packet in the skb or not before they continue processing the packet. The length for such an OGM2 is BATADV_OGM2_HLEN + batadv_ogm2_packet->tvlv_len. The check must first check that at least BATADV_OGM2_HLEN bytes are available before it accesses tvlv_len (which is part of the header. Otherwise it might try read outside of the currently available skbuff to get the content of tvlv_len. Fixes: 667996ebeab4 ("batman-adv: OGMv2 - implement originators logic") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 18f77da3761c5550f42a2d131f0fe5cac62e022d net/batman-adv/bat_v_ogm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index fad95ef6..bc06e3cd 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -631,17 +631,23 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, * batadv_v_ogm_aggr_packet() - checks if there is another OGM aggregated * @buff_pos: current position in the skb * @packet_len: total length of the skb - * @tvlv_len: tvlv length of the previously considered OGM + * @ogm2_packet: potential OGM2 in buffer * * Return: true if there is enough space for another OGM, false otherwise. */ -static bool batadv_v_ogm_aggr_packet(int buff_pos, int packet_len, - __be16 tvlv_len) +static bool +batadv_v_ogm_aggr_packet(int buff_pos, int packet_len, + const struct batadv_ogm2_packet *ogm2_packet) { int next_buff_pos = 0; - next_buff_pos += buff_pos + BATADV_OGM2_HLEN; - next_buff_pos += ntohs(tvlv_len); + /* check if there is enough space for the header */ + next_buff_pos += buff_pos + sizeof(*ogm2_packet); + if (next_buff_pos > packet_len) + return false; + + /* check if there is enough space for the optional TVLV */ + next_buff_pos += ntohs(ogm2_packet->tvlv_len); return (next_buff_pos <= packet_len) && (next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES); @@ -818,7 +824,7 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb, ogm_packet = (struct batadv_ogm2_packet *)skb->data; while (batadv_v_ogm_aggr_packet(ogm_offset, skb_headlen(skb), - ogm_packet->tvlv_len)) { + ogm_packet)) { batadv_v_ogm_process(skb, ogm_offset, if_incoming); ogm_offset += BATADV_OGM2_HLEN;

1 0

[batman-adv] master: Merge branch 'maint' (8a4c1058)
by postmaster＠open-mesh.org 01 Sep '19

01 Sep '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 8a4c10586a0fa6cd4ad2b92e9f6cc186e9efb5f6 Merge: 9b5ed2dd 18f77da3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 1 08:47:17 2019 +0200 Merge branch 'maint' >--------------------------------------------------------------- 8a4c10586a0fa6cd4ad2b92e9f6cc186e9efb5f6 net/batman-adv/bat_iv_ogm.c | 20 +++++++++++++------- net/batman-adv/bat_v_ogm.c | 18 ++++++++++++------ 2 files changed, 25 insertions(+), 13 deletions(-)

1 0

[batman-adv] master: batman-adv: Add Sven to MAINTAINERS file (bcadeaa3)
by postmaster＠open-mesh.org 01 Sep '19

01 Sep '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit bcadeaa38b307e44f825f3cf0a68496129bc767e Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Fri Aug 16 10:26:26 2019 +0200 batman-adv: Add Sven to MAINTAINERS file Sven is taking care of tracking our patches and merging most of them in our tree. Let's add him to the MAINTAINERS file so he will get all patch e-mails. Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Acked-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- bcadeaa38b307e44f825f3cf0a68496129bc767e MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4b1b53d5..9f0f421e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2,6 +2,7 @@ BATMAN ADVANCED M: Marek Lindner <mareklindner(a)neomailbox.ch> M: Simon Wunderlich <sw(a)simonwunderlich.de> M: Antonio Quartulli <a(a)unstable.cc> +M: Sven Eckelmann <sven(a)narfation.org> L: b.a.t.m.a.n(a)lists.open-mesh.org (moderated for non-subscribers) W: https://www.open-mesh.org/ B: https://www.open-mesh.org/projects/batman-adv/issues

1 0

[batman-adv] maint, master: batman-adv: Only read OGM tvlv_len after buffer len check (07b6051e)
by postmaster＠open-mesh.org 01 Sep '19

01 Sep '19

Repository : ssh://git@open-mesh.org/batman-adv On branches: maint,master >--------------------------------------------------------------- commit 07b6051ebcfaa7ea89b4f278eca2ff4070d29e56 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Aug 23 14:34:27 2019 +0200 batman-adv: Only read OGM tvlv_len after buffer len check Multiple batadv_ogm_packet can be stored in an skbuff. The functions batadv_iv_ogm_send_to_if()/batadv_iv_ogm_receive() use batadv_iv_ogm_aggr_packet() to check if there is another additional batadv_ogm_packet in the skb or not before they continue processing the packet. The length for such an OGM is BATADV_OGM_HLEN + batadv_ogm_packet->tvlv_len. The check must first check that at least BATADV_OGM_HLEN bytes are available before it accesses tvlv_len (which is part of the header. Otherwise it might try read outside of the currently available skbuff to get the content of tvlv_len. Fixes: 0b6aa0d43767 ("batman-adv: tvlv - basic infrastructure") Reported-by: syzbot+355cab184197dbbfa384(a)syzkaller.appspotmail.com Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Antonio Quartulli <a(a)unstable.cc> >--------------------------------------------------------------- 07b6051ebcfaa7ea89b4f278eca2ff4070d29e56 net/batman-adv/bat_iv_ogm.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 240ed709..d78938e3 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -277,17 +277,23 @@ static u8 batadv_hop_penalty(u8 tq, const struct batadv_priv *bat_priv) * batadv_iv_ogm_aggr_packet() - checks if there is another OGM attached * @buff_pos: current position in the skb * @packet_len: total length of the skb - * @tvlv_len: tvlv length of the previously considered OGM + * @ogm_packet: potential OGM in buffer * * Return: true if there is enough space for another OGM, false otherwise. */ -static bool batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len, - __be16 tvlv_len) +static bool +batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len, + const struct batadv_ogm_packet *ogm_packet) { int next_buff_pos = 0; - next_buff_pos += buff_pos + BATADV_OGM_HLEN; - next_buff_pos += ntohs(tvlv_len); + /* check if there is enough space for the header */ + next_buff_pos += buff_pos + sizeof(*ogm_packet); + if (next_buff_pos > packet_len) + return false; + + /* check if there is enough space for the optional TVLV */ + next_buff_pos += ntohs(ogm_packet->tvlv_len); return (next_buff_pos <= packet_len) && (next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES); @@ -315,7 +321,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, /* adjust all flags and log packets */ while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len, - batadv_ogm_packet->tvlv_len)) { + batadv_ogm_packet)) { /* we might have aggregated direct link packets with an * ordinary base packet */ @@ -1704,7 +1710,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, /* unpack the aggregated packets and process them one by one */ while (batadv_iv_ogm_aggr_packet(ogm_offset, skb_headlen(skb), - ogm_packet->tvlv_len)) { + ogm_packet)) { batadv_iv_ogm_process(skb, ogm_offset, if_incoming); ogm_offset += BATADV_OGM_HLEN;

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20190830, created. batadv-next-for-davem-20190830
by postmaster＠open-mesh.org 30 Aug '19

30 Aug '19

The annotated tag, batadv-next-for-davem-20190830 has been created at cc66aa12cfe81618443a3c6761ce32f77aba6e29 (tag) tagging 2a813f1392205654aea28098f3bcc3e6e2478fa5 (commit) replaces v5.3-rc1 tagged by Simon Wunderlich on Fri Aug 30 09:26:00 2019 +0200 - Shortlog ------------------------------------------------------------ This maintenance patchset includes the following patches: - Add Sven to the MAINTAINERS file, by Simon Wunderlich -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl1oz4gWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoRRtEADUZyfBIpfc2w7656WwHujeDhoe Jb+EKqqunUxhqaOKHjwcoltpL1h0Q5apzuBUr23LiO6Lnml+BiLgpg9LjaDnbfGj V9yMsnqu1TcaTuzqiIWqr2KFvP4Ck5EnUTagQS+az1t9nV3mBREQxgAqHdlg1eIZ 2afLaj3DyOcjAcAZDr3LTvbH9k5PIojOXK4FvDrB+Zzhq2I7w80BCQvGxtsdw/ny Asro1pta5LQylykU/iqgvGQf148OgEV/CWYQZ75RRlOYsfiqM/iRRF3Kt8Q7UpKy eN3Kn6jC5YLAcDPdrYHOIvnHJ65v3OO/BFQAO9BPMZVIRz9o/MK07Jtom7sBERkh CiNvq8rfi/YFcogPTqtQIBflwT3ve8UD2qhkE1XUyOhebVjxNdOoOfIa98sHxWJB TyoUYsXYhQ/Dk10CT0j/FTPyEn2dfZTBDfLKDLPiXPCoVb9J3F4dlwBMvubIBMDV cT4psppqU8HOpqLyFMCV+fJ36qIAyFqobE+Jtbd7Qgp04bU2P2osuVs7K5CvD2bM 8EewEHyHF5kr7YpB4rAuhEPAA/u9hioRlg/k9OudKIKEdyAS5Nj0/5waFKmPPKT2 ONY5hQsbBQ8/7OFWSarpKW38hMRyyDu9aA4j4ZIFqutCwIrwMTHHmWZbTNZW1cHR pJ3Vcm58an4XwfjhAQ== =LAvx -----END PGP SIGNATURE----- Linus Lüssing (2): batman-adv: BATMAN_V: introduce per hard-iface OGMv2 queues batman-adv: BATMAN_V: aggregate OGMv2 packets Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (1): batman-adv: Replace usage of strlcpy with strscpy ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20190830, created. batadv-net-for-davem-20190830
by postmaster＠open-mesh.org 30 Aug '19

30 Aug '19

The annotated tag, batadv-net-for-davem-20190830 has been created at 55821681f60c2d17c8e055c5c6beeb6f71ca596c (tag) tagging 0ff0f15a32c093381ad1abc06abe85afb561ab28 (commit) replaces v5.3-rc1 tagged by Simon Wunderlich on Fri Aug 30 09:23:17 2019 +0200 - Shortlog ------------------------------------------------------------ Here are two batman-adv bugfixes: - Fix OGM and OGMv2 header read boundary check, by Sven Eckelmann (2 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl1ozuUWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoQt8D/0U5gjwcMbqt5W9UekW6Ci+Up6I jJ3/hoZUD8lLWeKkYkSHdTUElpy0bLdLVGjUBJIZxM+UrCuKSTt0u04PAWN80JhZ JdRblj0qicdwKll0Oyw08Ind5FKLLgDjN30z/9mDDRguMxJavowdBtmb5y/ybbiU o4M/fnSkhUwiRwWK3cUKq1SVUrjAOg/C3fE7zVrn8XzRxH4TGvReCZTLKZZa9cGJ m6Le68zT/JOrGe3O0uwQXbHFl+eqKYqNfrV4GBhL6saqLTrr3naiXjIP5YfyNONm U0GRjmXWFQwfwwNxYeLqspwrg8VVuhy84H2FnrieY5kyJVQuX8637XZn9HDDxtkl 42TQ/jtogZ6GVamhN4c7HpvITeoPaVx8HLUJ3TPU89c7Va19D/XFBSKBL7nGADaM FK0s8KZHXVkY18Lh4ak6dttjyZAnv7aNlpW7h0GyXJ0vTO6bU+QAQNOGZsO1romH BHlX24+Y9G1PxtDHXE+fvEH4uolXuyOG6bgGVAEfWGLQdZoX5N9VjcRvP+BE7qUF O4+I/sTVLXI65FYy/cRE+XwckXumZiq/PHqKHY7KB51Z0ZiMsi4yy0joVm64t/22 lm6922MP+r3vKudvMev08SKqFEcPze0JkwYE8XuirgnnjRsE+e1VJN2Z1j7yQKcI K9gpMw7UREKglnwrhQ== =hD2g -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_netlink_get_ifindex() Sven Eckelmann (4): batman-adv: Fix netlink dumping of all mcast_flags buckets batman-adv: Fix deletion of RTR(4|6) mcast list entries batman-adv: Only read OGM tvlv_len after buffer len check batman-adv: Only read OGM2 tvlv_len after buffer len check ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.3-rc6, created. v5.3-rc6
by postmaster＠open-mesh.org 25 Aug '19

25 Aug '19

The annotated tag, v5.3-rc6 has been created at add840e44afed5b308140f6d3383921335ce0a59 (tag) tagging a55aa89aab90fae7c815b0551b07be37db359d76 (commit) replaces v5.3-rc5 tagged by Linus Torvalds on Sun Aug 25 12:01:29 2019 -0700 - Shortlog ------------------------------------------------------------ Linux 5.3-rc6 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl1i2wkeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGcDQIAJINYON5WdDSFDpp htva213hSIxYLix8Dc4cTMk8qT/P2MAj9pPYERuLwIxWZlfbduW6Fxy8bJANZ7k3 4cJ/IbmA5M5ZIaOJTTL45w8H0CMR/4mdPl5rb5k/Wkh449Cj101gZLlh0FEtR5zG uDJecKSuHjH1ikySk6+zmRG5X+lq6wNY8NkuBtfwAwLffFc0ljQHwPUMJ8ojgqt/ p3ChNgtb/I6U6ExITlyktKdP59bAoHAoBiKKFZWw5yJWgXE2q4Sv9nT4Btkr5KdJ 9mnWnSaSLwptNCOtU4tKLwFIZP2WoVXGPNxxq4XLoTEuieXCqmikhc9tSSTwk+Tp CKHN6wU= =JkJ4 -----END PGP SIGNATURE----- Sven Eckelmann (2): batman-adv: Fix netlink dumping of all mcast_flags buckets batman-adv: Fix deletion of RTR(4|6) mcast list entries ----------------------------------------------------------------------- -- linux integration

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits