]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: Fix usage of accidental NULL pointer
authorDonald Sharp <sharpd@cumulusnetwroks.com>
Mon, 15 Aug 2016 16:04:30 +0000 (12:04 -0400)
committerDonald Sharp <sharpd@cumulusnetwroks.com>
Mon, 15 Aug 2016 16:52:05 +0000 (12:52 -0400)
NS_DEFAULT is #defined to 0, We are passing it
in to a function that is taking 'struct zebra_ns *'
which is translating into a NULL pointer.  Which
in some situations will cause a crash.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
             Daniel Walton <dwalton@cumulusnetworks.com>
             Nikolay Aleksandrov <nikolay@cumulusnetworks.com>

(cherry picked from commit 1e9fa2763953adc603c3acc4ed2a46c9e72cbb29)
(cherry picked from commit e33efc8aa85ad17698bd8d42f1d32d80eb5ca4b6)

zebra/rt_netlink.c

index 481ff781e3e28a5bd6e1d17d31aa0775190a8ad1..0549900650ea5abbc3df4de063a443d0d76a231c 100644 (file)
@@ -1998,7 +1998,7 @@ netlink_neigh_update (int cmd, int ifindex, __u32 addr, char *lla, int llalen)
   addattr_l(&req.n, sizeof(req), NDA_DST, &addr, 4);
   addattr_l(&req.n, sizeof(req), NDA_LLADDR, lla, llalen);
 
-  return netlink_talk (&req.n, &zns->netlink_cmd, NS_DEFAULT);
+  return netlink_talk (&req.n, &zns->netlink_cmd, zns);
 }
 
 /* Routing table change via netlink interface. */