From 3152797eafa52a8885e415ab75f8dcea570cddd9 Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Tue, 10 Apr 2018 12:05:11 +1000 Subject: [PATCH] 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 --- src/msg/async/AsyncConnection.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- 2.47.3