From nobody Fri May 3 07:55:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532511030700142.44522626725256; Wed, 25 Jul 2018 02:30:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E82F308A971; Wed, 25 Jul 2018 09:30:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CA01C4B18; Wed, 25 Jul 2018 09:30:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id AC2AC4A464; Wed, 25 Jul 2018 09:30:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6P9UNwF027604 for ; Wed, 25 Jul 2018 05:30:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 949041102E1F; Wed, 25 Jul 2018 09:30:23 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 359F91102E23 for ; Wed, 25 Jul 2018 09:30:20 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 25 Jul 2018 11:30:16 +0200 Message-Id: <20180725093016.21139-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] util: Fix virStorageBackendIQNFound() to work on FreeBSD X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 25 Jul 2018 09:30:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Despite being standardized in POSIX.1-2008, the 'm' sscanf() modifier is currently not available on FreeBSD. Reimplement parsing without sscanf() to work around the issue. Signed-off-by: Andrea Bolognani --- src/util/viriscsi.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index e2c80acaaa..96934df948 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -146,8 +146,10 @@ virStorageBackendIQNFound(const char *initiatoriqn, =20 line =3D outbuf; while (line && *line) { + char *current =3D line; char *newline; - int num; + char *next; + int i; =20 if (!(newline =3D strchr(line, '\n'))) break; @@ -156,15 +158,29 @@ virStorageBackendIQNFound(const char *initiatoriqn, =20 VIR_FREE(iface); VIR_FREE(iqn); - num =3D sscanf(line, "%ms %*[^,],%*[^,],%*[^,],%*[^,],%ms", &iface= , &iqn); =20 - if (num !=3D 2) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("malformed output of %s: %s"), - ISCSIADM, line); + /* Find the first space, copy everything up to that point into + * iface and move past it to continue processing */ + if (!(next =3D strchr(current, ' '))) + goto error; + + if (VIR_STRNDUP(iface, current, (next - current)) < 0) goto cleanup; + + current =3D next + 1; + + /* There are five comma separated fields after iface and we only + * care about the last one, so we need to skip four commas and + * copy whatever's left into iqn */ + for (i =3D 0; i < 4; i++) { + if (!(next =3D strchr(current, ','))) + goto error; + current =3D next + 1; } =20 + if (VIR_STRDUP(iqn, current) < 0) + goto cleanup; + if (STREQ(iqn, initiatoriqn)) { VIR_STEAL_PTR(*ifacename, iface); =20 @@ -186,6 +202,12 @@ virStorageBackendIQNFound(const char *initiatoriqn, VIR_FREE(outbuf); virCommandFree(cmd); return ret; + + error: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("malformed output of %s: %s"), + ISCSIADM, line); + goto cleanup; } =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list