From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTkFD-0007Fp-Um for qemu-devel@nongnu.org; Mon, 03 Dec 2018 04:10:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTk4x-0002JL-Jg for qemu-devel@nongnu.org; Mon, 03 Dec 2018 03:59:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48418) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gTk4v-0002H5-KU for qemu-devel@nongnu.org; Mon, 03 Dec 2018 03:59:47 -0500 From: Gerd Hoffmann Date: Mon, 3 Dec 2018 09:59:38 +0100 Message-Id: <20181203085938.10247-3-kraxel@redhat.com> In-Reply-To: <20181203085938.10247-1-kraxel@redhat.com> References: <20181203085938.10247-1-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH for-3.1 v2 2/2] usb-mtp: outlaw slashes in filenames List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: public@hansmi.ch, Gerd Hoffmann Slash is unix directory separator, so they are not allowed in filenames. Note this also stops the classic escape via "../". Fixes: CVE-2018-16867 Reported-by: Michael Hanselmann Signed-off-by: Gerd Hoffmann --- hw/usb/dev-mtp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 0f6a9702ef..e340a2c6e3 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1719,6 +1719,12 @@ static void usb_mtp_write_metadata(MTPState *s) filename = utf16_to_str(dataset->length, dataset->filename); + if (strchr(filename, '/')) { + usb_mtp_queue_result(s, PARAMETER_NOT_SUPPORTED, d->trans, + 0, 0, 0, 0); + return; + } + o = usb_mtp_object_lookup_name(p, filename, dataset->length); if (o != NULL) { next_handle = o->handle; -- 2.9.3