qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: jdurgin@redhat.com, jcody@redhat.com, kwolf@redhat.com,
	mreitz@redhat.com, eblake@redhat.com
Subject: [Qemu-devel] [PATCH RFC v2 9/9] rbd: Reject invalid authentication methods
Date: Fri, 24 Mar 2017 18:44:42 +0100	[thread overview]
Message-ID: <1490377482-13337-10-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1490377482-13337-1-git-send-email-armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 block/rbd.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/block/rbd.c b/block/rbd.c
index e962641..19fd820 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -15,6 +15,7 @@
 
 #include <rbd/librbd.h>
 #include "qapi/error.h"
+#include "qapi/util.h"
 #include "qemu/error-report.h"
 #include "block/block_int.h"
 #include "crypto/secret.h"
@@ -506,11 +507,17 @@ static char *qemu_rbd_auth(QDict *options, Error **errp)
         }
 
         vals[i] = qstring_get_str(qobject_to_qstring(val));
+        if (qapi_enum_parse(RbdAuthSupport_lookup, vals[i],
+                            RBD_AUTH_SUPPORT__MAX, -1, errp) < 0) {
+            rados_str = NULL;
+            goto out;
+        }
         qdict_del(options, keybuf);
     }
     vals[i] = NULL;
 
     rados_str = i ? g_strjoinv(";", (char **)vals) : NULL;
+out:
     g_free(vals);
     return rados_str;
 }
-- 
2.7.4

  parent reply	other threads:[~2017-03-24 17:44 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-24 17:44 [Qemu-devel] [PATCH RFC v2 0/9] rbd: Clean up API and code Markus Armbruster
2017-03-24 17:44 ` [Qemu-devel] [PATCH RFC v2 1/9] rbd: Reject -blockdev server.*.{numeric, to, ipv4, ipv6} Markus Armbruster
2017-03-24 18:05   ` Eric Blake
2017-03-24 17:44 ` [Qemu-devel] [PATCH RFC v2 2/9] rbd: Fix to cleanly reject -drive without pool or image Markus Armbruster
2017-03-24 18:23   ` Eric Blake
2017-03-24 17:44 ` [Qemu-devel] [PATCH RFC v2 3/9] rbd: Don't limit length of parameter values Markus Armbruster
2017-03-24 18:34   ` Eric Blake
2017-03-24 17:44 ` [Qemu-devel] [PATCH RFC v2 4/9] rbd: Clean up after the previous commit Markus Armbruster
2017-03-24 18:44   ` Eric Blake
2017-03-24 17:44 ` [Qemu-devel] [PATCH RFC v2 5/9] rbd: Don't accept -drive driver=rbd, keyvalue-pairs= Markus Armbruster
2017-03-24 18:53   ` Eric Blake
2017-03-24 17:44 ` [Qemu-devel] [PATCH RFC v2 6/9] rbd: Clean up runtime_opts, fix -drive to reject filename Markus Armbruster
2017-03-24 18:55   ` Eric Blake
2017-03-24 17:44 ` [Qemu-devel] [PATCH RFC v2 7/9] rbd: Clean up qemu_rbd_create()'s detour through QemuOpts Markus Armbruster
2017-03-24 17:44 ` [Qemu-devel] [PATCH RFC v2 8/9] rbd: Rewrite the code to extract list-valued options Markus Armbruster
2017-03-24 19:03   ` Eric Blake
2017-03-24 17:44 ` Markus Armbruster [this message]
2017-03-24 19:05   ` [Qemu-devel] [PATCH RFC v2 9/9] rbd: Reject invalid authentication methods Eric Blake

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1490377482-13337-10-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=jcody@redhat.com \
    --cc=jdurgin@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).