summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-07-10 14:51:29 -0700
committerBen Pfaff <blp@nicira.com>2012-07-11 14:47:19 -0700
commit302a5e9334c2aa26674b66c699a2c77723644f9e (patch)
treecbfed40834648f465e0a5d56c8dcb306aec262e7
parentfdd80c39b1822db6c8b5c8274ff0c5cebcaa36b7 (diff)
downloadopenvswitch-302a5e9334c2aa26674b66c699a2c77723644f9e.tar.gz
cfm: Always initialize CCM "internal_ms_x" extension field.
Found by valgrind: Syscall param socketcall.sendmsg(msg.msg_iov[i]) points to uninitialised byte(s) at 0x42D3021: sendmsg (in /lib/libc-2.5.so) by 0x80E4D23: nl_sock_transact (netlink-socket.c:670) by 0x80D9086: dpif_linux_execute__ (dpif-linux.c:872) by 0x807D6AE: dpif_execute__ (dpif.c:957) by 0x807D6FE: dpif_execute (dpif.c:987) by 0x805DED9: send_packet (ofproto-dpif.c:4727) by 0x805F8E1: port_run_fast (ofproto-dpif.c:2441) by 0x8065CF6: run_fast (ofproto-dpif.c:926) by 0x805674F: ofproto_run_fast (ofproto.c:1148) by 0x804C957: bridge_run_fast (bridge.c:1980) by 0x8053F49: main (ovs-vswitchd.c:123) Address 0xbea0895c is on thread 1's stack Bug #11797. Signed-off-by: Ben Pfaff <blp@nicira.com>
-rw-r--r--lib/cfm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/cfm.c b/lib/cfm.c
index 8acbd0939..f59c4f3d1 100644
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -375,6 +375,8 @@ cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet,
if (cfm->ccm_interval == 0) {
assert(cfm->extended);
ccm->interval_ms_x = htons(cfm->ccm_interval_ms);
+ } else {
+ ccm->interval_ms_x = htons(0);
}
if (hmap_is_empty(&cfm->remote_mps)) {