Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp274949pxa; Fri, 31 Jul 2020 11:38:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy56G9wq54RRufCMwT1MuV0zWM+rsdfPt5cCEsKj1hoEMbBkyNzWQxtKD7f2a77oCRWkbDH X-Received: by 2002:a17:906:57ce:: with SMTP id u14mr5605885ejr.175.1596220713795; Fri, 31 Jul 2020 11:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596220713; cv=none; d=google.com; s=arc-20160816; b=icvCuw086G186P1orGVjYsaDFDCZN3D65GSDCOIu5BXGaSR0jFq/7XfCcli/P0gD1k zzfQxq87kuECoYE7IsjHz0IFT3UPF391jsiCyl81GkO4Pc+rZ9HMSEKr60cQ+YQepE97 qsHu3/jVRAkfgID2tjaGxrBKawX/CcBXhR34roLq6/ZEAwkf4O08idNWPj4iBLh+liFQ 8XNNcv5qe4t2IAHTuHufCFclIjkiCFCmAlssGzqL+xgPY4pBjUD5k8KASjuk8ktP84ia prIDGTszWlvK3/3cLbVj71IyHUV2+j9bWiSdZU6VsHNdhWbeSTR/m4F0YC/lEV163Njh 5GhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=5v86mhTzM4SZYwpUDzMMNrk+SN/FmVXE8SoMYa53F6Y=; b=GJN1Eqv4HUXeDghwXsVgYbm3hEYYJWHIUFsLomR4KE3+ZbiYBTgoAMKcecePADBtTf UTTV+r9AmQsJSm5bJh/BxuI0cpNRI5T+DIJ20YGZmijhmuz6Uxt5lLXdwy7RGFT1En8u 89ePZnLNsRwcSUFazD/SeYfe5ldDykpN95fq2xurnMXn1Uo1HLEZhs5lKjr7ymu77zwW g5sg3n9lMBJcshHDQ2Vq7qHn7d63Mzq9qI92xVUm2PHgLktR6NanuERkECYSWq+AqRz8 JX7WLDVMgh1bSuBlBbsjCjdlvqgbBRh0LJNGq33gw6EmmJfKpnCqXy0Dh7zcl8d+fujO PUnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=kSNBHuhv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n19si5569209ejg.94.2020.07.31.11.38.10; Fri, 31 Jul 2020 11:38:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=kSNBHuhv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387830AbgGaShy (ORCPT + 99 others); Fri, 31 Jul 2020 14:37:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730040AbgGaShv (ORCPT ); Fri, 31 Jul 2020 14:37:51 -0400 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9881C061574 for ; Fri, 31 Jul 2020 11:37:50 -0700 (PDT) Received: by mail-qk1-x74a.google.com with SMTP id k142so21390367qke.7 for ; Fri, 31 Jul 2020 11:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=5v86mhTzM4SZYwpUDzMMNrk+SN/FmVXE8SoMYa53F6Y=; b=kSNBHuhvWiu3Edhc80EshTZNiBJwW7/jgs6V28cgkNyxmuvHy7vqFAFbcpT5BtWxoh gZ0IV7fMZlyWMviQSeHw/mWYkqtXLjPVr1Umbt5L3Mk+43Msb33WT/fLBgwpDyV4ZX2w rInWxFkHHL9er683V4RC0fWxdftbZ4D5mGsLGvW0aYLQ5TOBI9MvQym9To7xht1lLt6F 4839tMbjgQBpMh5PHT/P/cnss4XwATs5lqiRn+TyG219C6xvydjpIVAllNALhq+uolGP 8WAM3y3vsmxQKxw0gUpzOrYB497D+jxud8jvp1LlhWLmTXfbnlkWn/B+iju5MmT5p3su d/3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=5v86mhTzM4SZYwpUDzMMNrk+SN/FmVXE8SoMYa53F6Y=; b=Qw5Hp5bpxtrFIH0dldB8hoVFs5Yan7oRy0l1/SlBkEhFsAsmcdTp07V5DbB0BcYxMC uxvZIGawhcqzDiXss+2twWYaPWNb/3py85ceiGSfDBA6m/vVwt+jHiICZHPVJzNriW5/ pNwlGsicgRTa479ajCJDhQF+nic2aMmmooXXkWy2oeFFeXOd4r6sfxhED4sWQcNIbEVs iRjIq3jBqF+0cewp6NS4nLc/DPuU/P/nLj/nPkiT5fnlRt3nMd8F1m0VJmXccJkD+pnR 0qwiKqK5uI2DFsiUwhX5Xjk2t9Xl/549oX9/J1hCBmztX53rK2bURQ+akN3SKDpSYdyy xm+g== X-Gm-Message-State: AOAM532QeAbUHbLiw+JEX9yZFzCEAD9iU3e5IDtEK5YCaPZs5jHncSBr 2DA1DlU5SXYaG+x0KINw+e67PO4PmP27d1s= X-Received: by 2002:a0c:ec86:: with SMTP id u6mr5351729qvo.58.1596220669859; Fri, 31 Jul 2020 11:37:49 -0700 (PDT) Date: Fri, 31 Jul 2020 14:37:44 -0400 In-Reply-To: <20200731183745.1669355-1-ckennelly@google.com> Message-Id: <20200731183745.1669355-3-ckennelly@google.com> Mime-Version: 1.0 References: <20200731183745.1669355-1-ckennelly@google.com> X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6-goog Subject: [PATCH 2/2 v2] Add self-test for verifying load alignment. From: Chris Kennelly To: Alexander Viro , Alexey Dobriyan , Song Liu Cc: David Rientjes , Ian Rogers , Hugh Dickens , Andrew Morton , Suren Baghdasaryan , Sandeep Patil , Fangrui Song , Nick Desaulniers , clang-built-linux@googlegroups.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Kennelly Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This produces a PIE binary with a variety of p_align requirements, suitable for verifying that the load address meets that alignment requirement. Signed-off-by: Chris Kennelly --- tools/testing/selftests/exec/.gitignore | 1 + tools/testing/selftests/exec/Makefile | 9 ++- tools/testing/selftests/exec/load_address.c | 68 +++++++++++++++++++++ 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/exec/load_address.c diff --git a/tools/testing/selftests/exec/.gitignore b/tools/testing/selftests/exec/.gitignore index 94b02a18f230b..80f57881e9146 100644 --- a/tools/testing/selftests/exec/.gitignore +++ b/tools/testing/selftests/exec/.gitignore @@ -7,6 +7,7 @@ execveat.moved execveat.path.ephemeral execveat.ephemeral execveat.denatured +/load_address_* /recursion-depth xxxxxxxx* pipe diff --git a/tools/testing/selftests/exec/Makefile b/tools/testing/selftests/exec/Makefile index 4453b8f8def37..81cd5d9860629 100644 --- a/tools/testing/selftests/exec/Makefile +++ b/tools/testing/selftests/exec/Makefile @@ -4,7 +4,7 @@ CFLAGS += -Wno-nonnull CFLAGS += -D_GNU_SOURCE TEST_PROGS := binfmt_script -TEST_GEN_PROGS := execveat +TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216 TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir pipe # Makefile is a run-time dependency, since it's accessed by the execveat test TEST_FILES := Makefile @@ -26,4 +26,9 @@ $(OUTPUT)/execveat.symlink: $(OUTPUT)/execveat $(OUTPUT)/execveat.denatured: $(OUTPUT)/execveat cp $< $@ chmod -x $@ - +$(OUTPUT)/load_address_4096: load_address.c + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-z,max-page-size=0x1000 -pie $< -o $@ +$(OUTPUT)/load_address_2097152: load_address.c + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-z,max-page-size=0x200000 -pie $< -o $@ +$(OUTPUT)/load_address_16777216: load_address.c + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-z,max-page-size=0x1000000 -pie $< -o $@ diff --git a/tools/testing/selftests/exec/load_address.c b/tools/testing/selftests/exec/load_address.c new file mode 100644 index 0000000000000..d487c2f6a6150 --- /dev/null +++ b/tools/testing/selftests/exec/load_address.c @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0-only +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include +#include +#include + +struct Statistics { + unsigned long long load_address; + unsigned long long alignment; +}; + +int ExtractStatistics(struct dl_phdr_info *info, size_t size, void *data) +{ + struct Statistics *stats = (struct Statistics *) data; + int i; + + if (info->dlpi_name != NULL && info->dlpi_name[0] != '\0') { + // Ignore headers from other than the executable. + return 2; + } + + stats->load_address = (unsigned long long) info->dlpi_addr; + stats->alignment = 0; + + for (i = 0; i < info->dlpi_phnum; i++) { + if (info->dlpi_phdr[i].p_type != PT_LOAD) + continue; + + if (info->dlpi_phdr[i].p_align > stats->alignment) + stats->alignment = info->dlpi_phdr[i].p_align; + } + + return 1; // Terminate dl_iterate_phdr. +} + +int main(int argc, char **argv) +{ + struct Statistics extracted; + unsigned long long misalign; + int ret; + + ret = dl_iterate_phdr(ExtractStatistics, &extracted); + if (ret != 1) { + fprintf(stderr, "FAILED\n"); + return 1; + } + + if (extracted.alignment == 0) { + fprintf(stderr, "No alignment found\n"); + return 1; + } else if (extracted.alignment & (extracted.alignment - 1)) { + fprintf(stderr, "Alignment is not a power of 2\n"); + return 1; + } + + misalign = extracted.load_address & (extracted.alignment - 1); + if (misalign) { + printf("alignment = %llu, load_address = %llu\n", + extracted.alignment, extracted.load_address); + fprintf(stderr, "FAILED\n"); + return 1; + } + + fprintf(stderr, "PASS\n"); + return 0; +} -- 2.28.0.163.g6104cc2f0b6-goog