commits March 2016

commits@lists.open-mesh.org

1 participants
51 discussions

[batman-adv] master: Merge branch 'next' (27a4cc2)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 27a4cc24e2a2be78ecf1ffcfac1073bcc43c1c7e Merge: d1c596a 9e5e037 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Mar 20 18:24:38 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 27a4cc24e2a2be78ecf1ffcfac1073bcc43c1c7e net/batman-adv/originator.c | 1 + 1 file changed, 1 insertion(+)

7 years

[batman-adv] next: batman-adv: init neigh node last seen field (9e5e037)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 9e5e03716c0e6a12e4bb466a042bc519b55734bb Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Mar 11 16:01:09 2016 +0100 batman-adv: init neigh node last seen field Fixes: 58232977fbaf ("basic routing code complete (hases and ring buffer added) -> needs testing !") Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> [sven(a)narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 9e5e03716c0e6a12e4bb466a042bc519b55734bb net/batman-adv/originator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index e4cbb07..d52f67a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -663,6 +663,7 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node, ether_addr_copy(neigh_node->addr, neigh_addr); neigh_node->if_incoming = hard_iface; neigh_node->orig_node = orig_node; + neigh_node->last_seen = jiffies; /* extra reference for return */ kref_init(&neigh_node->refcount);

7 years

[batman-adv] master: batman-adv: Remove hdr_size skb size check in batadv_interface_rx (d1c596a)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d1c596a379985d56c5e916e57254bffb71780a38 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 28 11:38:52 2016 +0100 batman-adv: Remove hdr_size skb size check in batadv_interface_rx The callers of batadv_interface_rx have to make sure that enough data can be pulled from the skb when they read the batman-adv header. The only two functions using it are either calling pskb_may_pull with hdr_size directly (batadv_recv_bcast_packet) or indirectly via batadv_check_unicast_packet (batadv_recv_unicast_packet). Reported-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d1c596a379985d56c5e916e57254bffb71780a38 net/batman-adv/soft-interface.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index bb167fe..1c1ed5a 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -413,10 +413,6 @@ void batadv_interface_rx(struct net_device *soft_iface, batadv_bcast_packet = (struct batadv_bcast_packet *)skb->data; is_bcast = (batadv_bcast_packet->packet_type == BATADV_BCAST); - /* check if enough space is available for pulling, and pull */ - if (!pskb_may_pull(skb, hdr_size)) - goto dropped; - skb_pull_rcsum(skb, hdr_size); skb_reset_mac_header(skb);

7 years

[batman-adv] master: batman-adv: Remove unused parameter recv_if of batadv_interface_rx (4c0f1f6)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 4c0f1f63a9787def6ffd0f6b8cb2eeffbc44e15b Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 28 11:38:51 2016 +0100 batman-adv: Remove unused parameter recv_if of batadv_interface_rx Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4c0f1f63a9787def6ffd0f6b8cb2eeffbc44e15b net/batman-adv/routing.c | 5 ++--- net/batman-adv/soft-interface.c | 5 ++--- net/batman-adv/soft-interface.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 45093c6..2008b8a 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -904,7 +904,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, hdr_size)) goto rx_success; - batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size, + batadv_interface_rx(recv_if->soft_iface, skb, hdr_size, orig_node); rx_success: @@ -1114,8 +1114,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, goto rx_success; /* broadcast for me */ - batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size, - orig_node); + batadv_interface_rx(recv_if->soft_iface, skb, hdr_size, orig_node); rx_success: ret = NET_RX_SUCCESS; diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index cd8f80d..bb167fe 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -385,7 +385,6 @@ end: * batadv_interface_rx - receive ethernet frame on local batman-adv interface * @soft_iface: local interface which will receive the ethernet frame * @skb: ethernet frame for @soft_iface - * @recv_if: interface on which the batman-adv packet was received * @hdr_size: size of already parsed batman-adv header * @orig_node: originator from which the batman-adv packet was sent * @@ -400,8 +399,8 @@ end: * isolated clients. */ void batadv_interface_rx(struct net_device *soft_iface, - struct sk_buff *skb, struct batadv_hard_iface *recv_if, - int hdr_size, struct batadv_orig_node *orig_node) + struct sk_buff *skb, int hdr_size, + struct batadv_orig_node *orig_node) { struct batadv_bcast_packet *batadv_bcast_packet; struct batadv_priv *bat_priv = netdev_priv(soft_iface); diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 417d30a..15c2884 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -27,8 +27,8 @@ struct sk_buff; int batadv_skb_head_push(struct sk_buff *skb, unsigned int len); void batadv_interface_rx(struct net_device *soft_iface, - struct sk_buff *skb, struct batadv_hard_iface *recv_if, - int hdr_size, struct batadv_orig_node *orig_node); + struct sk_buff *skb, int hdr_size, + struct batadv_orig_node *orig_node); struct net_device *batadv_softif_create(const char *name); void batadv_softif_destroy_sysfs(struct net_device *soft_iface); bool batadv_softif_is_valid(const struct net_device *net_dev);

