From nobody Sun Apr 28 14:37:51 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1499763953378912.026150318538; Tue, 11 Jul 2017 02:05:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 946D4C060208; Tue, 11 Jul 2017 09:05:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2714F7D478; Tue, 11 Jul 2017 09:05:49 +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 DFC7D1800C82; Tue, 11 Jul 2017 09:05:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6B95kJT008527 for ; Tue, 11 Jul 2017 05:05:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6484B19151; Tue, 11 Jul 2017 09:05:46 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF4E519150 for ; Tue, 11 Jul 2017 09:05:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 946D4C060208 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 946D4C060208 From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 11 Jul 2017 11:05:39 +0200 Message-Id: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] virFileInData: Report an error if unable to reposition file 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.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 11 Jul 2017 09:05:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The purpose of this function is to tell if the current position in given FD is in data section or a hole and how much bytes there is remaining until the end of the section. This is achieved by couple of lseeks(). The most important part is that we reposition the FD back, so that the position is unchanged from the caller POV. And until now the final lseek() back to the original position was done with no check for errors. And I was convinced that that's okay since nothing can go wrong. However, John persuaded me, that it's better to be safe than sorry. Therefore, lets check if the final lseek() succeeded and if it doesn't report an error. Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- src/util/virfile.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index d444b32f8..2f28e83f4 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3900,8 +3900,12 @@ virFileInData(int fd, ret =3D 0; cleanup: /* At any rate, reposition back to where we started. */ - if (cur !=3D (off_t) -1) - ignore_value(lseek(fd, cur, SEEK_SET)); + if (cur !=3D (off_t) -1 && + lseek(fd, cur, SEEK_SET) =3D=3D (off_t) -1) { + virReportSystemError(errno, "%s", + _("unable to restore position in file")); + ret =3D -1; + } return ret; } =20 --=20 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list