From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nYimK-0005Ym-Pk for mharc-grub-devel@gnu.org; Mon, 28 Mar 2022 02:23:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYimH-0005XN-J0 for grub-devel@gnu.org; Mon, 28 Mar 2022 02:22:57 -0400 Received: from [2607:f8b0:4864:20::1034] (port=38781 helo=mail-pj1-x1034.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYimF-0005FQ-Vs for grub-devel@gnu.org; Mon, 28 Mar 2022 02:22:57 -0400 Received: by mail-pj1-x1034.google.com with SMTP id gp15-20020a17090adf0f00b001c7cd11b0b3so8861748pjb.3 for ; Sun, 27 Mar 2022 23:22:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J1x877pi5ctwhOWvGEFASB7umxsahDXvimHktRAzx6I=; b=JwbwUW7y157RtI99WYmmwz+YMVSI4LqqBvCUfOytfelhw6LUutFN88zPoCvkOps1N1 tiYlojaWW9ZRtDdQ07XYkQTkzkd4tf2AIfv19HpCGL0gRiNUVcTAWiw8LEanq5teDNDB tdQX+/AX0z3IXyh8H2N0VtEMEPdZFboD8jsAg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J1x877pi5ctwhOWvGEFASB7umxsahDXvimHktRAzx6I=; b=W0CiXhZa1izK+N6Pye7Sryu37Io1NUqUDXQmhJyRAgZFOshRqRPsTxl7gScmazk3+d 3DO3QUe7qmHqDjF3/ds/jghXXA0CIojrvuFsMXmTevSydWrXhGFWOvYwW8BWZBLBHR64 CjMQTtceTUvqOmrhZmbFa6eTPTiKOow+1yQtgUsSZv0ZW18yoZc73wJMsXDgxDXQd4z0 XYkMGNavw5VvFZMQ/6vLXmyCHGKSKra2oNMTh2kXUEx+lbkpK7xZbu6BvEW2vjIyQ0EA M4W0Q8JGpEnjPMDr0Xbg1v3YafjbxS4acnueQHxsplLnsE72ogGxytwfeIqSI4dcZhGp IkaQ== X-Gm-Message-State: AOAM532iEtKB0YBOk5MiXqXdrHe7WW+YqBKUIvGDKkXqI1rG5BL0qXJb OpLdzIu9wDOlTs7RHe5TdoApZjxbIPrFwA== X-Google-Smtp-Source: ABdhPJwwb+fQsGGWrUCWxq60gGQtvFN0KWbAzNRp4uhsLyWnTViFU8+8Y4zxtREKldE4exEX2cmZaA== X-Received: by 2002:a17:902:a3cb:b0:151:e52e:fa0c with SMTP id q11-20020a170902a3cb00b00151e52efa0cmr24316531plb.70.1648448574406; Sun, 27 Mar 2022 23:22:54 -0700 (PDT) Received: from localhost ([2001:4479:e000:e400:743e:bc3e:ec72:bf20]) by smtp.gmail.com with ESMTPSA id k6-20020a056a00134600b004faba67f9d4sm14949957pfu.197.2022.03.27.23.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 23:22:54 -0700 (PDT) From: Daniel Axtens To: grub-devel@gnu.org Cc: leif@nuviainc.com, stefanb@linux.ibm.com, ps@pks.im, dkiper@net-space.pl, Daniel Axtens Subject: [PATCH v2 02/15] mm: assert that we preserve header vs region alignment Date: Mon, 28 Mar 2022 17:22:27 +1100 Message-Id: <20220328062240.878781-3-dja@axtens.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328062240.878781-1-dja@axtens.net> References: <20220328062240.878781-1-dja@axtens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1034 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=dja@axtens.net; helo=mail-pj1-x1034.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2022 06:22:59 -0000 grub_mm_region_init() does: h = (grub_mm_header_t) (r + 1); where h is a grub_mm_header_t and r is a grub_mm_region_t. Cells are supposed to be GRUB_MM_ALIGN aligned, but while grub_mm_dump ensures this vs the region header, grub_mm_region_init() does not. It's better to be explicit than implicit here: rather than changing grub_mm_region_init() to ALIGN_UP(), require that the struct is explictly a multiple of the header size. Signed-off-by: Daniel Axtens --- v2: Thanks Daniel K for feedback. --- include/grub/mm_private.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/grub/mm_private.h b/include/grub/mm_private.h index 203533cc3d42..d3f2321e14fb 100644 --- a/include/grub/mm_private.h +++ b/include/grub/mm_private.h @@ -20,6 +20,7 @@ #define GRUB_MM_PRIVATE_H 1 #include +#include /* For context, see kern/mm.c */ @@ -89,4 +90,17 @@ typedef struct grub_mm_region extern grub_mm_region_t EXPORT_VAR (grub_mm_base); #endif +static inline void +grub_mm_size_sanity_check (void) { + /* Ensure we preserve alignment when doing h = (grub_mm_header_t) (r + 1) */ + COMPILE_TIME_ASSERT ((sizeof (struct grub_mm_region) % + sizeof (struct grub_mm_header)) == 0); + + /* + * GRUB_MM_ALIGN is supposed to represent cell size, and a mm_header is + * supposed to be 1 cell. + */ + COMPILE_TIME_ASSERT (sizeof (struct grub_mm_header) == GRUB_MM_ALIGN); +} + #endif -- 2.32.0