]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async/AsyncConnection: Fix FPE in process_connection 21314/head
authorBrad Hubbard <bhubbard@redhat.com>
Tue, 10 Apr 2018 02:05:11 +0000 (12:05 +1000)
committerBrad Hubbard <bhubbard@redhat.com>
Tue, 10 Apr 2018 02:05:11 +0000 (12:05 +1000)
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>
src/msg/async/AsyncConnection.cc

index 23532de85f5edba4a58d3fb6969ee485acc4c728..c6384e34165f8ab89872c03de477597ff25a8f28 100644 (file)
@@ -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;