From: Brad Hubbard <bhubbard@redhat.com>
Date: Tue, 10 Apr 2018 02:05:11 +0000 (+1000)
Subject: msg/async/AsyncConnection: Fix FPE in process_connection
X-Git-Tag: v13.1.0~313^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3152797eafa52a8885e415ab75f8dcea570cddd9;p=ceph.git

msg/async/AsyncConnection: Fix FPE in process_connection

Check ms_inject_socket_failures is valid before we use it.

Fixes: http://tracker.ceph.com/issues/23618

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 23532de85f5e..c6384e34165f 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -970,7 +970,8 @@ ssize_t AsyncConnection::_process_connection()
         ldout(async_msgr->cct, 20) << __func__ << " connect peer addr for me is " << peer_addr_for_me << dendl;
         lock.unlock();
         async_msgr->learned_addr(peer_addr_for_me);
-        if (async_msgr->cct->_conf->ms_inject_internal_delays) {
+        if (async_msgr->cct->_conf->ms_inject_internal_delays
+            && async_msgr->cct->_conf->ms_inject_socket_failures) {
           if (rand() % async_msgr->cct->_conf->ms_inject_socket_failures == 0) {
             ldout(msgr->cct, 10) << __func__ << " sleep for "
                                  << async_msgr->cct->_conf->ms_inject_internal_delays << dendl;