From patchwork Tue Jul 3 23:34:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10505603 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 50FD860225 for ; Tue, 3 Jul 2018 23:35:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 407DA28689 for ; Tue, 3 Jul 2018 23:35:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32B9A289CE; Tue, 3 Jul 2018 23:35:55 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham 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 C95DB28689 for ; Tue, 3 Jul 2018 23:35:54 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=yPliZivNFtSEQHrrD4gn59PGgqB/h+zCdeFThFXBZcs=; b=uKw9w5KhlVO1bAqiN07uSTgRBA EVIjLc8gpLw7aDn3hia01I4OjRsAUnNCQqBOh+xSDW2Nkc1FdauC9ralv+gw7hfjLFA82FqAUq/2z GXi5lQB9UzMIAHqpSp8dpgNNIrmiM09nqZxunAZRFDyh0p8YCKbX/IQIYNCUlqW9aUjzvLQJ0uE4y o8J23K6wgF2UPtj36dVInO/RCBgNa3qKYbSZq0awTtsKkgthhmQvfCuQ1LByQjjTxOXsA5tT6iYZq qKthCSITdKa7/emPcJnRtE48ckL95Cj8L4cbMqIzENLgYObHi8JLtNsINxIOtoi5ZgzP5wh41RUNv m0WHJ1JQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1faUpe-00032l-Q9; Tue, 03 Jul 2018 23:35:38 +0000 Received: from mail-oi0-f67.google.com ([209.85.218.67]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1faUou-0002E6-0m for linux-arm-kernel@lists.infradead.org; Tue, 03 Jul 2018 23:35:01 +0000 Received: by mail-oi0-f67.google.com with SMTP id d189-v6so7225315oib.6 for ; Tue, 03 Jul 2018 16:34:41 -0700 (PDT) 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; bh=PPKzxzbXZeTzzpbPbKd1oISc49HTYwkroXCel3beca4=; b=BK9tlWQCOTE2If8Mga2ynlx9j2IV9/nIgUOYsLiXLKW7nYphS7FR2h+bXRLYNDrnO3 R/XKO2y76lwPOf/Ej7Tv8lXAfwAwP4Wqs/2Qbj3MdTWWutX8m1iIrmBPblS8MaJTMFSx kSQ/H05PBg0LFz+/AFvNRmu3Kdx35W9CW/JL4dUSZWc9OIXBDYgjxCDYhXFrNeIKpsg6 EQG4xNzi9HVTWotzMpACQ4BA7Sb6g8VrEGPeFut2p3G0EfzGKX4Mj41sy3uz8d4nckMA veeMTD4RPM4SraLgrlmGHXhjH7rihKK7YV1fx0Cn6Y5hU1HqOhQFxJtNQFHk/EUdrgp4 9D8Q== X-Gm-Message-State: APt69E2z2SJivI6bcXujCTGeqpRMj+1DBdghsLNBXx/rRLmlisnom1Ih YtIkAt6FkL+Rem094m+YbIxFJA== X-Google-Smtp-Source: AAOMgpc5FQLNfk5ZFnnS06tJ9olyRLUbbg58CUH/7CStcvAgCkdie+U/IH3DSiTe7PFOXycJs7JQFw== X-Received: by 2002:aca:4286:: with SMTP id p128-v6mr21394232oia.242.1530660880792; Tue, 03 Jul 2018 16:34:40 -0700 (PDT) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc::f0c1]) by smtp.gmail.com with ESMTPSA id h22-v6sm1828702otc.25.2018.07.03.16.34.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 16:34:39 -0700 (PDT) From: Laura Abbott To: Andy Lutomirski , mjw@fedoraproject.org, "H . J . Lu" , Masahiro Yamada Subject: [PATCHv5 2/4] x86: Add build salt to the vDSO Date: Tue, 3 Jul 2018 16:34:28 -0700 Message-Id: <20180703233430.14416-3-labbott@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703233430.14416-1-labbott@redhat.com> References: <20180703233430.14416-1-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180703_163452_802205_57FDFFA3 X-CRM114-Status: GOOD ( 12.57 ) 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: Catalin Marinas , Nick Clifton , linux-kbuild@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, X86 ML , Will Deacon , linux-kernel@vger.kernel.org, Michael Ellerman , Cary Coutant , Laura Abbott , Linus Torvalds , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 The vDSO needs to have a unique build id in a similar manner to the kernel and modules. Use the build salt macro. Signed-off-by: Laura Abbott --- v5: Switched to using the single line BUILD_SALT macro --- arch/x86/entry/vdso/vdso-note.S | 3 +++ arch/x86/entry/vdso/vdso32/note.S | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/entry/vdso/vdso-note.S b/arch/x86/entry/vdso/vdso-note.S index 79a071e4357e..79423170118f 100644 --- a/arch/x86/entry/vdso/vdso-note.S +++ b/arch/x86/entry/vdso/vdso-note.S @@ -3,6 +3,7 @@ * Here we can supply some information useful to userland. */ +#include #include #include #include @@ -10,3 +11,5 @@ ELFNOTE_START(Linux, 0, "a") .long LINUX_VERSION_CODE ELFNOTE_END + +BUILD_SALT diff --git a/arch/x86/entry/vdso/vdso32/note.S b/arch/x86/entry/vdso/vdso32/note.S index 9fd51f206314..e78047d119f6 100644 --- a/arch/x86/entry/vdso/vdso32/note.S +++ b/arch/x86/entry/vdso/vdso32/note.S @@ -4,6 +4,7 @@ * Here we can supply some information useful to userland. */ +#include #include #include @@ -14,6 +15,8 @@ ELFNOTE_START(Linux, 0, "a") .long LINUX_VERSION_CODE ELFNOTE_END +BUILD_SALT + #ifdef CONFIG_XEN /* * Add a special note telling glibc's dynamic linker a fake hardware