Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j9Sga-0003gU-DT for mharc-grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50859) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9SgW-0003Xz-6f for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9SgV-0003IX-8S for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:32 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25444 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9SgV-0003IH-4j for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583323170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GkCF9Cwfogc0LMKRDTOmP6MH1SmqJbBjI8CUOZVmT+s=; b=HQ1I1BE5294Ut8+D4CUXfm3QL0laB0mWb904Z3UeOibcVctk+wk0MO3g3Tux+eaDImPv82 l89H/cigud592/r7DR6e1O/5BoYD22UerK01u7Lt262BKfQF/n7UfR39Ac3uurAP+p3pSl aJVz2lABXXraLJK2b0adTDCHZIw30NM= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-198-DPU0-Tx6Pr-LVWP6LJO-3A-1; Wed, 04 Mar 2020 06:59:28 -0500 X-MC-Unique: DPU0-Tx6Pr-LVWP6LJO-3A-1 Received: by mail-wr1-f70.google.com with SMTP id w11so733855wrp.20 for ; Wed, 04 Mar 2020 03:59:28 -0800 (PST) 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=XPJ6q1+VGvPIe8BJfJeCIT8ms0N1qa9Zz7/OmAft9y8=; b=UsIEqIofMBLTl1amHMnquJYPvcK0PermqrVy9YLLIsj0AYkEnyZJkq1Ug9pC1GISSp kZnGF+SikD2KR4GnVVjolCtVi7yRUwZt2+VvagKXVX5jtaG4AUxFh8iNogj/veYWflb0 BoPLsSSNQ83Rzuvx2q11y2PZoesIGNRKjTdNjJ7A5ixpeYpObBLE0MBCH9qnzg7zb6VQ jr7MVXfO8/AzDIPD5yeswPZHckjy9CO9phVl6oC0GcD9JUtHsvrIVt8vE0KGIN2RiJJI 4TJFFF7Tagw37wYWfjqtnYpATcS4eWUeGhG9G6t1nPFy81S3n1woB5/dzkWShvYH+/cB z00w== X-Gm-Message-State: ANhLgQ1NKkHCQSP5C5VS+XQtlUgxNQzpvSwFQT6ctKIz3PTqpG2hmlNg I7ILOYId2/ze9iQ7LEs9asfKspbl9JjeRYaLuB67KcgJvG56lO6dwpK+0YPUJyuQleJvnZGm4Cg /higzt5hxGqk= X-Received: by 2002:a1c:6a13:: with SMTP id f19mr3460896wmc.134.1583323167364; Wed, 04 Mar 2020 03:59:27 -0800 (PST) X-Google-Smtp-Source: ADFU+vvJnZWlO3KVyGWDuZGBuVa8plPaZ7N9maqQXna8tuuqdsCyTZUQTlqUa9K2o5u45xJiRDE3OA== X-Received: by 2002:a1c:6a13:: with SMTP id f19mr3460885wmc.134.1583323167160; Wed, 04 Mar 2020 03:59:27 -0800 (PST) Received: from minerva.redhat.com ([2a01:c50f:ab80:6700:527f:85b3:5615:ff0b]) by smtp.gmail.com with ESMTPSA id t14sm5911207wrp.63.2020.03.04.03.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 03:59:26 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Daniel Kiper , Peter Jones , Javier Martinez Canillas Subject: [PATCH v2 09/12] efi: Print error messages to grub_efi_allocate_pages_real() Date: Wed, 4 Mar 2020 12:58:48 +0100 Message-Id: <20200304115851.3474263-10-javierm@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200304115851.3474263-1-javierm@redhat.com> References: <20200304115851.3474263-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2020 11:59:33 -0000 From: Peter Jones No messages were printed in this function, add some to ease debugging. Also, the function returns a void * pointer so return NULL instead of 0 to make the code more readable. Signed-off-by: Peter Jones Signed-off-by: Javier Martinez Canillas --- grub-core/kern/efi/mm.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c index b02fab1b102..457772d57f2 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -125,12 +125,20 @@ grub_efi_allocate_pages_real (grub_efi_physical_addre= ss_t address, =20 /* Limit the memory access to less than 4GB for 32-bit platforms. */ if (address > GRUB_EFI_MAX_USABLE_ADDRESS) - return 0; + { + grub_error (GRUB_ERR_BAD_ARGUMENT, +=09=09 N_("invalid memory address (0x%llx > 0x%llx)"), +=09=09 address, GRUB_EFI_MAX_USABLE_ADDRESS); + return NULL; + } =20 b =3D grub_efi_system_table->boot_services; status =3D efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &ad= dress); if (status !=3D GRUB_EFI_SUCCESS) - return 0; + { + grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); + return NULL; + } =20 if (address =3D=3D 0) { @@ -140,7 +148,10 @@ grub_efi_allocate_pages_real (grub_efi_physical_addres= s_t address, status =3D efi_call_4 (b->allocate_pages, alloctype, memtype, pages,= &address); grub_efi_free_pages (0, pages); if (status !=3D GRUB_EFI_SUCCESS) -=09return 0; +=09{ +=09 grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); +=09 return NULL; +=09} } =20 grub_efi_store_alloc (address, pages); --=20 2.24.1