[B.A.T.M.A.N.] [PATCH 1/2] batctl: Fix static buffer for resolved mac adddress

Sven Eckelmann
2013-10-15T16:01:08Z

The resolve_mac_* functions are currently not reentrant-safe because they are
using ether_aton. Thus all functions returning a mac address in a similar way
must also ensure that their data is in a statically allocated buffer and not on
a stack.

resolve_mac_from_cache did that for the wrong buffer.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
functions.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions.c b/functions.c
index 9e03e72..959784b 100644
--- a/functions.c
+++ b/functions.c
@@ -630,8 +630,8 @@ static int resolve_mac_from_cache_parse(struct ndmsg *ndmsg, size_t len_payload,
static struct ether_addr *resolve_mac_from_cache(int ai_family,
const void *l3addr)
{
- static uint8_t l3addr_tmp[16];
- struct ether_addr mac_tmp;
+ uint8_t l3addr_tmp[16];
+ static struct ether_addr mac_tmp;
struct ether_addr *mac_result = NULL;
void *buf = NULL;
size_t buflen;
--
1.8.4.rc3