commits June 2016

commits@lists.open-mesh.org

1 participants
134 discussions

[batman-adv] next's head updated: Merge branch 'maint' into next (6c27cef)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: f6c80c2 batman-adv: Fix ICMP RR ethernet access after skb_linearize 6c27cef Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (6c27cef)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 6c27cef04bc11514b91aa20f199e5bda9abe6207 Merge: 235bd56 f6c80c2 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jun 6 23:40:13 2016 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 6c27cef04bc11514b91aa20f199e5bda9abe6207 net/batman-adv/routing.c | 1 + 1 file changed, 1 insertion(+)

1 0

[batman-adv] maint: batman-adv: Fix ICMP RR ethernet access after skb_linearize (f6c80c2)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit f6c80c29ef4e8b45b715976107b7ae06fc0be3a0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun May 29 21:25:52 2016 +0200 batman-adv: Fix ICMP RR ethernet access after skb_linearize The skb_linearize may reallocate the skb. This makes the calculated pointer for ethhdr invalid. But it the pointer is used later to fill in the RR field of the batadv_icmp_packet_rr packet. Instead re-evaluate eth_hdr after the skb_linearize+skb_cow to fix the pointer and avoid the invalid read. Fixes: bb69cb678d37 ("batman-adv: generalize batman-adv icmp packet handling") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- f6c80c29ef4e8b45b715976107b7ae06fc0be3a0 net/batman-adv/routing.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 0c0c30e..27e07dd 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -374,6 +374,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, if (skb_cow(skb, ETH_HLEN) < 0) goto out; + ethhdr = eth_hdr(skb); icmph = (struct batadv_icmp_header *)skb->data; icmp_packet_rr = (struct batadv_icmp_packet_rr *)icmph; if (icmp_packet_rr->rr_cur >= BATADV_RR_LEN)

1 0

[batman-adv] master: Merge branch 'next' (d947cc0)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d947cc01e3c40f891e36f0871ce181965963e334 Merge: 923d651 235bd56 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jun 6 23:32:07 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- d947cc01e3c40f891e36f0871ce181965963e334 net/batman-adv/translation-table.c | 1 - 1 file changed, 1 deletion(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (d947cc0)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 22bb8b8 batman-adv: Fix double-put of vlan object 235bd56 Merge branch 'maint' into next d947cc0 Merge branch 'next'

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (235bd56)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 22bb8b8 batman-adv: Fix double-put of vlan object 235bd56 Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (235bd56)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 235bd568df5cbfb345b0c802238d9cc354df3a57 Merge: f4eea21 22bb8b8 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jun 6 23:31:08 2016 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 235bd568df5cbfb345b0c802238d9cc354df3a57 net/batman-adv/translation-table.c | 1 - 1 file changed, 1 deletion(-)

1 0

[batman-adv] maint: batman-adv: Fix double-put of vlan object (22bb8b8)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 22bb8b894900064d3fb09032a47577e89fc30d7c Author: Ben Hutchings <ben(a)decadent.org.uk> Date: Fri Jun 3 00:00:44 2016 +0100 batman-adv: Fix double-put of vlan object Each batadv_tt_local_entry hold a single reference to a batadv_softif_vlan. In case a new entry cannot be added to the hash table, the error path puts the reference, but the reference will also now be dropped by batadv_tt_local_entry_release(). Fixes: 20ca393adddf ("batman-adv: Fix reference counting of vlan object for tt_local_entry") Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk> Acked-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 22bb8b894900064d3fb09032a47577e89fc30d7c net/batman-adv/translation-table.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 5234e53..23fb7ea 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -693,7 +693,6 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, if (unlikely(hash_added != 0)) { /* remove the reference for the hash */ batadv_tt_local_entry_put(tt_local); - batadv_softif_vlan_put(vlan); goto out; }

1 0

[batman-adv] master's head updated: Merge branch 'next' (923d651)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: c3fef3d batman-adv: Fix use-after-free/double-free of tt_req_node f4eea21 Merge branch 'maint' into next 923d651 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (923d651)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 923d65144c55cdb099aaa826140ad9e0df2dab04 Merge: 98d7a76 f4eea21 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jun 6 23:25:49 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 923d65144c55cdb099aaa826140ad9e0df2dab04 net/batman-adv/translation-table.c | 37 +++++++++++++++++++++++++++++++++---- net/batman-adv/types.h | 2 ++ 2 files changed, 35 insertions(+), 4 deletions(-)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2016