From nobody Wed Nov 12 02:02:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1567458312; cv=none; d=zoho.com; s=zohoarc; b=Ycnz8Z6xx53xPJPMEWRdeIfRECl8DOLl/A7BUrhHtpRYeMNMtosUctM/rruE9lBwoweJEju6zwFQma/n+kSRaOCxDJjzc38oNRM3ig99pmYRSOCZaCfRHvM6c/7xVH9wuhX+9o8qFP0nN7WrRLH1kzQ8oXIRLwTtUghS6fTJi+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567458312; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=u9G4IYIbYDj0k9bcX3iHzHaFezRpdzekc5r3iFKBM9A=; b=E1l1RF+iWL/8YnBLWIuA6Zo/CVmFiPOflKSQeKBiY7Y4u/2zgWHU8JapJkV1DQqFrcIeZrj2xWsSqdkB59inp7KkU9xZEmPX7vPiRZP8meDU1P2HCHH572RHHE7aOwvvyiY3F5S7w05QWeM2wPot84NyARpH4na+b9wEE5XLXyE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1567458312513740.3542163816069; Mon, 2 Sep 2019 14:05:12 -0700 (PDT) Received: from localhost ([::1]:40014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4tVf-00020n-9e for importer@patchew.org; Mon, 02 Sep 2019 17:05:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33442) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4tPg-0005ts-OC for qemu-devel@nongnu.org; Mon, 02 Sep 2019 16:59:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4tPf-0004PJ-BX for qemu-devel@nongnu.org; Mon, 02 Sep 2019 16:59:00 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:46060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4tPf-0004Om-84 for qemu-devel@nongnu.org; Mon, 02 Sep 2019 16:58:59 -0400 Received: by mail-qk1-x731.google.com with SMTP id z67so744942qkb.12 for ; Mon, 02 Sep 2019 13:58:59 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:9589:1351:c7eb:87b:c9d5]) by smtp.gmail.com with ESMTPSA id w80sm4604038qka.62.2019.09.02.13.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 13:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u9G4IYIbYDj0k9bcX3iHzHaFezRpdzekc5r3iFKBM9A=; b=FXOea6Fzqk8z9B82LH0nnAtVHBnHVinX6vqaEqZ2ZhZ7/cOw1Qble8mDEWbI5Nkb8M 5n8zvoSgOK5AVggmbwMFBqsISZgeqGyjkLtqCAHPK71FI1XMC8ho16x27/KzGI0TJ2ca R5+gIF2JqsOxb/FXmV/u/EFTGI+LSjdDYhUdLWDYDoagqz10xJqJwsmOrYjBZ+JFrOkv qXvJ4rFZHixcMHKQTq1s79Ek3VP07J+QmworPEVaMn6JRfU+tOy1oihEf8/rHjW2dQOg vLHjRXSKqydePUxklvjU1+7v8t3Hlq4mEpMjrLc1unawAv3cOWemr5FXKVqoxNi8viLu vQCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u9G4IYIbYDj0k9bcX3iHzHaFezRpdzekc5r3iFKBM9A=; b=rEQIHoTa0If+zpkH2Cv9KCFiYvN9Rc1jJC1hEZIVaDm5QvfBTxXccHs7xfYCz4wGL0 lGP49dvHgwuNCsNAV0aEsvr4QdZDaVJ2bvYMvjQqoSFMRgUB5Dyj5ZmxaueHSkJm986b u5WWivhqcXzY6olSboKCzxYu5x26XKKwUhVvOXyUol7dvxGIOXTNIvc91Zp94vtN619S n09xIDuQHPEtyLpRSF15S6j8qm8yWgkdEDheb/xSlxt5jsM6NaxncQD3uuKSK0P6A7/e WzI/d1sGkP1cil/4dRfs+dFfvyCRbnrZoLIzvOGukcyTwjtHypp3drmg6UWafY9RK0B4 2kcw== X-Gm-Message-State: APjAAAXxrjclQe0rpYCbfu2sLuzTfqMiy4hb8xVOSTDg0uMKOUpdAp1y KzBoY1GJkxLHeaKDw1lnPmcdqN/y X-Google-Smtp-Source: APXvYqyxXl+g/BVjWlYYEzchUJPbT8zY/ID1e/zOPzQ5T3wbW2QCRDwL5MrDDSKDdwuNLDExCOFL1g== X-Received: by 2002:ae9:f707:: with SMTP id s7mr3749476qkg.195.1567457938646; Mon, 02 Sep 2019 13:58:58 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Mon, 2 Sep 2019 17:58:42 -0300 Message-Id: <20190902205842.1884-5-danielhb413@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190902205842.1884-1-danielhb413@gmail.com> References: <20190902205842.1884-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::731 Subject: [Qemu-devel] [PATCH v6 4/4] qemu-iotests: adding LUKS cleanup for non-UTF8 secret error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Daniel Henrique Barboza , jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch adds a new test file, 257, to exercise the case where qemu-img fails to complete for the LUKS format when a non-UTF8 secret is used. Signed-off-by: Daniel Henrique Barboza --- tests/qemu-iotests/259 | 67 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/259.out | 11 +++++++ tests/qemu-iotests/group | 1 + 3 files changed, 79 insertions(+) create mode 100755 tests/qemu-iotests/259 create mode 100644 tests/qemu-iotests/259.out diff --git a/tests/qemu-iotests/259 b/tests/qemu-iotests/259 new file mode 100755 index 0000000000..cb362598b4 --- /dev/null +++ b/tests/qemu-iotests/259 @@ -0,0 +1,67 @@ +#!/usr/bin/env bash +# +# Test qemu-img file cleanup for LUKS when using a non-UTF8 secret +# +# Copyright (C) 2019, IBM Corporation. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +seq=3D`basename $0` +echo "QA output created by $seq" + +status=3D1 # failure is the default! +TEST_IMAGE_FILE=3D'vol.img' + +_cleanup() +{ + _cleanup_test_img + rm non_utf8_secret + rm -f $TEST_IMAGE_FILE +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +_supported_fmt luks +_supported_proto generic +_unsupported_proto vxhs + +echo "=3D=3D Create non-UTF8 secret =3D=3D" +echo -n -e '\x3a\x3c\x3b\xff' > non_utf8_secret +SECRET=3D"secret,id=3Dsec0,file=3Dnon_utf8_secret" + +echo "=3D=3D Throws an error because of invalid UTF-8 secret =3D=3D" +$QEMU_IMG create -f $IMGFMT --object $SECRET -o "key-secret=3Dsec0" $TEST_= IMAGE_FILE 4M + +echo "=3D=3D Image file should not exist after the error =3D=3D" +if test -f "$TEST_IMAGE_FILE"; then + exit 1 +fi + +echo "=3D=3D Create a stub image file and run qemu-img again =3D=3D" +touch $TEST_IMAGE_FILE +$QEMU_IMG create -f $IMGFMT --object $SECRET -o "key-secret=3Dsec0" $TEST_= IMAGE_FILE 4M + +echo "=3D=3D Pre-existing image file should also be deleted after the erro= r =3D=3D" +if test -f "$TEST_IMAGE_FILE"; then + exit 1 +fi + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 diff --git a/tests/qemu-iotests/259.out b/tests/qemu-iotests/259.out new file mode 100644 index 0000000000..6b0188111c --- /dev/null +++ b/tests/qemu-iotests/259.out @@ -0,0 +1,11 @@ +QA output created by 259 +=3D=3D Create non-UTF8 secret =3D=3D +=3D=3D Throws an error because of invalid UTF-8 secret =3D=3D +qemu-img: vol.img: Data from secret sec0 is not valid UTF-8 +Formatting 'vol.img', fmt=3Dluks size=3D4194304 key-secret=3Dsec0 +=3D=3D Image file should not exist after the error =3D=3D +=3D=3D Create a stub image file and run qemu-img again =3D=3D +qemu-img: vol.img: Data from secret sec0 is not valid UTF-8 +Formatting 'vol.img', fmt=3Dluks size=3D4194304 key-secret=3Dsec0 +=3D=3D Pre-existing image file should also be deleted after the error =3D= =3D + *** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index d95d556414..67c3faf80f 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -273,4 +273,5 @@ 256 rw quick 257 rw 258 rw quick +259 rw auto quick 262 rw quick migration --=20 2.21.0