From 7be8bbfe81a3032127cb7c5d4f55f8a39036a2f9 Mon Sep 17 00:00:00 2001
From: Mudit Agarwal <muagarwa@redhat.com>
Date: Thu, 11 Jun 2020 07:32:12 +0530
Subject: [PATCH] rbd: additional error checking in GetPoolMetadata,
 SetPoolMetadata and RemovePoolMetadata

added a check to validate ioctx in all the three *PoolMetadata functions

Signed-off-by: Mudit Agarwal <muagarwa@redhat.com>
---
 rbd/pool_nautilus.go      | 12 ++++++++++++
 rbd/pool_nautilus_test.go | 18 ++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/rbd/pool_nautilus.go b/rbd/pool_nautilus.go
index 22610ed..d436064 100644
--- a/rbd/pool_nautilus.go
+++ b/rbd/pool_nautilus.go
@@ -23,6 +23,10 @@ import (
 // Implements:
 //  int rbd_pool_metadata_get(rados_ioctx_t io_ctx, const char *key, char *value, size_t *val_len);
 func GetPoolMetadata(ioctx *rados.IOContext, key string) (string, error) {
+	if ioctx == nil {
+		return "", ErrNoIOContext
+	}
+
 	cKey := C.CString(key)
 	defer C.free(unsafe.Pointer(cKey))
 
@@ -52,6 +56,10 @@ func GetPoolMetadata(ioctx *rados.IOContext, key string) (string, error) {
 // Implements:
 //  int rbd_pool_metadata_set(rados_ioctx_t io_ctx, const char *key, const char *value);
 func SetPoolMetadata(ioctx *rados.IOContext, key, value string) error {
+	if ioctx == nil {
+		return ErrNoIOContext
+	}
+
 	cKey := C.CString(key)
 	defer C.free(unsafe.Pointer(cKey))
 	cValue := C.CString(value)
@@ -66,6 +74,10 @@ func SetPoolMetadata(ioctx *rados.IOContext, key, value string) error {
 // Implements:
 //  int rbd_pool_metadata_remove(rados_ioctx_t io_ctx, const char *key)
 func RemovePoolMetadata(ioctx *rados.IOContext, key string) error {
+	if ioctx == nil {
+		return ErrNoIOContext
+	}
+
 	cKey := C.CString(key)
 	defer C.free(unsafe.Pointer(cKey))
 
diff --git a/rbd/pool_nautilus_test.go b/rbd/pool_nautilus_test.go
index 5042d71..30e7d1f 100644
--- a/rbd/pool_nautilus_test.go
+++ b/rbd/pool_nautilus_test.go
@@ -30,6 +30,24 @@ func TestPoolMetadata(t *testing.T) {
 		assert.Error(t, err)
 	})
 
+	t.Run("NullKey", func(t *testing.T) {
+		_, err := GetPoolMetadata(ioctx, "")
+		assert.Error(t, err)
+		err = SetPoolMetadata(ioctx, "", "")
+		assert.NoError(t, err)
+		err = RemovePoolMetadata(ioctx, "")
+		assert.NoError(t, err)
+	})
+
+	t.Run("NullIOContext", func(t *testing.T) {
+		_, err := GetPoolMetadata(nil, "someKey")
+		assert.Error(t, err)
+		err = SetPoolMetadata(nil, "someKey", "someValue")
+		assert.Error(t, err)
+		err = RemovePoolMetadata(nil, "someKey")
+		assert.Error(t, err)
+	})
+
 	t.Run("SetGetValues", func(t *testing.T) {
 		var (
 			key1 = "key1"