diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch index 9bc2fa21e..5f634bf7c 100644 --- a/patches/0002-cmake-disable-version-from-git.patch +++ b/patches/0002-cmake-disable-version-from-git.patch @@ -1,7 +1,7 @@ -From 65811db5d26a76cd4f5eb62c0515d1a11d0b668c Mon Sep 17 00:00:00 2001 +From 4df31954840f36329b88478c42408c038e9c706c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 31 May 2017 14:33:09 +0200 -Subject: [PATCH 2/3] cmake: disable version from git +Subject: [PATCH 2/4] cmake: disable version from git MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0003-enable-systemd-targets-by-default.patch index fef9d90ce..6eb510df7 100644 --- a/patches/0003-enable-systemd-targets-by-default.patch +++ b/patches/0003-enable-systemd-targets-by-default.patch @@ -1,7 +1,7 @@ -From d582ef1c55087f9bb1be5d99f1238e865ac8be9e Mon Sep 17 00:00:00 2001 +From 71a7eac99b460cfd32584a4e20cfc357e30dbf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 22 Mar 2017 09:00:34 +0100 -Subject: [PATCH 3/3] enable systemd targets by default +Subject: [PATCH 3/4] enable systemd targets by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch b/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch new file mode 100644 index 000000000..6c338f488 --- /dev/null +++ b/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch @@ -0,0 +1,34 @@ +From 97974f5d003e41ee818392ea6a7bdd27be266bdd Mon Sep 17 00:00:00 2001 +From: Vasily Philipov +Date: Tue, 3 Oct 2017 12:15:13 +0300 +Subject: [PATCH 4/4] msg/async/rdma: uninitialized variable fix +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When port constructor is called gid_idx variable stays uninitialized if +"#else" case is acting. + +Signed-off-by: Vasily Philipov +(cherry picked from commit 7ba25bb52a66566c52b352bd6f05794853a6cdca) +Signed-off-by: Fabian Grünbichler +--- + src/msg/async/rdma/Infiniband.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/msg/async/rdma/Infiniband.cc b/src/msg/async/rdma/Infiniband.cc +index 37e1a53077..06f514fe24 100644 +--- a/src/msg/async/rdma/Infiniband.cc ++++ b/src/msg/async/rdma/Infiniband.cc +@@ -28,7 +28,7 @@ static const uint32_t MAX_INLINE_DATA = 0; + static const uint32_t TCP_MSG_LEN = sizeof("0000:00000000:00000000:00000000:00000000000000000000000000000000"); + static const uint32_t CQ_DEPTH = 30000; + +-Port::Port(CephContext *cct, struct ibv_context* ictxt, uint8_t ipn): ctxt(ictxt), port_num(ipn), port_attr(new ibv_port_attr) ++Port::Port(CephContext *cct, struct ibv_context* ictxt, uint8_t ipn): ctxt(ictxt), port_num(ipn), port_attr(new ibv_port_attr), gid_idx(0) + { + #ifdef HAVE_IBV_EXP + union ibv_gid cgid; +-- +2.14.1 + diff --git a/patches/series b/patches/series index 27f742349..1be317a38 100644 --- a/patches/series +++ b/patches/series @@ -1,3 +1,4 @@ 0001-update-changelog.patch 0002-cmake-disable-version-from-git.patch 0003-enable-systemd-targets-by-default.patch +0004-msg-async-rdma-uninitialized-variable-fix.patch