summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Ovsienko <linux@pilot.org.ua>2007-09-12 15:24:27 +0000
committerDenis Ovsienko <linux@pilot.org.ua>2007-09-12 15:24:27 +0000
commitbd6c86d3a30d27ed4960863a653376c54e5e5e34 (patch)
tree29c6ad4e9539282028c9452870416c61d731ab7b
parentaf400e26aec5828ac63fd1e2273172f3ac9da44e (diff)
* rt_socket.c: (kernel_rtm_ipv4) prefix_buf could be passed
to zlog_err() uninitialized with debug disabled. Fixed.
-rw-r--r--zebra/ChangeLog5
-rw-r--r--zebra/rt_socket.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 646027b9..b7c4d5ce 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-12 Denis Ovsienko
+
+ * rt_socket.c: (kernel_rtm_ipv4) prefix_buf could be passed
+ to zlog_err() uninitialized with debug disabled. Fixed.
+
2007-09-06 Denis Ovsienko
* rtread_sysctl.c: (route_read) Set RTF_DONE on the routing
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c
index e8668a1d..63e4612f 100644
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@ -207,6 +207,9 @@ kernel_rtm_ipv4 (int cmd, struct prefix *p, struct rib *rib, int family)
case ZEBRA_ERR_RTNOEXIST:
case ZEBRA_ERR_RTUNREACH:
default:
+ /* This point is reachable regardless of debugging mode. */
+ if (!IS_ZEBRA_DEBUG_RIB)
+ inet_ntop (AF_INET, &p->u.prefix, prefix_buf, INET_ADDRSTRLEN);
zlog_err ("%s: %s/%d: rtm_write() unexpectedly returned %d for command %s",
__func__, prefix_buf, p->prefixlen, error, LOOKUP (rtm_type_str, cmd));
break;