From 9accb70e228eed6bdd9f82d64476f0b776cee30b Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Mon, 1 Jul 2019 17:25:32 -0500
Subject: [PATCH] common/blkdev: fix smartctl output in error path

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/common/blkdev.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc
index 4ecd1d8d3f4..789e7e087c2 100644
--- a/src/common/blkdev.cc
+++ b/src/common/blkdev.cc
@@ -727,10 +727,11 @@ int block_device_get_metrics(const string& devname, int timeout,
   // smartctl
   if (int r = block_device_run_smartctl(devname, timeout, &s);
       r != 0) {
+    string orig = s;
     s = "{\"error\": \"smartctl failed\", \"dev\": \"/dev/";
     s += devname;
     s += "\", \"smartctl_error_code\": " + stringify(r);
-    s += "\", \"smartctl_output\": \"" + s;
+    s += "\", \"smartctl_output\": \"" + escape_quotes(orig);
     s += + "\"}";
   } else if (!json_spirit::read(s, *result)) {
     string orig = s;
-- 
2.47.3