From nobody Mon Feb 9 04:03:22 2026 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569448397; cv=none; d=zoho.com; s=zohoarc; b=eMirUtT6DGXaydXAFx4UqA1iaweiiqyEL4Gg9ohTLwGJEKfP3FRyI3cf0x8a/TeRy+EGSWU9q8ZRX2f5pyQouKdpAMHJd3L7uuybrSXuYrBLSpQUn4sBKugC1zmxvqFRxX4Havk5ghDA9AJBwqmYgBuOoYchu4AQYGA6QgjguWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569448397; h=Content-Type: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=ec6pYV43IttUPvPHH7qPCN4KBlZMsu6HHUkpEv6uIq0=; b=SxL1SeCADHIgOQJCYs0F0JI0k6JNbQOUwFMo6s/iCQ8RZ0TqeZ/yhrIt+zheV68yPYA+2Xk9r8AP7hIm0EKKzXiuaLYPARv3FRCkBFEnGw97aPXLyqPAy2hNc+1AMKAxBS19mf8a65wu3XPKRqjJSFkH4nxP6Siqf90MaXAYHks= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1569448397304876.3043689281418; Wed, 25 Sep 2019 14:53:17 -0700 (PDT) Received: from localhost ([::1]:57726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDFDn-0005VM-VY for importer@patchew.org; Wed, 25 Sep 2019 17:53:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39181) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDEy7-0006ux-RC for qemu-devel@nongnu.org; Wed, 25 Sep 2019 17:37:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDEy1-0006qW-4t for qemu-devel@nongnu.org; Wed, 25 Sep 2019 17:36:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34560) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDExh-0006f9-Eb; Wed, 25 Sep 2019 17:36:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 18B3E85540; Wed, 25 Sep 2019 21:36:33 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B2E819C5B; Wed, 25 Sep 2019 21:36:30 +0000 (UTC) From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 13/13] LUKS: better error message when creating too large files Date: Thu, 26 Sep 2019 00:35:27 +0300 Message-Id: <20190925213527.9117-14-mlevitsk@redhat.com> In-Reply-To: <20190925213527.9117-1-mlevitsk@redhat.com> References: <20190925213527.9117-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 25 Sep 2019 21:36:33 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, John Snow , Markus Armbruster , Max Reitz , Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Currently if you attampt to create too large file with luks you get the following error message: Formatting 'test.luks', fmt=3Dluks size=3D17592186044416 key-secret=3Dsec0 qemu-img: test.luks: Could not resize file: File too large While for raw format the error message is qemu-img: test.img: The image size is too large for file format 'raw' The reason for this is that qemu-img checks for errono of the failure, and presents the later error when it is -EFBIG However crypto generic code 'swallows' the errno and replaces it with -EIO. As an attempt to make it better, we can make luks driver, detect -EFBIG and in this case present a better error message, which is what this patch does The new error message is: qemu-img: error creating test.luks: The requested file size is too large Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1534898 Signed-off-by: Maxim Levitsky Reviewed-by: Daniel P. Berrang=C3=A9 --- block/crypto.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index 6e822c6e50..19c2ac602c 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -102,10 +102,12 @@ static ssize_t block_crypto_create_init_func(QCryptoB= lock *block, Error **errp) { struct BlockCryptoCreateData *data =3D opaque; + Error *local_error =3D NULL; + int ret; =20 if (data->size > INT64_MAX || headerlen > INT64_MAX - data->size) { - error_setg(errp, "The requested file size is too large"); - return -EFBIG; + ret =3D -EFBIG; + goto error; } =20 /* @@ -115,6 +117,21 @@ static ssize_t block_crypto_create_init_func(QCryptoBl= ock *block, */ return blk_truncate(data->blk, data->size + headerlen, data->prealloc, errp); + + if (ret >=3D 0) { + return ret; + } + +error: + if (ret =3D=3D -EFBIG) { + /* Replace the error message with a better one */ + error_free(local_error); + error_setg(errp, "The requested file size is too large"); + } else { + error_propagate(errp, local_error); + } + + return ret; } =20 =20 --=20 2.17.2