From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 2 Feb 2017 00:43:43 +0000 (-0500)
Subject: lib: Fix SA issue with stream s read
X-Git-Tag: frr-3.0-branchpoint~51^2~10
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c28e5b2a83732c8b235c6b7d4ce64fc2c449d939;p=mirror%2Ffrr.git

lib: Fix SA issue with stream s read

We were checking for non-null of 'struct stream *s'
after we did a stream_getl, which would have crashed
the program.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/lib/zclient.c b/lib/zclient.c
index 92662fd70f..cea4b098fc 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -1146,11 +1146,15 @@ struct interface *
 zebra_interface_link_params_read (struct stream *s)
 {
   struct if_link_params *iflp;
-  uint32_t ifindex = stream_getl (s);
+  ifindex_t ifindex;
+
+  assert (s);
+
+  ifindex = stream_getl (s);
 
   struct interface *ifp = if_lookup_by_index (ifindex);
 
-  if (ifp == NULL || s == NULL)
+  if (ifp == NULL)
     {
       zlog_err ("%s: unknown ifindex %u, shouldn't happen",
                 __func__, ifindex);