From: Sage Weil <sage@redhat.com>
Date: Tue, 15 Jan 2019 02:48:36 +0000 (-0600)
Subject: msg/msg_types: make set_sockaddr() a bit more robust
X-Git-Tag: v14.1.0~371^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02f6b7b623235d60e37d5c8889bafdeb4eca31f8;p=ceph.git

msg/msg_types: make set_sockaddr() a bit more robust

We should keep the unused parts of u zeroed.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index 1049ad540a0c..63d64ce8c602 100644
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -313,9 +313,13 @@ struct entity_addr_t {
   {
     switch (sa->sa_family) {
     case AF_INET:
+      // pre-zero, since we're only copying a portion of the source
+      memset(&u, 0, sizeof(u));
       memcpy(&u.sin, sa, sizeof(u.sin));
       break;
     case AF_INET6:
+      // pre-zero, since we're only copying a portion of the source
+      memset(&u, 0, sizeof(u));
       memcpy(&u.sin6, sa, sizeof(u.sin6));
       break;
     default: