From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kiZgS-0004zO-JW for mharc-grub-devel@gnu.org; Fri, 27 Nov 2020 04:04:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiZgQ-0004wb-M3 for grub-devel@gnu.org; Fri, 27 Nov 2020 04:04:50 -0500 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:36102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiZgN-0005X3-L2 for grub-devel@gnu.org; Fri, 27 Nov 2020 04:04:49 -0500 Received: by mail-lj1-x244.google.com with SMTP id i17so5144125ljd.3 for ; Fri, 27 Nov 2020 01:04:46 -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=qx7iOvh0aRGZwd25nXi8/wekvnJHBQJRyQ/bXv5hPOU=; b=N8a2kYA4eSMgiDibvnm7z5HbIrzz/Bw0pIPVXFaTv6jx3YkAad8AvCEAhBIe2ACl1D KQ+j8odDw3lLq7naYm5/pXaklTTJOgHLkWVuYcxeVXxX2zt47SbLFzbPyzf8iWPLoEF6 n55451dhX4Vzj0MUQ1atv2L4/5j8NVmXx6pxJL1n1LbyoWCPA7uIPuoF07brB/hGBzS/ UtgWf0jYzFbVszqJ07UoM3NpLR8tYyMSvY1ELstenwa3Gq9F8dfby62SwIFp3XzZLSzS 8jsFYASxEzeHyxJufdzVKpBn5ULgqp4cGVAThB18kbIuMFZsybxahMr5QZX5XA2ZUiUW xMxg== 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=qx7iOvh0aRGZwd25nXi8/wekvnJHBQJRyQ/bXv5hPOU=; b=pVpsCbvlq/Xst/LrGbJ+9Rt3MzGhxkTLhZTfgX9mfjVywvozRkrdzZoPJ5ToJFR4S5 tU+9hBtfcnag+xDsImpo/6JvvKXkL/29uakiX2Gk0ya9xJvAHNkFd1Hk7YWIfSew/q7l TGsTMoyLdc78fb9tOvkeqyotjPf4naKJTZxJb/7PDMYZvE6oKlbcAQgWRDeqVrUsXGnD 42dYaQj8IsT29du/gP3cvYIA30pstqdj4ZAwqI+RLHXGRrvAGH4TDcNXD6RWU/efwhAo NBM/9pYTqCjAVztZowAVqRz6sZfWwvH7vHFOaxUgaMGG4CF0YHb0rHcLg6ZxPcx38BZ4 WdNA== X-Gm-Message-State: AOAM530/eFyOKXGsy14+sMwQm5wyfUgbceM11SPve6iDX8x+Jq5Nwwb+ j7ScMF2G1NOZe0R7YQQLQu4P8JaIjchQmA== X-Google-Smtp-Source: ABdhPJxciBappxQ5pEVMgruVD+DUt7f5LEdIq7js7RfMyDStSM+Ui1c79UHbMH9+Qaj7x30gUXjwZA== X-Received: by 2002:a2e:964b:: with SMTP id z11mr2976039ljh.236.1606467885462; Fri, 27 Nov 2020 01:04:45 -0800 (PST) Received: from localhost.localdomain ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id g2sm880675lja.87.2020.11.27.01.04.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 01:04:45 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v6 08/12] luks2: Error check segment.sector_size Date: Fri, 27 Nov 2020 03:03:40 -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=2a00:1450:4864:20::244; envelope-from=development@efficientek.com; helo=mail-lj1-x244.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, 27 Nov 2020 09:04:51 -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 01f9608e5..f2313cb0f 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -626,6 +626,17 @@ luks2_recover_key (grub_disk_t source, grub_dprintf ("luks2", "Trying keyslot %"PRIuGRUB_UINT64_T"\n", keyslot.slot_key); + /* 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.slot_key, 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