commits January 2011

commits@lists.open-mesh.org

1 participants
80 discussions

linux integration; tag, GregKH-20101025, created. v2.6.36-rc8-530-g137f968
by postmaster＠open-mesh.org 16 Jan '11

16 Jan '11

The tag, GregKH-20101025 has been created at 137f96870c4736bb7a9a27b1851ab9341f6c6758 (commit) - Shortlog ------------------------------------------------------------ commit 137f96870c4736bb7a9a27b1851ab9341f6c6758 Merge: 4f5cbb3 ac78169 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Mon Oct 25 23:30:47 2010 +0200 Merge remote branch 'origin/next' into linux ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; tag, DaveM-20110116, created. v2.6.37-rc2-822-g976537c
by postmaster＠open-mesh.org 16 Jan '11

16 Jan '11

The tag, DaveM-20110116 has been created at 976537c5e902a8abb23d4467fa8366c5cbbab6e8 (commit) - Shortlog ------------------------------------------------------------ commit 976537c5e902a8abb23d4467fa8366c5cbbab6e8 Merge: c47bc5f 46e1b7c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 16 02:56:22 2011 +0100 Merge remote branch 'origin/next' into linux Conflicts: net/batman-adv/compat.h ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, next, updated. v2010.2.0-274-g46e1b7c
by postmaster＠open-mesh.org 16 Jan '11

16 Jan '11

The following commit has been merged in the next branch: commit 46e1b7ca0e55f55e81c227d82eef3d1dc77ad5ae Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 15 14:39:43 2011 +0000 batman-adv: Use "__attribute__" shortcut macros Linux 2.6.21 defines different macros for __attribute__ which are also used inside batman-adv. The next version of checkpatch.pl warns about the usage of __attribute__((packed))). Linux 2.6.33 defines an extra macro __always_unused which is used to assist source code analyzers and can be used to removed the last existing __attribute__ inside the source code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/compat.h b/compat.h index b01455f..6074969 100644 --- a/compat.h +++ b/compat.h @@ -264,4 +264,10 @@ int bat_seq_printf(struct seq_file *m, const char *f, ...); #endif /* < KERNEL_VERSION(2, 6, 29) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +#define __always_unused __attribute__((unused)) + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/main.h b/main.h index f806c02..13edb78 100644 --- a/main.h +++ b/main.h @@ -153,9 +153,9 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...); } \ while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ -static inline void bat_dbg(char type __attribute__((unused)), - struct bat_priv *bat_priv __attribute__((unused)), - char *fmt __attribute__((unused)), ...) +static inline void bat_dbg(char type __always_unused, + struct bat_priv *bat_priv __always_unused, + char *fmt __always_unused, ...) { } #endif diff --git a/packet.h b/packet.h index b49fdf7..2284e81 100644 --- a/packet.h +++ b/packet.h @@ -63,7 +63,7 @@ struct batman_packet { uint8_t num_hna; uint8_t gw_flags; /* flags related to gateway class */ uint8_t align; -} __attribute__((packed)); +} __packed; #define BAT_PACKET_LEN sizeof(struct batman_packet) @@ -76,7 +76,7 @@ struct icmp_packet { uint8_t orig[6]; uint16_t seqno; uint8_t uid; -} __attribute__((packed)); +} __packed; #define BAT_RR_LEN 16 @@ -93,14 +93,14 @@ struct icmp_packet_rr { uint8_t uid; uint8_t rr_cur; uint8_t rr[BAT_RR_LEN][ETH_ALEN]; -} __attribute__((packed)); +} __packed; struct unicast_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t dest[6]; uint8_t ttl; -} __attribute__((packed)); +} __packed; struct unicast_frag_packet { uint8_t packet_type; @@ -110,7 +110,7 @@ struct unicast_frag_packet { uint8_t flags; uint8_t orig[6]; uint16_t seqno; -} __attribute__((packed)); +} __packed; struct bcast_packet { uint8_t packet_type; @@ -118,7 +118,7 @@ struct bcast_packet { uint8_t orig[6]; uint8_t ttl; uint32_t seqno; -} __attribute__((packed)); +} __packed; struct vis_packet { uint8_t packet_type; @@ -131,6 +131,6 @@ struct vis_packet { * neighbors */ uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ -} __attribute__((packed)); +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ diff --git a/types.h b/types.h index 97cb23d..bf3f6f5 100644 --- a/types.h +++ b/types.h @@ -246,13 +246,13 @@ struct vis_info { /* this packet might be part of the vis send queue. */ struct sk_buff *skb_packet; /* vis_info may follow here*/ -} __attribute__((packed)); +} __packed; struct vis_info_entry { uint8_t src[ETH_ALEN]; uint8_t dest[ETH_ALEN]; uint8_t quality; /* quality = 0 means HNA */ -} __attribute__((packed)); +} __packed; struct recvlist_node { struct list_head list; -- batman-adv

