From nobody Thu Nov 28 10:36:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1692805021; cv=none; d=zohomail.com; s=zohoarc; b=a1PFFcWkkodf4bBsnQL8IqsHtbLZbJ56jyuYw6/i2eFVoQqiI75IXFMVo5JJ7zjNGggryDL55YGpIEpNjPJhG6hqsHWar1Xzms/2yquwA2Mi702HQzbui3jAkl2/4mcu/dulhhMe+ng8IT+WRcpMiwFdli+S+KkjO/yHFMtS+Hk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692805021; 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; bh=RkWOEfnMqqBybIdmhHLeXWKbx/ZYEUVcYQ9Om/+ASEo=; b=cMEIfykLtPZ3GC/fDzNpr03Ij0aapECMymkhouUvRhQONuBfiF2m/dM2TR7LQocTPwFpychVFYsYnEavjpx9ULKaHLFVjj3ulu+JMgQX3BQ2/gA8+vaySJi+guk6+dEPaC8PdVHggQJ8/hDlvvKpBX4/WMAXtgihWLqWWHj+snY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169280502194628.7403998044; Wed, 23 Aug 2023 08:37:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYpt1-0002KA-Vh; Wed, 23 Aug 2023 11:35:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYpsa-0001yS-M1 for qemu-devel@nongnu.org; Wed, 23 Aug 2023 11:34:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYpsZ-00085g-6q for qemu-devel@nongnu.org; Wed, 23 Aug 2023 11:34:44 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-671-mP2aubXKMKGfOsUA38CAGg-1; Wed, 23 Aug 2023 11:34:37 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED98A85CBE0; Wed, 23 Aug 2023 15:34:36 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.193.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 353CA1121315; Wed, 23 Aug 2023 15:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692804882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RkWOEfnMqqBybIdmhHLeXWKbx/ZYEUVcYQ9Om/+ASEo=; b=fTXtJNbpOOYC/yqt9Nd4B4Htqr0SJ+MnlSaqjki7zo1IaPiib+fSevxHi2B2rauE9nTuXF 3VgVE38BvqrlABkbg62axiuCipnPpQQYoQwpWzOe9MAlo4YndDZKeCltEf1dpbaAoC1qmk xCivKXtq+4bK+RUsaLN0ymyc2dCQ2ug= X-MC-Unique: mP2aubXKMKGfOsUA38CAGg-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, David Hildenbrand , Paolo Bonzini , Peter Xu , Igor Mammedov , Thiner Logoer , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Elena Ufimtseva , Jagannathan Raman , "Michael S. Tsirkin" , Ani Sinha , Xiao Guangrong , Daniel Henrique Barboza , Greg Kurz , Eric Blake , Markus Armbruster , Eduardo Habkost Subject: [PATCH v3 07/11] softmmu/physmem: Never return directories from file_ram_open() Date: Wed, 23 Aug 2023 17:34:07 +0200 Message-ID: <20230823153412.832081-8-david@redhat.com> In-Reply-To: <20230823153412.832081-1-david@redhat.com> References: <20230823153412.832081-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692805023109100001 Content-Type: text/plain; charset="utf-8" open() does not fail on directories when opening them readonly (O_RDONLY). Currently, we succeed opening such directories and fail later during mmap(), resulting in a misleading error message. $ ./qemu-system-x86_64 \ -object memory-backend-file,id=3Dram0,mem-path=3Dtmp,readonly=3Dtrue,si= ze=3D1g qemu-system-x86_64: unable to map backing store for guest RAM: No such dev= ice To identify directories and handle them accordingly in file_ram_open() also when readonly=3Dtrue was specified, detect if we just opened a directo= ry using fstat() instead. Then, fail file_ram_open() right away, similarly to how we now fail if the file does not exist and we want to open the file readonly. With this change, we get a nicer error message: qemu-system-x86_64: can't open backing store tmp for guest RAM: Is a direc= tory Note that the only memory-backend-file will end up calling memory_region_init_ram_from_file() -> qemu_ram_alloc_from_file() -> file_ram_open(). Reported-by: Thiner Logoer Signed-off-by: David Hildenbrand Reviewed-by: Peter Xu --- softmmu/physmem.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index f8c47ecb85..2d903e479b 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -1300,6 +1300,25 @@ static int file_ram_open(const char *path, for (;;) { fd =3D open(path, readonly ? O_RDONLY : O_RDWR); if (fd >=3D 0) { + /* + * open(O_RDONLY) won't fail with EISDIR. Check manually if we + * opened a directory and fail similarly to how we fail ENOENT + * in readonly mode. Note that mkstemp() would imply O_RDWR. + */ + if (readonly) { + struct stat file_stat; + + if (fstat(fd, &file_stat)) { + close(fd); + if (errno =3D=3D EINTR) { + continue; + } + return -errno; + } else if (S_ISDIR(file_stat.st_mode)) { + close(fd); + return -EISDIR; + } + } /* @path names an existing file, use it */ break; } --=20 2.41.0