[B.A.T.M.A.N.] [PATCH] batctl: Handle allocation error in vlan_get_link_parse

[B.A.T.M.A.N.] [PATCH] batctl: Handle allocation error in vlan_get_link_parse

[Sven Eckelmann]

The malloc could fail and return NULL. In this case, the processing of the
current interface index has to be stopped to avoid writing to NULL (which
would cause a segfault).

Fixes: d29288fe0583 ("batctl: implement vlan-to-link helper functions")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 functions.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/functions.c b/functions.c
index 8bcf52d..5e4eda0 100644
--- a/functions.c
+++ b/functions.c
@@ -812,6 +812,9 @@ static int vlan_get_link_parse(struct nl_msg *msg, void *arg)
 	idx = *(int *)nla_data(tb[IFLA_LINK]);
 	free(nl_arg->iface);
 	nl_arg->iface = malloc(IFNAMSIZ + 1);
+	if (!nl_arg->iface)
+		goto err;
+
 	if (!if_indextoname(idx, nl_arg->iface))
 		goto err;
 
-- 
2.11.0

Re: [B.A.T.M.A.N.] [PATCH] batctl: Handle allocation error in vlan_get_link_parse

[Simon Wunderlich]

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]

On Saturday, December 2, 2017 8:45:59 AM CET Sven Eckelmann wrote:
> The malloc could fail and return NULL. In this case, the processing of the
> current interface index has to be stopped to avoid writing to NULL (which
> would cause a segfault).
> 
> Fixes: d29288fe0583 ("batctl: implement vlan-to-link helper functions")
> Signed-off-by: Sven Eckelmann <sven@narfation.org>

Applied in 2ea390c.

Thank you!
      Simon

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]