1 0

batctl; branch, next, updated. v2010.2.0-84-g213ec1b
by postmaster＠open-mesh.org 16 Jan '11

16 Jan '11

The following commit has been merged in the next branch: commit 213ec1b7ccd5cb72f382bc75f2157d46cde0d20b Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 15 14:39:43 2011 +0100 batman-adv: Use "__attribute__" shortcut macros Linux 2.6.21 defines different macros for __attribute__ which are also used inside batman-adv. The next version of checkpatch.pl warns about the usage of __attribute__((packed))). Linux 2.6.33 defines an extra macro __always_unused which is used to assist source code analyzers and can be used to removed the last existing __attribute__ inside the source code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index f45fec0..ae05c69 100644 --- a/main.h +++ b/main.h @@ -24,3 +24,5 @@ #define SOURCE_VERSION "next" #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket" + +#define __packed __attribute((packed)) /* linux kernel compat */ diff --git a/packet.h b/packet.h index b49fdf7..2284e81 100644 --- a/packet.h +++ b/packet.h @@ -63,7 +63,7 @@ struct batman_packet { uint8_t num_hna; uint8_t gw_flags; /* flags related to gateway class */ uint8_t align; -} __attribute__((packed)); +} __packed; #define BAT_PACKET_LEN sizeof(struct batman_packet) @@ -76,7 +76,7 @@ struct icmp_packet { uint8_t orig[6]; uint16_t seqno; uint8_t uid; -} __attribute__((packed)); +} __packed; #define BAT_RR_LEN 16 @@ -93,14 +93,14 @@ struct icmp_packet_rr { uint8_t uid; uint8_t rr_cur; uint8_t rr[BAT_RR_LEN][ETH_ALEN]; -} __attribute__((packed)); +} __packed; struct unicast_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t dest[6]; uint8_t ttl; -} __attribute__((packed)); +} __packed; struct unicast_frag_packet { uint8_t packet_type; @@ -110,7 +110,7 @@ struct unicast_frag_packet { uint8_t flags; uint8_t orig[6]; uint16_t seqno; -} __attribute__((packed)); +} __packed; struct bcast_packet { uint8_t packet_type; @@ -118,7 +118,7 @@ struct bcast_packet { uint8_t orig[6]; uint8_t ttl; uint32_t seqno; -} __attribute__((packed)); +} __packed; struct vis_packet { uint8_t packet_type; @@ -131,6 +131,6 @@ struct vis_packet { * neighbors */ uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ -} __attribute__((packed)); +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- batctl

1 0

batctl; branch, master, updated. v2010.2.0-80-gcb1d16c
by postmaster＠open-mesh.org 15 Jan '11

15 Jan '11

The following commit has been merged in the master branch: commit cb1d16c7295b9dae7e2d00c280e13047359e954b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jan 15 15:02:46 2011 +0100 batctl: adding __packed linux kernel compat macro The linux kernel prefers the __packed macro instead of __attribute((packed)) for which batctl needs a compatibility macro as it shares packet definitions with the batman-adv kernel module. Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/main.h b/main.h index 8689d67..9297c15 100644 --- a/main.h +++ b/main.h @@ -24,3 +24,5 @@ #define SOURCE_VERSION "devel" /*put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */ #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket" + +#define __packed __attribute((packed)) /* linux kernel compat */ -- batctl

1 0

batctl; branch, master, updated. v2010.2.0-79-g0be5eac
by postmaster＠open-mesh.org 15 Jan '11

15 Jan '11

