From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2Lv8-0004wr-Jn for qemu-devel@nongnu.org; Fri, 27 Nov 2015 11:30:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2Lv6-0001lG-Ty for qemu-devel@nongnu.org; Fri, 27 Nov 2015 11:30:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2Lv6-0001kg-PP for qemu-devel@nongnu.org; Fri, 27 Nov 2015 11:30:48 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 7496FA91 for ; Fri, 27 Nov 2015 16:30:48 +0000 (UTC) From: "Daniel P. Berrange" Date: Fri, 27 Nov 2015 16:30:34 +0000 Message-Id: <1448641837-1632-3-git-send-email-berrange@redhat.com> In-Reply-To: <1448641837-1632-1-git-send-email-berrange@redhat.com> References: <1448641837-1632-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v3 2/5] qemu-char: convert to use error checked base64 decode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster 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 Signed-off-by: Daniel P. Berrange --- 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 8b1a423..7d92c04 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 5448b0f..ac01d73 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 #include @@ -3259,7 +3260,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 9d8b42f..1b47cdd 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