From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756294Ab1HEFhZ (ORCPT ); Fri, 5 Aug 2011 01:37:25 -0400 Received: from hera.kernel.org ([140.211.167.34]:45353 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751405Ab1HEFhX (ORCPT ); Fri, 5 Aug 2011 01:37:23 -0400 Date: Fri, 5 Aug 2011 05:37:12 GMT From: tip-bot for Andy Lutomirski Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, luto@mit.edu, tglx@linutronix.de, hpa@linux.intel.com, luto@mit.edu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, luto@mit.edu, tglx@linutronix.de, hpa@linux.intel.com, luto@mit.edu In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/vdso] x86-64: Pad vDSO to a page boundary Git-Commit-ID: 1bdfac19b3ecfca545281c15c7aea7ebc2eaef31 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Fri, 05 Aug 2011 05:37:13 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1bdfac19b3ecfca545281c15c7aea7ebc2eaef31 Gitweb: http://git.kernel.org/tip/1bdfac19b3ecfca545281c15c7aea7ebc2eaef31 Author: Andy Lutomirski AuthorDate: Wed, 3 Aug 2011 09:31:49 -0400 Committer: H. Peter Anvin CommitDate: Thu, 4 Aug 2011 16:13:34 -0700 x86-64: Pad vDSO to a page boundary This avoids an information leak to userspace. Signed-off-by: Andy Lutomirski Link: http://lkml.kernel.org/r/a63380a3c58a0506a2f5a18ba1b12dbde1f25e58.1312378163.git.luto@mit.edu Signed-off-by: H. Peter Anvin --- arch/x86/vdso/vdso.S | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S index 1b979c1..01f5e3b 100644 --- a/arch/x86/vdso/vdso.S +++ b/arch/x86/vdso/vdso.S @@ -9,6 +9,7 @@ __PAGE_ALIGNED_DATA vdso_start: .incbin "arch/x86/vdso/vdso.so" vdso_end: + .align PAGE_SIZE /* extra data here leaks to userspace. */ .previous