17 Dec, 2011
1 commit
-
I didn't resolve the merge properly during the last pull of the net
tree into net-next.The code in the final resolution should set flags to TT_CLIENT_ROAM
not TT_CLIENT_PENDING.Signed-off-by: David S. Miller
16 Dec, 2011
1 commit
-
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
net/ipv6/route.c
12 Dec, 2011
3 commits
-
Don't write more than the requested number of bytes of an batman-adv icmp
packet to the userspace buffer. Otherwise unrelated userspace memory might get
overridden by the kernel.Signed-off-by: Sven Eckelmann
Signed-off-by: Marek Lindner -
The access_ok read check can be directly done in copy_from_user since a failure
of access_ok is handled the same way as an error in __copy_from_user.Signed-off-by: Sven Eckelmann
Signed-off-by: Marek Lindner -
Writing a icmp_packet_rr and then reading icmp_packet can lead to kernel
memory corruption, if __user *buf is just below TASK_SIZE.Signed-off-by: Paul Kot
[sven@narfation.org: made it checkpatch clean]
Signed-off-by: Sven Eckelmann
Signed-off-by: Marek Lindner
07 Dec, 2011
4 commits
-
When receiving a DEL change for a client due to a roaming event (change is
marked with TT_CLIENT_ROAM), each node has to check if the client roamed
to itself or somewhere else.In the latter case the global entry is kept to avoid having no route at all
otherwise we can safely delete the global entrySigned-off-by: Antonio Quartulli
-
In case of a client roaming from node A to node B, the latter have to mark the
corresponding global entry with TT_CLIENT_ROAM (instead of TT_CLIENT_PENDING).Marking a global entry with TT_CLIENT_PENDING will end up in keeping such entry
forever (because this flag is only meant to be used with local entries and it is
never checked on global ones).In the worst case (all the clients roaming to the same node A) the local and the
global table will contain exactly the same clients. Batman-adv will continue to
work, but the memory usage is duplicated.Signed-off-by: Antonio Quartulli
-
in an multi-line if statement leading edges should line up to the opening
parenthesisReported-by: David Miller
Signed-off-by: Antonio Quartulli
Signed-off-by: Marek Lindner -
There is a typo here where an extra '!' made the check to the opposite
of what was intended.Signed-off-by: Dan Carpenter
Signed-off-by: Marek Lindner
20 Nov, 2011
15 commits
-
When entering softif_create(), the rtnl lock has already been acquired
by store_mesh_iface().
(store_mesh_iface() -> hardif_enable_interface() -> softif_create)In case of an error, we should therefore call unregister_netdevice()
instead of unregister_netdev().unregister_netdev() tries to acquire the rtnl lock itself and deadlocks
in this situation. unregister_netdevice() assumes that the rtnl lock
is already been held.Signed-off-by: Simon Wunderlich
Signed-off-by: Sven Eckelmann -
if hash_add() fails, we should remove the structure to avoid memory
leaks.Signed-off-by: Simon Wunderlich
Acked-by: Antonio Quartulli
Signed-off-by: Sven Eckelmann -
The tt_local_reset_flags() is actually used for one use case only. It is not
generalised enough to be used indifferent situations. This patch make it general
enough in order to let other code use it whenever a flag set is requested over
the whole hash table (passed as parameter). The function is now called
tt_set_flags()Signed-off-by: Antonio Quartulli
Signed-off-by: Sven Eckelmann -
Several functions in the translation table management code assume that the
tt_global_entry and tt_local_entry structures have the same initial fields such
as 'addr' and 'hash_entry'. To improve the code readability and to avoid
mistakes in later changes, a common substructure that substitute the shared
fields has been introduced (struct tt_common_entry).Thanks to this modification, it has also been possible to slightly reduce the
code length by merging some functions like compare_ltt/gtt() and
tt_local/global_hash_find()Signed-off-by: Antonio Quartulli
Signed-off-by: Sven Eckelmann -
Reported-by: Sven Eckelmann
Signed-off-by: Marek Lindner
Signed-off-by: Sven Eckelmann -
The check for new packets in the future used a wrong binary operator,
which makes the check expression always true and accepting too many
packets.Reported-by: Thomas Jarosch
Signed-off-by: Simon Wunderlich
Signed-off-by: Sven Eckelmann -
Before accessing the TT_RESPONSE packet payload, the node has to ensure that the
packet is long enough as it would expect to be.Reported-by: Simon Wunderlich
Signed-off-by: Antonio Quartulli
Signed-off-by: Sven Eckelmann -
The TT_RESPONSE skb has to be linearised only if the node plans to access the
packet payload (so only if the message is directed to that node). In all the
other cases the node can avoid this memory operationSigned-off-by: Antonio Quartulli
Signed-off-by: Sven Eckelmann -
When the translation tables (global and local) are written for debugfs,
it is not neccesary to allocate a buffer, we can directly use
seq_printf() to print them out.This might actually be safer if the table changes between size
calculation and traversal, and we can't estimate the required size
wrong.Signed-off-by: Simon Wunderlich
Signed-off-by: Sven Eckelmann -
There are two reasons for this fix:
- the result of choose_orig() and vis_choose() is an index and therefore it can't
be negative. Hence it is correct to make the return type unsigned too.- sizeof(int) may not be the same on ALL the architectures. Since we plan to use
choose_orig() as DHT hash function, we need to guarantee that, given the same
argument, the result is the same. Then it is correct to explicitly express
the size of the return type (and the second argument). Since the expected
length is currently 4, uint32_t is the most convenient choice.Signed-off-by: Antonio Quartulli
Signed-off-by: Sven Eckelmann -
get_orig_node() tries to retrieve an orig_node object based on a mac address
and creates it if not present. This is not the wanted behaviour in the
translation table code as we don't want to create new orig_code objects but
expect a NULL pointer if the object does not exist.Reported-by: Simon Wunderlich
Signed-off-by: Antonio Quartulli
Signed-off-by: Sven Eckelmann -
Signed-off-by: Marek Lindner
Acked-by: Antonio Quartulli
Signed-off-by: Sven Eckelmann -
strict_strto is obsolete since v3.1-rc8-8466-g14acc55 and should be
replaced with kstrto.Signed-off-by: Sven Eckelmann
-
When deleting the entries, tt_global_del_orig() has to print the message passed
as argument instead of a static one.Signed-off-by: Antonio Quartulli
Signed-off-by: Sven Eckelmann -
Signed-off-by: Sven Eckelmann
30 Oct, 2011
1 commit
25 Oct, 2011
4 commits
-
Function tt_response_fill_table() actually uses a tt_local_entry pointer to
iterate either over the local or the global table entries (it depends on the
what hash table is passed as argument). To iterate over such entries the
hlist_for_each_entry_rcu() macro has to access their "hash_entry" field which
MUST be at the same position in both the tt_global/local_entry structures.Reported-by: Simon Wunderlich
Signed-off-by: Antonio Quartulli
Signed-off-by: Marek Lindner -
After removing the batman-adv module, the hash may be already gone
when tt_global_del_orig() tries to clean the hash. This patch adds
a sanity check to avoid this.Signed-off-by: Simon Wunderlich
Tested-by: Alexey Fisher
Signed-off-by: Marek Lindner -
struct tt_global_entry holds a reference to an orig_node which must be
decremented before deallocating the structure.Signed-off-by: Simon Wunderlich
Tested-by: Alexey Fisher
Signed-off-by: Marek Lindner
19 Oct, 2011
2 commits
-
In the TT_RESPONSE packet, the number of carried entries is not correctly set.
This leads to a wrong interpretation of the packet payload on the receiver side
causing random entries to be added to the global translation table. Therefore
the latter gets always corrupted, triggering a table recovery all the time.Signed-off-by: Antonio Quartulli
Signed-off-by: Marek Lindner -
Currently the counter of tt_local_entry structures (tt_local_num) is incremented
each time the tt_local_reset_flags() is invoked causing the node to send wrong
TT_REPONSE packets containing a copy of non-initialised memory thus corrupting
other nodes global translation table and making higher level communication
impossible.Reported-by: Junkeun Song
Signed-off-by: Antonio Quartulli
Acked-by: Junkeun Song
Signed-off-by: Marek Lindner
08 Oct, 2011
1 commit
-
Conflicts:
net/batman-adv/soft-interface.c
23 Sep, 2011
1 commit
-
corrects a critical bug of the GW feature. This bug made all the unicast
packets destined to a GW to be sent as broadcast. This bug is present even if
the sender GW feature is configured as OFF. It's an urgent bug fix and should
be committed as soon as possible.This was a regression introduced by 43676ab590c3f8686fd047d34c3e33803eef71f0
Signed-off-by: Antonio Quartulli
Signed-off-by: Marek Lindner
08 Sep, 2011
6 commits
-
Removing unnecessary messages saves code and text.
Site specific OOM messages are duplications of a generic MM
out of memory message and aren't really useful, so just
delete them.Signed-off-by: Joe Perches
Signed-off-by: Marek Lindner -
Signed-off-by: Sven Eckelmann
Signed-off-by: Marek Lindner -
In the process the batman iv OGM aggregation code could be merged
into the batman iv code base which makes the separate aggregation
files superfluous.Signed-off-by: Marek Lindner
-
Signed-off-by: Marek Lindner
-
In preparation of the upcoming improved routing algorithm the code based has
to be re-organized to allow choosing the routing algorithm at compile time.Signed-off-by: Marek Lindner
-
The follow-up routing code changes are going to introduce additional
routing packet types which make this distinction necessary.Signed-off-by: Marek Lindner
22 Aug, 2011
1 commit
-
Signed-off-by: Marek Lindner