The following commit has been merged in the master branch: commit 0be5eac07be87caf99672404d31ca292ed0bb6a8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 15 14:39:43 2011 +0100 batman-adv: Use "__attribute__" shortcut macros Linux 2.6.21 defines different macros for __attribute__ which are also used inside batman-adv. The next version of checkpatch.pl warns about the usage of __attribute__((packed))). Linux 2.6.33 defines an extra macro __always_unused which is used to assist source code analyzers and can be used to removed the last existing __attribute__ inside the source code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index b49fdf7..2284e81 100644 --- a/packet.h +++ b/packet.h @@ -63,7 +63,7 @@ struct batman_packet { uint8_t num_hna; uint8_t gw_flags; /* flags related to gateway class */ uint8_t align; -} __attribute__((packed)); +} __packed; #define BAT_PACKET_LEN sizeof(struct batman_packet) @@ -76,7 +76,7 @@ struct icmp_packet { uint8_t orig[6]; uint16_t seqno; uint8_t uid; -} __attribute__((packed)); +} __packed; #define BAT_RR_LEN 16 @@ -93,14 +93,14 @@ struct icmp_packet_rr { uint8_t uid; uint8_t rr_cur; uint8_t rr[BAT_RR_LEN][ETH_ALEN]; -} __attribute__((packed)); +} __packed; struct unicast_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t dest[6]; uint8_t ttl; -} __attribute__((packed)); +} __packed; struct unicast_frag_packet { uint8_t packet_type; @@ -110,7 +110,7 @@ struct unicast_frag_packet { uint8_t flags; uint8_t orig[6]; uint16_t seqno; -} __attribute__((packed)); +} __packed; struct bcast_packet { uint8_t packet_type; @@ -118,7 +118,7 @@ struct bcast_packet { uint8_t orig[6]; uint8_t ttl; uint32_t seqno; -} __attribute__((packed)); +} __packed; struct vis_packet { uint8_t packet_type; @@ -131,6 +131,6 @@ struct vis_packet { * neighbors */ uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ -} __attribute__((packed)); +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- batctl

1 0

batman-adv; branch, master, updated. v2010.2.0-249-g09099b5
by postmaster＠open-mesh.org 15 Jan '11

15 Jan '11

The following commit has been merged in the master branch: commit 020f1075b81ac0321a83864876ff4852abfc5937 Author: Jesper Juhl <jj(a)chaosbits.net> Date: Sat Jan 15 14:39:41 2011 +0000 Even Batman should not dereference NULL pointers There's a problem in net/batman-adv/unicast.c::frag_send_skb(). dev_alloc_skb() allocates memory and may fail, thus returning NULL. If this happens we'll pass a NULL pointer on to skb_split() which in turn hands it to skb_split_inside_header() from where it gets passed to skb_put() that lets skb_tail_pointer() play with it and that function dereferences it. And thus the bat dies. While I was at it I also moved the call to dev_alloc_skb() above the assignment to 'unicast_packet' since there's no reason to do that assignment if the memory allocation fails. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> diff --git a/unicast.c b/unicast.c index dc2e28b..ee41fef 100644 --- a/unicast.c +++ b/unicast.c @@ -229,10 +229,12 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, if (!bat_priv->primary_if) goto dropped; - unicast_packet = (struct unicast_packet *) skb->data; + frag_skb = dev_alloc_skb(data_len - (data_len / 2) + ucf_hdr_len); + if (!frag_skb) + goto dropped; + unicast_packet = (struct unicast_packet *) skb->data; memcpy(&tmp_uc, unicast_packet, uc_hdr_len); - frag_skb = dev_alloc_skb(data_len - (data_len / 2) + ucf_hdr_len); skb_split(skb, frag_skb, data_len / 2); if (my_skb_head_push(skb, ucf_hdr_len - uc_hdr_len) < 0 || -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-249-g09099b5
by postmaster＠open-mesh.org 15 Jan '11

15 Jan '11

