From patchwork Fri Jul 6 00:49:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10510477 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 5E573603D7 for ; Fri, 6 Jul 2018 00:50:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CE9B2810E for ; Fri, 6 Jul 2018 00:50:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EE682834A; Fri, 6 Jul 2018 00:50:22 +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 E75322810E for ; Fri, 6 Jul 2018 00:50:21 +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=bUf9aqJ9lTaTJNP3yijnvnn5LtbKIANh46Wa/YlQbAk=; b=YWt+ATqr6H2Icq5Z5lKdVUA9ul QtDKBXTGVLE7Af77KY7hxGyneLZgGdsPHUOiAWbY/Y5e8WmdWOS3G/iqQwMlSCXWj2tRjHe2xB61n 8p6xwySIR0+shLxvgN3x6wgPAFDJ863sag9PXvOmHDFmKCKiKYd7vAMzzIGygcbqdNDLytSsi6/2a jkw7V8pm+x+yrm6HGaBkaTt5M2tY5CG7nvuhaNq/2et45d9jlBf9eL6gCTcWSRw/zf4oyBZ7eS0lP RGfgZvHqUq2uIxWOuND4Tv3vfD5hmVYxJ9EtvoPar8Cv3bydf5cTwZ34taXQCgDH6+4fU76w0fILz e0s+vtTw==; 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 1fbEwt-0006bK-OG; Fri, 06 Jul 2018 00:50:11 +0000 Received: from mail-qt0-f195.google.com ([209.85.216.195]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fbEwh-0006Ev-Um for linux-arm-kernel@lists.infradead.org; Fri, 06 Jul 2018 00:50:02 +0000 Received: by mail-qt0-f195.google.com with SMTP id z6-v6so8714993qti.2 for ; Thu, 05 Jul 2018 17:49:53 -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=67hlObYZQvpyPrZPGFFFmsXvb23O2m/LLRXIOlSOTJM=; b=ifL6S4Sla7tatpe6KSmj73rmBP99636trcJYOKF7JkntahBgOaJSRq51cbjOlnhwOB 1LUtSyICneCTFIs0BwOyRc78VIbuE3iQ5YEswJ2HxdvbKF1aNXA/uNa0qESx57/b9tUX x+nJ8ILGP6dWHCnmHPgC50XOCHCgSw3/DQNE1FpXYqmoi1l9eJqRRy3XRiDtF8ry/PBe 1yxhWfsC5JZF3x+AJ5wyun4qYb52oE3v314qxhHfMPKfqolBSgr4PYF7s6jVTgFZObUR Vi/RrhFwrkNUOa/UN8txEKjzAvphyLcGmNnJQxqJISgBq6OFtYJsiIhWDmSPRbi+OuGr A6cw== X-Gm-Message-State: APt69E0eRSw0DM73NeL4YiNbPUQB8HwLKOLp2yTMERelU9dDMyNskCxv PWteFsPjnVqKCmYNH6O8UyTnAw== X-Google-Smtp-Source: AAOMgpcDXPWsVG/BRvKvP0SpuDTAEA0xzeu22Bn+U90IrrehylHhNmdMOa7spPnsVyw7LNI5+ZBI2g== X-Received: by 2002:a0c:9351:: with SMTP id e17-v6mr6973648qve.4.1530838193023; Thu, 05 Jul 2018 17:49:53 -0700 (PDT) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc::f0c1]) by smtp.gmail.com with ESMTPSA id q67-v6sm4675205qkb.16.2018.07.05.17.49.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 17:49:50 -0700 (PDT) From: Laura Abbott To: Andy Lutomirski , mjw@fedoraproject.org, "H . J . Lu" , Masahiro Yamada Subject: [PATCHv6 2/4] x86: Add build salt to the vDSO Date: Thu, 5 Jul 2018 17:49:38 -0700 Message-Id: <20180706004940.32587-3-labbott@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706004940.32587-1-labbott@redhat.com> References: <20180706004940.32587-1-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180705_175000_123173_5CF63AB1 X-CRM114-Status: GOOD ( 12.65 ) 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. Acked-by: Andy Lutomirski Signed-off-by: Laura Abbott --- v6: Ack from Andy --- 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