[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 2/5] qemu-char: convert to use error checked base6
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 2/5] qemu-char: convert to use error checked base64 decode |
Date: |
Fri, 18 Dec 2015 16:53:17 +0000 |
Switch from using g_base64_decode over to qbase64_decode
in order to get error checking of the base64 input data.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
qapi-schema.json | 2 --
qemu-char.c | 8 +++++++-
qmp-commands.hx | 2 --
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 516b145..2e31733 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -295,8 +295,6 @@
# @format: #optional data encoding (default 'utf8').
# - base64: data must be base64 encoded text. Its binary
# decoding gets written.
-# Bug: invalid base64 is currently not rejected.
-# Whitespace *is* invalid.
# - utf8: data's UTF-8 encoding is written
# - data itself is always Unicode regardless of format, like
# any other string.
diff --git a/qemu-char.c b/qemu-char.c
index 66703e3..00a7526 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -32,6 +32,7 @@
#include "qapi/qmp-input-visitor.h"
#include "qapi/qmp-output-visitor.h"
#include "qapi-visit.h"
+#include "qemu/base64.h"
#include <unistd.h>
#include <fcntl.h>
@@ -3264,7 +3265,12 @@ void qmp_ringbuf_write(const char *device, const char
*data,
}
if (has_format && (format == DATA_FORMAT_BASE64)) {
- write_data = g_base64_decode(data, &write_count);
+ write_data = qbase64_decode(data, -1,
+ &write_count,
+ errp);
+ if (!write_data) {
+ return;
+ }
} else {
write_data = (uint8_t *)data;
write_count = strlen(data);
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 6f3a25d..7b235ee 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -512,8 +512,6 @@ Arguments:
- "data": data to write (json-string)
- "format": data format (json-string, optional)
- Possible values: "utf8" (default), "base64"
- Bug: invalid base64 is currently not rejected.
- Whitespace *is* invalid.
Example:
--
2.5.0
- [Qemu-devel] [PULL v1 0/5] Support for securely passing secrets to QEMU, Daniel P. Berrange, 2015/12/18
- [Qemu-devel] [PULL v1 2/5] qemu-char: convert to use error checked base64 decode,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 1/5] util: add base64 decoding function, Daniel P. Berrange, 2015/12/18
- [Qemu-devel] [PULL v1 3/5] qga: convert to use error checked base64 decode, Daniel P. Berrange, 2015/12/18
- [Qemu-devel] [PULL v1 5/5] crypto: add support for loading encrypted x509 keys, Daniel P. Berrange, 2015/12/18
- [Qemu-devel] [PULL v1 4/5] crypto: add QCryptoSecret object class for password/key handling, Daniel P. Berrange, 2015/12/18
- Re: [Qemu-devel] [PULL v1 0/5] Support for securely passing secrets to QEMU, Peter Maydell, 2015/12/18