From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1klEc6-0007MH-0a for mharc-grub-devel@gnu.org; Fri, 04 Dec 2020 12:11:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klEbc-0007GA-Ka for grub-devel@gnu.org; Fri, 04 Dec 2020 12:10:56 -0500 Received: from mail-io1-xd43.google.com ([2607:f8b0:4864:20::d43]:41061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klEar-0006Ay-Ob for grub-devel@gnu.org; Fri, 04 Dec 2020 12:10:35 -0500 Received: by mail-io1-xd43.google.com with SMTP id t8so6456755iov.8 for ; Fri, 04 Dec 2020 09:07:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6/xALkUwP+Kjkw/wDB66M5C+AIzw5v56tsfj1jswSYE=; b=lm2wV5uUB75tHvHhi3xSyHvuSKeVfrbGTCrxmQ2+5x+qPn9d4h/nW5Wvw5Zge6lIJg cv4dM/SDrQrycMHpIS1FL/z2EFo+gnTD2NOXdB5UzM89GGbD+es01DQ0QORBrA5hrAFB hCJt4cqz2bfnd9kzvBvrgrAVx3U+n6OAF6gxP/uOnZegMcAzQ82mCDJh3ygmeDvXG1rD gyiot2dAPvUKUxKGMH2zdSDoR4HPqoctDPXpVwgIVZ6KwX/DX72LtbVTQHjdcv3YonSV AuOUTpZktKKqHviXbZ2xwIeJj6KRrAY0qbBJUumzLJzUsITiFRjtkgMHEf/Xtslq2CHP DEcw== 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=6/xALkUwP+Kjkw/wDB66M5C+AIzw5v56tsfj1jswSYE=; b=PYopl8Wxij62oHxgD2N6fdznG7fijrhO4Hi1XSzNAcAXpatKzepfW90ZvQ1XKJaoUx bfRKrlSUlkywYG+1W/Oyt4iVl2/gsi4QtBC3k4P75QjpkY5UyZgwb/Ae7TPZJ2QwR3Z8 F0VzazZSU3ux28RUbK1KJyrO0neWOltKMdNeuJewEQnxQq63RwqeWeJbQZtE53m1WB2Z SaoElWOEHSWk3K4992NqPGkpCHd+rZHHwmH7VDCkW76KfmfN0vrQWPHJF9PLu8L5DyPR LxcS8kx+87k/nMb8XQ2TRL9kZDRy49stuCaMIO0eAgyEj5ucgFBLb6L4B9hgeadbwJz1 LZxA== X-Gm-Message-State: AOAM532Pi/i/lWNMW9Yah8eeSkgLkA4+velzTrbCQ6lkoomrvpNzDNZX OsGuW+BENCbkYDHAI9CvGm08XXCgZskg1g== X-Google-Smtp-Source: ABdhPJxsrXIldjV1tnET5eLgko39Ed6HCoWlZyVCL4vGYC93GBVhN9LiZobUjzwbHMDQf2G9i6i/xg== X-Received: by 2002:a92:9806:: with SMTP id l6mr8058918ili.304.1607100262840; Fri, 04 Dec 2020 08:44:22 -0800 (PST) Received: from localhost.localdomain ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id w3sm1754909iol.9.2020.12.04.08.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 08:44:22 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v7 09/17] cryptodisk: Add macros GRUB_TYPE_U_MAX/MIN(type) to replace literals Date: Fri, 4 Dec 2020 10:43:38 -0600 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::d43; envelope-from=development@efficientek.com; helo=mail-io1-xd43.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Fri, 04 Dec 2020 17:10:59 -0000 Add GRUB_TYPE_U_MAX/MIN(type) macros to get the max/min values for an unsigned number with size of type. Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 8 ++++---- include/grub/types.h | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 0e955a020..5aa0c4720 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -284,23 +284,23 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev, iv[1] = grub_cpu_to_le32 (sector >> GRUB_TYPE_BITS (iv[0])); /* FALLTHROUGH */ case GRUB_CRYPTODISK_MODE_IV_PLAIN: - iv[0] = grub_cpu_to_le32 (sector & 0xFFFFFFFF); + iv[0] = grub_cpu_to_le32 (sector & GRUB_TYPE_U_MAX (iv[0])); break; case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64: iv[1] = grub_cpu_to_le32 (sector >> (GRUB_TYPE_BITS (iv[1]) - dev->log_sector_size)); iv[0] = grub_cpu_to_le32 ((sector << dev->log_sector_size) - & 0xFFFFFFFF); + & GRUB_TYPE_U_MAX (iv[0])); break; case GRUB_CRYPTODISK_MODE_IV_BENBI: { grub_uint64_t num = (sector << dev->benbi_log) + 1; iv[sz - 2] = grub_cpu_to_be32 (num >> GRUB_TYPE_BITS (iv[0])); - iv[sz - 1] = grub_cpu_to_be32 (num & 0xFFFFFFFF); + iv[sz - 1] = grub_cpu_to_be32 (num & GRUB_TYPE_U_MAX (iv[0])); } break; case GRUB_CRYPTODISK_MODE_IV_ESSIV: - iv[0] = grub_cpu_to_le32 (sector & 0xFFFFFFFF); + iv[0] = grub_cpu_to_le32 (sector & GRUB_TYPE_U_MAX (iv[0])); err = grub_crypto_ecb_encrypt (dev->essiv_cipher, iv, iv, dev->cipher->cipher->blocksize); if (err) diff --git a/include/grub/types.h b/include/grub/types.h index 9989e3a16..0542011cc 100644 --- a/include/grub/types.h +++ b/include/grub/types.h @@ -161,6 +161,13 @@ typedef grub_int32_t grub_ssize_t; #endif # define GRUB_LONG_MIN (-GRUB_LONG_MAX - 1) +/* + Cast to unsigned long long so that the "return value" is always a consistent + type and to ensure an unsigned value regardless of type parameter. + */ +#define GRUB_TYPE_U_MAX(type) ((unsigned long long)((typeof (type))(~0))) +#define GRUB_TYPE_U_MIN(type) 0ULL + typedef grub_uint64_t grub_properly_aligned_t; #define GRUB_PROPERLY_ALIGNED_ARRAY(name, size) grub_properly_aligned_t name[((size) + sizeof (grub_properly_aligned_t) - 1) / sizeof (grub_properly_aligned_t)] -- 2.27.0