From nobody Mon Feb 9 04:45:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490962047780373.20643298053983; Fri, 31 Mar 2017 05:07:27 -0700 (PDT) Received: from localhost ([::1]:40637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctvKw-00009Y-HG for importer@patchew.org; Fri, 31 Mar 2017 08:07:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctvIN-0006tK-TD for qemu-devel@nongnu.org; Fri, 31 Mar 2017 08:04:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctvIM-0005Vd-U8 for qemu-devel@nongnu.org; Fri, 31 Mar 2017 08:04:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40548) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctvIH-0005TY-PD; Fri, 31 Mar 2017 08:04:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CD2EC5145C; Fri, 31 Mar 2017 12:04:40 +0000 (UTC) Received: from localhost (unknown [10.40.205.84]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DCB55DD66; Fri, 31 Mar 2017 12:04:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CD2EC5145C Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mreitz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com CD2EC5145C From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 31 Mar 2017 14:04:31 +0200 Message-Id: <20170331120431.1767-3-mreitz@redhat.com> In-Reply-To: <20170331120431.1767-1-mreitz@redhat.com> References: <20170331120431.1767-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 31 Mar 2017 12:04:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.9 2/2] block/curl: Check protocol prefix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If the user has explicitly specified a block driver and thus a protocol, we have to make sure the URL's protocol prefix matches. Otherwise the latter will silently override the former which might catch some users by surprise. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Jeff Cody Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/curl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/curl.c b/block/curl.c index 34dbd335f4..2708d57c2f 100644 --- a/block/curl.c +++ b/block/curl.c @@ -659,6 +659,7 @@ static int curl_open(BlockDriverState *bs, QDict *optio= ns, int flags, const char *cookie; double d; const char *secretid; + const char *protocol_delimiter; =20 static int inited =3D 0; =20 @@ -700,6 +701,15 @@ static int curl_open(BlockDriverState *bs, QDict *opti= ons, int flags, goto out_noclean; } =20 + if (!strstart(file, bs->drv->protocol_name, &protocol_delimiter) || + !strstart(protocol_delimiter, "://", NULL)) + { + error_setg(errp, "%s curl driver cannot handle the URL '%s' (does = not " + "start with '%s://')", bs->drv->protocol_name, file, + bs->drv->protocol_name); + goto out_noclean; + } + s->username =3D g_strdup(qemu_opt_get(opts, CURL_BLOCK_OPT_USERNAME)); secretid =3D qemu_opt_get(opts, CURL_BLOCK_OPT_PASSWORD_SECRET); =20 --=20 2.12.1