From patchwork Mon Mar 5 11:17:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinbum Park X-Patchwork-Id: 10258719 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5D24360134 for ; Mon, 5 Mar 2018 11:18:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49D6C28553 for ; Mon, 5 Mar 2018 11:18:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E19828935; Mon, 5 Mar 2018 11:18:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B510D28553 for ; Mon, 5 Mar 2018 11:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=h7eI9s+NLV176oPksGVFOrWchMueR8Wcifgmx1Um62I=; b=hZDU61R4RPdhzD KwRe7qwZa0wWQ4rsdZSjXfQsbqKAG9EdHmsZ4iQOI+Gaxt008P2dI5amBcXQkPRhuaOfbJMPc3Q/a HK7iSu+arqoLBIJ7wLeEaTbKIFjmuOT8Kkew7O9IbIrcNKfp7JWgcYYAWrVGpH4RGOAwXpcJB+DIS asM/OKC9NnHp/Fs/P0eNN8DEm0UZSpQ21FfM4MiI74M/MxsK6ClOOmnOTluUsF/ONgnTBtFYntTAv 2XjWTgyumc3pNBCXcouRXNk7VO/v9m0qvI8D09vLXHUYPE0nZG9HmLIS4FkANOWHP7LqbwNb4Yo1K wqVwYWV8iaCXo46OErFA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eso8B-0005Tn-3h; Mon, 05 Mar 2018 11:18:11 +0000 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eso84-0005PL-2b for linux-arm-kernel@lists.infradead.org; Mon, 05 Mar 2018 11:18:09 +0000 Received: by mail-pl0-x244.google.com with SMTP id y8-v6so9416310pll.13 for ; Mon, 05 Mar 2018 03:17:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=A8iIm/CXEgV3m1ADZaTfq8VgkAJiYbJddmzSFFnPJp4=; b=YJFponBO1rqgURNXqnkw8Rn7h51JY9DAvvBJolLOlnHfRlakmLzzImklw9EmJbFkrb qmym6cjbKncfRumhYazM4tcKpqSkGQruv9PQtxx9j67YA5Cy8zK2xzXx4IJ+roQilpEP /kWQHVCqZVUJMP/Vw00XyDZnn+ROmYLtwHyUAQiic4snMCPJh7TQRN+OrrrrFZnZ6Y9v VPZRxsfhu51Hc8EYUtNURna8UcBDtBno1MUGbCv7NAC4CgRcfvuLYAUaNArO4Z3LmUdm K6txX//cj21bmhQmB8YVrQ+tyegvuAxJfpsSHLMsi+9glplCTLmdqTFpqfXc686LoCws 1nmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=A8iIm/CXEgV3m1ADZaTfq8VgkAJiYbJddmzSFFnPJp4=; b=ijsqXJLJXbLq8xQxSRIaP44UPleiWKxyjS9jWTeWj2ReMHU2I+xtf5od5moGcrdXoz pb6BNkOG5GQs4ywn4X0Gwo/n5SSyp+gBUs+Ee8LE2vdyM2/W9mKjONdDJhkxIRuQoGHk C+R20iOlDVxJA8p7psYXuhVFSvBnFL3kVqhDyhl6dIza0CUf46AzDe0yE1+Ne9A5QHX7 ++QosAPQ2jVCxJscDIl/tO1mTQ3t9OoEiil/4kYm/Kmpm0AB+PohzXvKCvfPl7OKkpaW iJg3L3/s4yAiAGV+X0StVBvZafmgL+wsgVDgojn5GAmPRNiUp4A5XFDj0rZeBWufaIax abeg== X-Gm-Message-State: APf1xPC4b3298poPPufIh5bwRNNHLw+Poff+5A9Y25jsSBj1qolSxgeq 88bktEbDjlQOnLGiZzGb4/yxWA== X-Google-Smtp-Source: AG47ELubqxMeIDbSVhJK439vs90xfFafutWnnkUYgYX2cVOth7JzYCkG7w6VqUg/NA68zLerYjbBBg== X-Received: by 2002:a17:902:7c84:: with SMTP id y4-v6mr12610993pll.305.1520248673260; Mon, 05 Mar 2018 03:17:53 -0800 (PST) Received: from pjb1027-Latitude-E5410 ([58.227.15.43]) by smtp.gmail.com with ESMTPSA id r29sm25113923pfj.99.2018.03.05.03.17.49 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 05 Mar 2018 03:17:52 -0800 (PST) Date: Mon, 5 Mar 2018 20:17:45 +0900 From: Jinbum Park To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: [PATCH v2 1/2] arm: mm: Define vdso_start, vdso_end as array Message-ID: <20180305111745.GA4193@pjb1027-Latitude-E5410> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180305_031804_274702_4F4A8ED9 X-CRM114-Status: GOOD ( 17.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kstewart@linuxfoundation.org, mark.rutland@arm.com, catalin.marinas@arm.com, keescook@chromium.org, arnd@arndb.de, gregkh@linuxfoundation.org, will.deacon@arm.com, luto@amacapital.net, danielmicay@gmail.com, dsafonov@virtuozzo.com, tglx@linutronix.de Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Define vdso_start, vdso_end as array to avoid compile-time analysis error for the case of built with CONFIG_FORTIFY_SOURCE. and, since vdso_start, vdso_end are used in vdso.c only, move extern-declaration from vdso.h to vdso.c. If kernel is built with CONFIG_FORTIFY_SOURCE, compile-time error happens at this code. - if (memcmp(&vdso_start, "\177ELF", 4)) The size of "&vdso_start" is recognized as 1 byte, but n is 4, So that compile-time error is reported. Acked-by: Kees Cook Signed-off-by: Jinbum Park --- v2: No changes --- arch/arm/include/asm/vdso.h | 2 -- arch/arm/kernel/vdso.c | 12 +++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/asm/vdso.h b/arch/arm/include/asm/vdso.h index 9c99e81..5b85889 100644 --- a/arch/arm/include/asm/vdso.h +++ b/arch/arm/include/asm/vdso.h @@ -12,8 +12,6 @@ void arm_install_vdso(struct mm_struct *mm, unsigned long addr); -extern char vdso_start, vdso_end; - extern unsigned int vdso_total_pages; #else /* CONFIG_VDSO */ diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index a4d6dc0..f4dd7f9 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -39,6 +39,8 @@ static struct page **vdso_text_pagelist; +extern char vdso_start[], vdso_end[]; + /* Total number of pages needed for the data and text portions of the VDSO. */ unsigned int vdso_total_pages __ro_after_init; @@ -197,13 +199,13 @@ static int __init vdso_init(void) unsigned int text_pages; int i; - if (memcmp(&vdso_start, "\177ELF", 4)) { + if (memcmp(vdso_start, "\177ELF", 4)) { pr_err("VDSO is not a valid ELF object!\n"); return -ENOEXEC; } - text_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT; - pr_debug("vdso: %i text pages at base %p\n", text_pages, &vdso_start); + text_pages = (vdso_end - vdso_start) >> PAGE_SHIFT; + pr_debug("vdso: %i text pages at base %p\n", text_pages, vdso_start); /* Allocate the VDSO text pagelist */ vdso_text_pagelist = kcalloc(text_pages, sizeof(struct page *), @@ -218,7 +220,7 @@ static int __init vdso_init(void) for (i = 0; i < text_pages; i++) { struct page *page; - page = virt_to_page(&vdso_start + i * PAGE_SIZE); + page = virt_to_page(vdso_start + i * PAGE_SIZE); vdso_text_pagelist[i] = page; } @@ -229,7 +231,7 @@ static int __init vdso_init(void) cntvct_ok = cntvct_functional(); - patch_vdso(&vdso_start); + patch_vdso(vdso_start); return 0; }