From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kmlkv-00055K-0p for mharc-grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmlkk-0004rv-4i for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:38 -0500 Received: from mail-oo1-xc2a.google.com ([2607:f8b0:4864:20::c2a]:44429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmlkd-0000lV-9y for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:37 -0500 Received: by mail-oo1-xc2a.google.com with SMTP id n20so772641ooq.11 for ; Tue, 08 Dec 2020 14:46:27 -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=g3kcEYpRuEtUm84eWmz9fyIQhuv6LhT+kMcOUAZDQm8=; b=p+V4sSaeMONNzCpjbVvmccqpVJwO+wTRNn1UxvkytiqkOtXFmVZG06yU8AUuYkACKT yxxz/S1ZfIikcs3DuObHKgI5UgQRDgEyi4xqe6QaUGOTLi/qzyRFJLslcfo2v+/iUs89 8Xb73DnbKWlreOyJNCOSlN6T56g5UF7ZQdKNC0w0Uo/lZFtxzJSg4uAbVf/8VdSYrbR+ s2GQX1cD/hCl6AM3joHJHLkPZEdt+WsB4xXNkJ9lehWSSMYnd72roZg19+cwo1vknb9B Jk78Z9eRV3Vn5Q/RtlPbPN2J5QHX2wj0T6JMIRC4heYu+Ad2QIAlgfUU0IfbLQxlQjQn dXSQ== 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=g3kcEYpRuEtUm84eWmz9fyIQhuv6LhT+kMcOUAZDQm8=; b=HP2h4X5JNSnOOulljyBjupYeMgSpo3FSgwSrwa/3jdixELbK3WyEFYP78zOkd+Rw8s xRct/t4cPS45KReBlGVYQox+kxfrAiPVEHrrWln/Iechal6wRPjA4n1+n83i0ed2bSQm 3uSdNqzafDXbPZprQnyMbQJ30QjzsiErPjIMZTJyCDaWaxOUZW6eiECRknwG8UijTvAD Qvtv2bUc8sSogLbXmuugNvXMiTmF0toiDLERQGPuC9IezmnGScp6gi4Zbm7hok0jONXk GMRIcof/8nmG+YCDTuVn3CZ5XNsj9+Hfs9LLbXwbmCT3dfZlWqci9rZkXnZsfDELSQEW Kmqg== X-Gm-Message-State: AOAM531YOSR3/itNKsmhWGR6ttY7Z6joVE1RWUp35/6t1CnchkNBKYrB a57M4Fjeo67E3XLNi6VgPO+LT7yA+gKZUg== X-Google-Smtp-Source: ABdhPJzWW/7r1GWUEQwjRrrbW/LFYCkUIps6FuaviROMMb38dTd6Trc4gqOGyMv05FJIOePkbuwozg== X-Received: by 2002:a05:6820:41:: with SMTP id v1mr191933oob.41.1607467586861; Tue, 08 Dec 2020 14:46:26 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 14:46:26 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v8 15/18] luks2: Error check segment.sector_size Date: Tue, 8 Dec 2020 16:45:46 -0600 Message-Id: <09c5b15f3c4b694cd89fcd59d0e909eadc4b3f7f.1607466704.git.development@efficientek.com> 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::c2a; envelope-from=development@efficientek.com; helo=mail-oo1-xc2a.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:39 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 8cb11e899..c737797b9 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -629,6 +629,17 @@ luks2_recover_key (grub_disk_t source, grub_dprintf ("luks2", "Trying keyslot \"%"PRIuGRUB_UINT64_T"\"\n", keyslot.idx); + /* Sector size should be one of 512, 1024, 2048, or 4096. */ + if (!(segment.sector_size == 512 || segment.sector_size == 1024 || + segment.sector_size == 2048 || segment.sector_size == 4096)) + { + grub_dprintf ("luks2", "Segment \"%"PRIuGRUB_UINT64_T"\" sector" + " size %"PRIuGRUB_UINT64_T" is not one of" + " 512, 1024, 2048, or 4096\n", + segment.idx, segment.sector_size); + continue; + } + /* Set up disk according to keyslot's segment. */ crypt->offset_sectors = grub_divmod64 (segment.offset, segment.sector_size, NULL); crypt->log_sector_size = sizeof (unsigned int) * 8 -- 2.27.0