Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j6ZI6-0004DE-0i for mharc-grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55667) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6ZI2-00045X-LZ for grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6ZI1-0006h9-AE for grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:18 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:26528 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6ZI1-0006fA-4G for grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582633576; 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=Q0cf5Eq8rAKmWQGebcaFpoVT2JSpeuKr7ORzv/tnjMg=; b=LPjw0UIHh7JtiKe/pMOr2/ZfsQuJ7SYCTMh16G11LVUhiQ4xx2NKhh+O3ZbqW8lS5roh7R AbID6aueX/myZXp+ysvnOwwUhNBRvEP5Qkhw95QBxNbocm0rgSqijcsrOc0fb/LC1EhXy0 jez+PZGh+nAmy/ligoJSf7k/kj16jEs= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-63-_e8eCmIbPImfW6_9De9HaA-1; Tue, 25 Feb 2020 07:26:15 -0500 X-MC-Unique: _e8eCmIbPImfW6_9De9HaA-1 Received: by mail-wr1-f72.google.com with SMTP id n12so5323200wrp.19 for ; Tue, 25 Feb 2020 04:26:14 -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=EWUu2fCNuqD74Pzhtt7Bn1EvrZb+huoahVPYVaAj45I=; b=hYAF87cdi0WO5ct2zxg3cNrGs22aKkGp7SnzwroER2FOdH3jpglvFv/qlTVz2njD7C aGuJfZVPDiFG7FYtiYf0EPaFY10hgXTUQMetDflkcyAMX1EfaYAWbi2rKSjS2ugpYdAF 9wGf0T7xhqOM59EkfcDu+YQz+3KaYe55ocYphSjnk0Xkm63Cxmz2Z1XZQ+8/cBuSefwc Ru+/IGsNnznvgZpPkdfX+NgpifWDas3qEK7L2RbaxPX56PzAGHcwAGui3haG7kFesuEF yHQOMW25iED42EF+BFrkJEha1UpIE+GD0sfE7Fn/KgeVFmoTISqFiVGMNgJfAKZo0qht GLQQ== X-Gm-Message-State: APjAAAXCeHRmlom9X35ON8aleavXS1jh5MpaRW8QZ8x2A8pwMDYrBchM Njj8Jyn6+F7wxUZ6l6/4unldwlcbFQmpharTXH3N8iPoyu36bq2I0SKe4NO6jbR7uusa8vRZZEt TafHpKDJHrIE= X-Received: by 2002:adf:f581:: with SMTP id f1mr73586981wro.264.1582633573735; Tue, 25 Feb 2020 04:26:13 -0800 (PST) X-Google-Smtp-Source: APXvYqwrxCTq37f3OTEndH165R+LDcM7pJMlR99NkCjUUTv98WB71dhg+6lhT6orSmHGkloHQEXrcg== X-Received: by 2002:adf:f581:: with SMTP id f1mr73586964wro.264.1582633573538; Tue, 25 Feb 2020 04:26:13 -0800 (PST) Received: from minerva.redhat.com ([2a01:c50f:ab80:6700:527f:85b3:5615:ff0b]) by smtp.gmail.com with ESMTPSA id q6sm17251653wrf.67.2020.02.25.04.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 04:26:12 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Daniel Kiper , Peter Jones , Javier Martinez Canillas Subject: [PATCH 08/10] kern: Make grub_error() more verbose Date: Tue, 25 Feb 2020 13:25:51 +0100 Message-Id: <20200225122553.1120216-9-javierm@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200225122553.1120216-1-javierm@redhat.com> References: <20200225122553.1120216-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] [fuzzy] X-Received-From: 207.211.31.81 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: Tue, 25 Feb 2020 12:26:20 -0000 From: Peter Jones Add file and line to grub_error() output to make troubleshooting easier. Signed-off-by: Peter Jones Signed-off-by: Javier Martinez Canillas --- grub-core/kern/efi/mm.c | 17 ++++++++++++++--- grub-core/kern/err.c | 13 +++++++++++-- include/grub/err.h | 5 ++++- 3 files changed, 29 insertions(+), 6 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); diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c index 53c734de70e..aebfe0cf839 100644 --- a/grub-core/kern/err.c +++ b/grub-core/kern/err.c @@ -33,15 +33,24 @@ static struct grub_error_saved grub_error_stack_items[G= RUB_ERROR_STACK_SIZE]; static int grub_error_stack_pos; static int grub_error_stack_assert; =20 +#ifdef grub_error +#undef grub_error +#endif + grub_err_t -grub_error (grub_err_t n, const char *fmt, ...) +grub_error (grub_err_t n, const char *file, const int line, const char *fm= t, ...) { va_list ap; + int m; =20 grub_errno =3D n; =20 + m =3D grub_snprintf (grub_errmsg, sizeof (grub_errmsg), "%s:%d:", file, = line); + if (m < 0) + m =3D 0; + va_start (ap, fmt); - grub_vsnprintf (grub_errmsg, sizeof (grub_errmsg), _(fmt), ap); + grub_vsnprintf (grub_errmsg + m, sizeof (grub_errmsg) - m, _(fmt), ap); va_end (ap); =20 return n; diff --git a/include/grub/err.h b/include/grub/err.h index 24ba9f5f592..b68bbec3c72 100644 --- a/include/grub/err.h +++ b/include/grub/err.h @@ -85,7 +85,10 @@ struct grub_error_saved extern grub_err_t EXPORT_VAR(grub_errno); extern char EXPORT_VAR(grub_errmsg)[GRUB_MAX_ERRMSG]; =20 -grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *fmt, ...); +grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *file, const = int line, const char *fmt, ...); + +#define grub_error(n, fmt, ...) grub_error (n, __FILE__, __LINE__, fmt, ##= __VA_ARGS__) + void EXPORT_FUNC(grub_fatal) (const char *fmt, ...) __attribute__ ((noretu= rn)); void EXPORT_FUNC(grub_error_push) (void); int EXPORT_FUNC(grub_error_pop) (void); --=20 2.24.1