From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kmlkl-0004sZ-11 for mharc-grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmlki-0004oa-P6 for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:36 -0500 Received: from mail-ot1-x342.google.com ([2607:f8b0:4864:20::342]:40865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmlkX-0000l5-Mw for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:36 -0500 Received: by mail-ot1-x342.google.com with SMTP id j12so345279ota.7 for ; Tue, 08 Dec 2020 14:46:24 -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=dpssOXf5B9Ny6rUeNV0+e6v9gC3oF6mRzZhl5A9s7dY=; b=QiiBGcPUyzDtj8nwIwsRXhoYUthI7aEPC5WYxRpjtDa/DEtKFa82wvK9I0cYc1pbYH mY6nFuLUktklC/AJiZ+yYqBxt7BfyF8r2qozgEZMu1MyPkVuIB5iUvHRQKfum6nEBVAr zCYNkKv4UVBmFNDivH+w5QfR3w5jJLT3AKpgi2dt++Nub+jFGvSMkS5KQB4pcCdfK078 KUd822maT90iGlaG0SBD5D0zmMokvlULpvGzPa4YaybjAfCbPUqtCk3CN8hMl+tlu6zA kIeBKJ2ysN3Nu6f0arATL5gxH13D+E+ZL5xaFNbXMMnWduQA7uYDHkosijDRXd6mZetI 4kFw== 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=dpssOXf5B9Ny6rUeNV0+e6v9gC3oF6mRzZhl5A9s7dY=; b=pBfgFzMbIHm6MhnoNqCRqvoIhIihtF8nvOWM3eO4MzmNGiQQK42fAIC5dq5kx8IJMn yIiFHYEHUqyPJoNROlqztSJcRe6qL/appy2IRL1Er2UfJTnDO2nIvzYhGzb78dpPAMgI kAqgWIZVvcRlWlIQPIHVfClHTaeJFQJ1nyOmt+gERbF/b/Pc11Ei3sTWQPi3oLVXz3R/ Vw4UoM56ay3Wg2rXXwt1HzsCW8k4XqAT7VbRsdyH7V/sJ8pFmkbMkVEAqrzSA6RAZtc7 JPpNpkKTMKVs5l1vdpa9YK+m7CT/J+5irquNFz2IdKLBFdhkY92sT6xCHQxfnWpoeEo0 eXnA== X-Gm-Message-State: AOAM531VJ/Oqr4VCU2J3dsUKBLNx7rGb+EMgnVaIk3cZhU6HvM8UQffS C3nPQHRv/mp5u8erfL8jNmriLH0JSXGGMQ== X-Google-Smtp-Source: ABdhPJza5L4PVub1CPmCIAdnu+sfKU/gU967RIhNlOgNt6F79W1PG4C5Lw/K2Tvst2RT8sys3Jr49g== X-Received: by 2002:a9d:1d05:: with SMTP id m5mr282382otm.324.1607467583972; Tue, 08 Dec 2020 14:46:23 -0800 (PST) Received: from crass-HP-ZBook-15-G2.attlocal.net ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id v8sm45538otp.10.2020.12.08.14.46.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 14:46:23 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn , Daniel Kiper Subject: [PATCH v8 12/18] luks2: grub_cryptodisk_t->total_sectors is the max number of device native sectors Date: Tue, 8 Dec 2020 16:45:43 -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::342; envelope-from=development@efficientek.com; helo=mail-ot1-x342.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: Tue, 08 Dec 2020 22:46:37 -0000 We need to convert the sectors from the size of the underlying device to the cryptodisk sector size; segment.size is in bytes which need to be converted to cryptodisk sectors as well. Also, removed an empty statement. Signed-off-by: Glenn Washburn Reviewed-by: Daniel Kiper --- grub-core/disk/luks2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index ebf03e77b..429a4cfa1 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -429,7 +429,7 @@ luks2_decrypt_key (grub_uint8_t *out_key, grub_uint8_t salt[GRUB_CRYPTODISK_MAX_KEYLEN]; grub_uint8_t *split_key = NULL; grub_size_t saltlen = sizeof (salt); - char cipher[32], *p;; + char cipher[32], *p; const gcry_md_spec_t *hash; gcry_err_code_t gcry_ret; grub_err_t ret; @@ -615,9 +615,10 @@ luks2_recover_key (grub_disk_t source, crypt->log_sector_size = sizeof (unsigned int) * 8 - __builtin_clz ((unsigned int) segment.sector_size) - 1; if (grub_strcmp (segment.size, "dynamic") == 0) - crypt->total_sectors = grub_disk_get_size (source) - crypt->offset_sectors; + crypt->total_sectors = (grub_disk_get_size (source) >> (crypt->log_sector_size - source->log_sector_size)) + - crypt->offset_sectors; else - crypt->total_sectors = grub_strtoull (segment.size, NULL, 10); + crypt->total_sectors = grub_strtoull (segment.size, NULL, 10) >> crypt->log_sector_size; ret = luks2_decrypt_key (candidate_key, source, crypt, &keyslot, (const grub_uint8_t *) passphrase, grub_strlen (passphrase)); -- 2.27.0