From patchwork Thu Nov 15 14:42:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 199314 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4076F2C0404 for ; Fri, 16 Nov 2012 01:42:17 +1100 (EST) Received: from localhost ([::1]:38969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZ0dz-0008F9-BG for incoming@patchwork.ozlabs.org; Thu, 15 Nov 2012 09:42:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZ0dq-0008F1-AE for qemu-devel@nongnu.org; Thu, 15 Nov 2012 09:42:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TZ0dn-0004xH-84 for qemu-devel@nongnu.org; Thu, 15 Nov 2012 09:42:06 -0500 Received: from ssl.dlhnet.de ([91.198.192.8]:42804 helo=ssl.dlh.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZ0dn-0004xA-1Z for qemu-devel@nongnu.org; Thu, 15 Nov 2012 09:42:03 -0500 Received: from localhost (localhost [127.0.0.1]) by ssl.dlh.net (Postfix) with ESMTP id 5349514CB77; Thu, 15 Nov 2012 15:42:01 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ssl.dlh.net Received: from ssl.dlh.net ([127.0.0.1]) by localhost (ssl.dlh.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9erDMaiGezSY; Thu, 15 Nov 2012 15:42:00 +0100 (CET) Received: from [172.21.12.60] (unknown [82.141.1.226]) by ssl.dlh.net (Postfix) with ESMTPSA id B087A14CB74; Thu, 15 Nov 2012 15:42:00 +0100 (CET) Message-ID: <50A4FF3E.4010209@dlhnet.de> Date: Thu, 15 Nov 2012 15:42:06 +0100 From: Peter Lieven User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "qemu-devel@nongnu.org" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 91.198.192.8 Cc: kwolf@redhat.com, ronnie sahlberg Subject: [Qemu-devel] [PATCH] iscsi: fix segfault in url parsing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If an invalid URL is specified iscsi_get_error(iscsi) is called with iscsi == NULL. Signed-off-by: Peter Lieven Acked-By: ronniesahlberg@gmail.com --- block/iscsi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) } diff --git a/block/iscsi.c b/block/iscsi.c index d0b1a10..b5c3161 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -947,8 +947,7 @@ static int iscsi_open(BlockDriverState *bs, const char *filename, int flags) iscsi_url = iscsi_parse_full_url(iscsi, filename); if (iscsi_url == NULL) { - error_report("Failed to parse URL : %s %s", filename, - iscsi_get_error(iscsi)); + error_report("Failed to parse URL : %s", filename); ret = -EINVAL; goto out;