7 years

[batman-adv] master: batman-adv: Add kernel-doc for batadv_interface_rx (a90f291)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a90f291d215c1e70d71a1dcd4d58540ab532b250 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 28 11:38:50 2016 +0100 batman-adv: Add kernel-doc for batadv_interface_rx Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- a90f291d215c1e70d71a1dcd4d58540ab532b250 net/batman-adv/soft-interface.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 6746910..cd8f80d 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -381,6 +381,24 @@ end: return NETDEV_TX_OK; } +/** + * batadv_interface_rx - receive ethernet frame on local batman-adv interface + * @soft_iface: local interface which will receive the ethernet frame + * @skb: ethernet frame for @soft_iface + * @recv_if: interface on which the batman-adv packet was received + * @hdr_size: size of already parsed batman-adv header + * @orig_node: originator from which the batman-adv packet was sent + * + * Sends a ethernet frame to the receive path of the local @soft_iface. + * skb->data has still point to the batman-adv header with the size @hdr_size. + * The caller has to have parsed this header already and made sure that at least + * @hdr_size bytes are still available for pull in @skb. + * + * The packet may still get dropped. This can happen when the encapsulated + * ethernet frame is invalid or contains again an batman-adv packet. Also + * unicast packets will be dropped directly when it was sent between two + * isolated clients. + */ void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb, struct batadv_hard_iface *recv_if, int hdr_size, struct batadv_orig_node *orig_node)

7 years

[batman-adv] master's head updated: Merge branch 'next' (9e3c353)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 7d2f8a7 batman-adv: Check skb size before using encapsulated ETH+VLAN header e9d8868 Merge branch 'maint' into next 9e3c353 Merge branch 'next'

7 years

[batman-adv] master: Merge branch 'next' (9e3c353)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 9e3c35330b718d8c4cce0bcd2c823098e124c8b4 Merge: 77ddf97 e9d8868 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Mar 20 17:57:53 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 9e3c35330b718d8c4cce0bcd2c823098e124c8b4 net/batman-adv/soft-interface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

7 years

[batman-adv] next: Merge branch 'maint' into next (e9d8868)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit e9d8868215fdb4c61a3440bbcbb34c50e546e6e2 Merge: 3515604 7d2f8a7 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Mar 20 17:57:20 2016 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- e9d8868215fdb4c61a3440bbcbb34c50e546e6e2 net/batman-adv/soft-interface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

7 years

[batman-adv] next's head updated: Merge branch 'maint' into next (e9d8868)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 7d2f8a7 batman-adv: Check skb size before using encapsulated ETH+VLAN header e9d8868 Merge branch 'maint' into next

7 years

[batman-adv] maint: batman-adv: Check skb size before using encapsulated ETH+VLAN header (7d2f8a7)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 7d2f8a773bae5e07cadc9a9f74ac21abe32cde13 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 26 17:56:13 2016 +0100 batman-adv: Check skb size before using encapsulated ETH+VLAN header The encapsulated ethernet and VLAN header may be outside the received ethernet frame. Thus the skb buffer size has to be checked before it can be parsed to find out if it encapsulates another batman-adv packet. Fixes: 48628bb9419f ("batman-adv: softif bridge loop avoidance") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 7d2f8a773bae5e07cadc9a9f74ac21abe32cde13 net/batman-adv/soft-interface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 6c65de9..64d721c 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -407,11 +407,17 @@ void batadv_interface_rx(struct net_device *soft_iface, */ nf_reset(skb); + if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) + goto dropped; + vid = batadv_get_vid(skb, 0); ethhdr = eth_hdr(skb); switch (ntohs(ethhdr->h_proto)) { case ETH_P_8021Q: + if (!pskb_may_pull(skb, VLAN_ETH_HLEN)) + goto dropped; + vhdr = (struct vlan_ethhdr *)skb->data; if (vhdr->h_vlan_encapsulated_proto != ethertype) @@ -423,8 +429,6 @@ void batadv_interface_rx(struct net_device *soft_iface, } /* skb->dev & skb->pkt_type are set here */ - if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) - goto dropped; skb->protocol = eth_type_trans(skb, soft_iface); /* should not be necessary anymore as we use skb_pull_rcsum()

7 years

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2016