From nobody Sat May 4 22:02:37 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1562239944; cv=none; d=zoho.com; s=zohoarc; b=jTTwVAuyWNL8K7sypwlSvfzV81KNq1Pk5ZxLYzab7/dX5ZytvBIDaMOk6aOGv0jse4CkJdDDm1MZsqYnCJZnPw0Xp2srlo8fF+WgxOdqQJ3dzwFN8yDH/YAkH55ILjnVkgmA63Bqkq2b9ovzcvu1AyF6c2ulngjMOhzx5JT0i0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562239944; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=qA9XsGfz1oUogOxfsdkPmQtYcpSno7lKuJxXmoPfVYI=; b=aXuBLeolgrlMXq03A+6H24JVGsoAZgQFK5ZBY5tzMWh1K+HF1H94qitYGrKEhdb0P2BEdK1LyeMxcDHShUAgfa7z7K2OBDq9WhG/pRL8Kki7DXSFHtH/KWCor7DfSE92r7T44JGH9WefmtI0aLS5WTPVB8GHdgrMURiJCTytDAQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156223994497064.83612887099946; Thu, 4 Jul 2019 04:32:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 913813001834; Thu, 4 Jul 2019 11:32:16 +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 474BE1001B18; Thu, 4 Jul 2019 11:32:15 +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 F0B351833002; Thu, 4 Jul 2019 11:32:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x64BWAN7014918 for ; Thu, 4 Jul 2019 07:32:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C2C317C3F; Thu, 4 Jul 2019 11:32:10 +0000 (UTC) Received: from mx1.redhat.com (ext-mx17.extmail.prod.ext.phx2.redhat.com [10.5.110.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 26C8A17B97 for ; Thu, 4 Jul 2019 11:32:07 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 98B8830C1208 for ; Thu, 4 Jul 2019 11:31:49 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id x4so6240907wrt.6 for ; Thu, 04 Jul 2019 04:31:49 -0700 (PDT) Received: from archpc.localdomain (x8d1ee222.agdsn.tu-dresden.de. [141.30.226.34]) by smtp.gmail.com with ESMTPSA id r6sm3431343wmh.11.2019.07.04.04.31.46 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 04 Jul 2019 04:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=GqWNUHzYFJVQ2Ys4wy4GAwebAlD/18BtYEHOGNJGI+o=; b=iPK4tUtDVFKm3OTAMmcFdoExm7K1650CGB4jgYm4mmYLL+4xkydSn+uNY5pSi2q4Bt a/AU/bCcHH71Qtc+1tl0YfrseApJKkfeVIj5mTBP2TWJ8fQBGkC5X6NeHDLFnrNx7jhO 8ruWQOjLTZLYYncWAMZFxov4ng5U4FXBphalxH/WELH2mkeeMDbuYcZ21fL5l5smRD6f BTYi81bberlBkD6oVJu44tkHPYyG3maLyWpKWWQwdtASAiYBB/DoINonDQv/iZUXgjET /EP7MMfk7EfpvR0w4ilNsF8YnT+FPljgcjPDgO7xgyyhlC/jgoZCfbdZrJjMesJGMDAL cPcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=GqWNUHzYFJVQ2Ys4wy4GAwebAlD/18BtYEHOGNJGI+o=; b=cW0nOGgpa3rn4VjLix3haQjS4b7h5DrQ8ebAngHFMzFiQivbW1ov8OVFZZIP9iA9MG oHvJip1tXXI6kewQpKsFtkGAXB+N7LivQyY+aPWi3kGPSr+k6KBIUGP7LGlXDtEb08QG lWueqTaVa0fVxLpvPncUGpqWq5tzBuNoxuyVTxzx3BWWNUs5WOTlBhfdr/zN4XquzZAu MI3/7a8o2mgKckcGTj/oeIs2mu1JpjWQLwk2HhslpvQdiYtbef1stBDMW7TxKLfYkIg2 pQ7YsNm93JlpeMcbWXfY14/oYWbqgKU3535WpKHoilnYn0pAeNJE9WDJ55UIyn+yjWBP x3Ow== X-Gm-Message-State: APjAAAWj/ihQWe0SYnc+mxHcwwMwd0dIb3nhrx+p98Hthr3FGosSoX3x CtReT1npL3MFo2om2lMqYdRU4ZDBuB98LQ== X-Google-Smtp-Source: APXvYqwu97V6djB3wmGG5L3HRSWvoHLb/v1G9hWXxesM535v2SEyOMiUZP837hpbM14ha4XKUFhHWQ== X-Received: by 2002:a5d:4ac3:: with SMTP id y3mr3114003wrs.187.1562239907912; Thu, 04 Jul 2019 04:31:47 -0700 (PDT) From: Ilias Stamatis To: libvir-list@redhat.com Date: Thu, 4 Jul 2019 13:31:34 +0200 Message-Id: <20190704113134.31371-1-stamatis.iliass@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 04 Jul 2019 11:31:49 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 04 Jul 2019 11:31:49 +0000 (UTC) for IP:'209.85.221.68' DOMAIN:'mail-wr1-f68.google.com' HELO:'mail-wr1-f68.google.com' FROM:'stamatis.iliass@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.212 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, T_PDS_NO_HELO_DNS) 209.85.221.68 mail-wr1-f68.google.com 209.85.221.68 mail-wr1-f68.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.46 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] test_driver: sanitize user-provided array in testDomainGetDiskErrors 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: , 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 04 Jul 2019 11:32:23 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Zero out the user provided memory in order to avoid passing random pointers to VIR_FREE later. Signed-off-by: Ilias Stamatis Reviewed-by: Erik Skultety --- src/test/test_driver.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 7c58d2c8ce..8ee1f0cad6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3275,6 +3275,7 @@ static int testDomainGetDiskErrors(virDomainPtr dom, virDomainObjPtr vm =3D NULL; int ret =3D -1; size_t i; + size_t nerrors; virCheckFlags(0, -1); @@ -3284,8 +3285,13 @@ static int testDomainGetDiskErrors(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto cleanup; + nerrors =3D MIN(vm->def->ndisks, maxerrors); + if (errors) { - for (i =3D 0; i < MIN(vm->def->ndisks, maxerrors); i++) { + /* sanitize input */ + memset(errors, 0, sizeof(virDomainDiskError) * nerrors); + + for (i =3D 0; i < nerrors; i++) { if (VIR_STRDUP(errors[i].disk, vm->def->disks[i]->dst) < 0) goto cleanup; errors[i].error =3D (i % (VIR_DOMAIN_DISK_ERROR_LAST - 1)) + 1; @@ -3297,7 +3303,7 @@ static int testDomainGetDiskErrors(virDomainPtr dom, cleanup: if (ret < 0) { - for (i =3D 0; i < MIN(vm->def->ndisks, maxerrors); i++) + for (i =3D 0; i < nerrors; i++) VIR_FREE(errors[i].disk); } virDomainObjEndAPI(&vm); -- 2.22.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list