From a78b17112f657be73b342476e9e1ebae16a1c685 Mon Sep 17 00:00:00 2001
From: David Zafman <dzafman@redhat.com>
Date: Mon, 12 Jun 2017 11:28:48 -0700
Subject: [PATCH] osd: be_select_auth_object() sanity check oi soid

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

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9614ab556ca8e4e5daec1e71d9b6032633ba21a0)
---
 src/osd/PGBackend.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 2800c0ce7ce7f..522c6a72b996e 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -603,6 +603,12 @@ map<pg_shard_t, ScrubMap *>::const_iterator
       goto out;
     }
 
+    if (oi.soid != obj) {
+      shard_info.set_oi_attr_corrupted();
+      error_string += " oi_attr_corrupted";
+      goto out;
+    }
+
     if (auth_version != eversion_t()) {
       if (!object_error.has_object_info_inconsistency() && !(bl == auth_bl)) {
 	object_error.set_object_info_inconsistency();
-- 
2.39.5