The following commit has been merged in the master branch: commit 09099b58d85c39f20b10f4b70f834d524b983af3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 15 14:39:43 2011 +0000 batman-adv: Use "__attribute__" shortcut macros Linux 2.6.21 defines different macros for __attribute__ which are also used inside batman-adv. The next version of checkpatch.pl warns about the usage of __attribute__((packed))). Linux 2.6.33 defines an extra macro __always_unused which is used to assist source code analyzers and can be used to removed the last existing __attribute__ inside the source code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/compat.h b/compat.h index b01455f..6074969 100644 --- a/compat.h +++ b/compat.h @@ -264,4 +264,10 @@ int bat_seq_printf(struct seq_file *m, const char *f, ...); #endif /* < KERNEL_VERSION(2, 6, 29) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +#define __always_unused __attribute__((unused)) + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/main.h b/main.h index a362433..c239c97 100644 --- a/main.h +++ b/main.h @@ -153,9 +153,9 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...); } \ while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ -static inline void bat_dbg(char type __attribute__((unused)), - struct bat_priv *bat_priv __attribute__((unused)), - char *fmt __attribute__((unused)), ...) +static inline void bat_dbg(char type __always_unused, + struct bat_priv *bat_priv __always_unused, + char *fmt __always_unused, ...) { } #endif diff --git a/packet.h b/packet.h index b49fdf7..2284e81 100644 --- a/packet.h +++ b/packet.h @@ -63,7 +63,7 @@ struct batman_packet { uint8_t num_hna; uint8_t gw_flags; /* flags related to gateway class */ uint8_t align; -} __attribute__((packed)); +} __packed; #define BAT_PACKET_LEN sizeof(struct batman_packet) @@ -76,7 +76,7 @@ struct icmp_packet { uint8_t orig[6]; uint16_t seqno; uint8_t uid; -} __attribute__((packed)); +} __packed; #define BAT_RR_LEN 16 @@ -93,14 +93,14 @@ struct icmp_packet_rr { uint8_t uid; uint8_t rr_cur; uint8_t rr[BAT_RR_LEN][ETH_ALEN]; -} __attribute__((packed)); +} __packed; struct unicast_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t dest[6]; uint8_t ttl; -} __attribute__((packed)); +} __packed; struct unicast_frag_packet { uint8_t packet_type; @@ -110,7 +110,7 @@ struct unicast_frag_packet { uint8_t flags; uint8_t orig[6]; uint16_t seqno; -} __attribute__((packed)); +} __packed; struct bcast_packet { uint8_t packet_type; @@ -118,7 +118,7 @@ struct bcast_packet { uint8_t orig[6]; uint8_t ttl; uint32_t seqno; -} __attribute__((packed)); +} __packed; struct vis_packet { uint8_t packet_type; @@ -131,6 +131,6 @@ struct vis_packet { * neighbors */ uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ -} __attribute__((packed)); +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ diff --git a/types.h b/types.h index 09d18d8..9e636c2 100644 --- a/types.h +++ b/types.h @@ -249,13 +249,13 @@ struct vis_info { /* this packet might be part of the vis send queue. */ struct sk_buff *skb_packet; /* vis_info may follow here*/ -} __attribute__((packed)); +} __packed; struct vis_info_entry { uint8_t src[ETH_ALEN]; uint8_t dest[ETH_ALEN]; uint8_t quality; /* quality = 0 means HNA */ -} __attribute__((packed)); +} __packed; struct recvlist_node { struct list_head list; -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-273-g50d7c5a
by postmaster＠open-mesh.org 14 Jan '11

14 Jan '11

The following commit has been merged in the next branch: commit 50d7c5a968cde5ea638fbb945135ea7c4ed90733 Author: Jesper Juhl <jj(a)chaosbits.net> Date: Thu Jan 13 21:53:38 2011 +0100 batman-adv: Even Batman should not dereference NULL pointers There's a problem in net/batman-adv/unicast.c::frag_send_skb(). dev_alloc_skb() allocates memory and may fail, thus returning NULL. If this happens we'll pass a NULL pointer on to skb_split() which in turn hands it to skb_split_inside_header() from where it gets passed to skb_put() that lets skb_tail_pointer() play with it and that function dereferences it. And thus the bat dies. While I was at it I also moved the call to dev_alloc_skb() above the assignment to 'unicast_packet' since there's no reason to do that assignment if the memory allocation fails. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/unicast.c b/unicast.c index dc2e28b..ee41fef 100644 --- a/unicast.c +++ b/unicast.c @@ -229,10 +229,12 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, if (!bat_priv->primary_if) goto dropped; - unicast_packet = (struct unicast_packet *) skb->data; + frag_skb = dev_alloc_skb(data_len - (data_len / 2) + ucf_hdr_len); + if (!frag_skb) + goto dropped; + unicast_packet = (struct unicast_packet *) skb->data; memcpy(&tmp_uc, unicast_packet, uc_hdr_len); - frag_skb = dev_alloc_skb(data_len - (data_len / 2) + ucf_hdr_len); skb_split(skb, frag_skb, data_len / 2); if (my_skb_head_push(skb, ucf_hdr_len - uc_hdr_len) < 0 || -- batman-adv

1 0

linux integration; annotated tag, v2.6.37, created. v2.6.37
by postmaster＠open-mesh.org 05 Jan '11

05 Jan '11

The annotated tag, v2.6.37 has been created at 4a7895f41220ed60e97b736ac1b92e589e67b263 (tag) tagging 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (commit) replaces v2.6.37-rc8 tagged by Linus Torvalds on Tue Jan 4 16:50:26 2011 -0800 - Shortlog ------------------------------------------------------------ Linux 2.6.37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk0jwFYACgkQF3YsRnbiHLtO7QCdEPpx2QJiduQd4Y3gZ+lMu/ac CK0An3UIu6IA2jrsMckJFnlI9YnqGFr2 =NQ5Z -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2011