Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j9Sgd-0003nf-6s for mharc-grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50916) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Sga-0003gT-A5 for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9SgZ-0003Kd-3Q for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:36 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54970 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 1j9SgY-0003KT-WC for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583323174; 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=IJe7GK+ZjlN5j87s2hDbyQLp2Q6G29xO6Zij/d5A8ag=; b=Ma0dcgRfb4YGyWGYEEibnPZnsrXwi+SFhXLTcB08cGto7pq/r6OQtSpsWEV0rPMg7aVA3d tYqAol+UOdhg8j9DoZl25tYknpEbFbInzgcO9TZAG0rcHlGng9Dey3r4bz9oa3FaPRp06d 0JLMGePk4l0dXo9hdAeGvhyRtSHc9R4= 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-479-8ZnwoNUcMSip9yxKNlLHbA-1; Wed, 04 Mar 2020 06:59:33 -0500 X-MC-Unique: 8ZnwoNUcMSip9yxKNlLHbA-1 Received: by mail-wr1-f70.google.com with SMTP id n7so752374wro.9 for ; Wed, 04 Mar 2020 03:59:33 -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=LW5c1/zygwYSNGc2YLH/enDjyJMNk94Xybz3SQB6MlI=; b=VvR70SkU6pQguVZac5KNACqt6ZCbJ3no9h/kgp0P3f+ahes54LwpjU47nVw5e2fczM lWOY04dTplur+3ywT+iZrhahvBm54bR0bo7zA6LFfCEIfsegEULQMWYlHfP/1F1J1yCO QSbyizMr6sf4j/hvn5SrROYUCkoVJanlNC4t3uB31xZ+Oj8FbB3ho03sMSob+gyHpeR7 Df5F6l0oSbqKEpHrR2r08Y+8epIJwVFTI8Wq5v++D6+peznbzd0fw9meOBvOoamYUB92 JvMaUHUoFzVh4kJaljsGX6U+InpXFuoGhv9Jks1vrZaOF6ZJeQPbdXg3fcq5foLHCZg9 jvUQ== X-Gm-Message-State: ANhLgQ3PloZdenvhZ5v8vm6ucDZLqvhEiamJCZ7p7hAMxHyzkdI04kgP dhzfrs3+cGLLY2CAsPRKievthJm8L4Lr/5MiYFXkYYF2fu3gFxBOebbJo6lC8uAFeZAi0pJ9r99 /pCKm/FboSH8= X-Received: by 2002:a7b:c019:: with SMTP id c25mr3451576wmb.126.1583323171411; Wed, 04 Mar 2020 03:59:31 -0800 (PST) X-Google-Smtp-Source: ADFU+vsmQoSB9n8vyhw2TdnmaDkor5UQHG6V1BPiyhVzz0NIQiCIT0/WJJaK8C4HYG0ky85zD1OoBA== X-Received: by 2002:a7b:c019:: with SMTP id c25mr3451556wmb.126.1583323171126; Wed, 04 Mar 2020 03:59:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 03:59:30 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Daniel Kiper , Peter Jones , Javier Martinez Canillas Subject: [PATCH v2 12/12] efi: Fix the type of grub_efi_status_t Date: Wed, 4 Mar 2020 12:58:51 +0100 Message-Id: <20200304115851.3474263-13-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] [fuzzy] X-Received-From: 207.211.31.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:37 -0000 From: Peter Jones Currently, in some builds with some checkers, we see: 1. grub-core/disk/efi/efidisk.c:601: error[shiftTooManyBitsSigned]: Shiftin= g signed 64-bit value by 63 bits is undefined behaviour This is because grub_efi_status_t is defined as grub_efi_intn_t, which is signed, and shifting into the sign bit is not defined behavior. UEFI fixed this in the spec in 2.3: 2.3 | Change the defined type of EFI_STATUS from INTN to UINTN | May 7, 200= 9 And the current EDK2 code has: MdePkg/Include/Base.h-// MdePkg/Include/Base.h-// Status codes common to all execution phases MdePkg/Include/Base.h-// MdePkg/Include/Base.h:typedef UINTN RETURN_STATUS; MdePkg/Include/Base.h- MdePkg/Include/Base.h-/** MdePkg/Include/Base.h- Produces a RETURN_STATUS code with the highest bit = set. MdePkg/Include/Base.h- MdePkg/Include/Base.h- @param StatusCode The status code value to conv= ert into a warning code. MdePkg/Include/Base.h- StatusCode must be in the ran= ge 0x00000000..0x7FFFFFFF. MdePkg/Include/Base.h- MdePkg/Include/Base.h- @return The value specified by StatusCode with the = highest bit set. MdePkg/Include/Base.h- MdePkg/Include/Base.h-**/ MdePkg/Include/Base.h-#define ENCODE_ERROR(StatusCode) ((RETURN_STATUS)= (MAX_BIT | (StatusCode))) MdePkg/Include/Base.h- MdePkg/Include/Base.h-/** MdePkg/Include/Base.h- Produces a RETURN_STATUS code with the highest bit = clear. MdePkg/Include/Base.h- MdePkg/Include/Base.h- @param StatusCode The status code value to conv= ert into a warning code. MdePkg/Include/Base.h- StatusCode must be in the ran= ge 0x00000000..0x7FFFFFFF. MdePkg/Include/Base.h- MdePkg/Include/Base.h- @return The value specified by StatusCode with the = highest bit clear. MdePkg/Include/Base.h- MdePkg/Include/Base.h-**/ MdePkg/Include/Base.h-#define ENCODE_WARNING(StatusCode) ((RETURN_STATUS)= (StatusCode)) MdePkg/Include/Base.h- MdePkg/Include/Base.h-/** MdePkg/Include/Base.h- Returns TRUE if a specified RETURN_STATUS code is a= n error code. MdePkg/Include/Base.h- MdePkg/Include/Base.h- This function returns TRUE if StatusCode has the hi= gh bit set. Otherwise, FALSE is returned. MdePkg/Include/Base.h- MdePkg/Include/Base.h- @param StatusCode The status code value to eval= uate. MdePkg/Include/Base.h- MdePkg/Include/Base.h- @retval TRUE The high bit of StatusCode is= set. MdePkg/Include/Base.h- @retval FALSE The high bit of StatusCode is= clear. MdePkg/Include/Base.h- MdePkg/Include/Base.h-**/ MdePkg/Include/Base.h-#define RETURN_ERROR(StatusCode) (((INTN)(RETURN_= STATUS)(StatusCode)) < 0) ... Uefi/UefiBaseType.h:typedef RETURN_STATUS EFI_STATUS; This patch makes grub's implementation match the Edk2 declaration with rega= rds to the signedness of the type. Signed-off-by: Peter Jones Signed-off-by: Javier Martinez Canillas Reviewed-by: Daniel Kiper --- include/grub/efi/api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h index 57607438435..d6f4de17d63 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -531,7 +531,7 @@ typedef grub_uint64_t grub_efi_uint64_t; typedef grub_uint8_t grub_efi_char8_t; typedef grub_uint16_t grub_efi_char16_t; =20 -typedef grub_efi_intn_t grub_efi_status_t; +typedef grub_efi_uintn_t grub_efi_status_t; =20 #define GRUB_EFI_ERROR_CODE(value)=09\ ((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (va= lue)) --=20 2.24.1