From: tip-bot for Kees Cook <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: keescook@chromium.org, luto@amacapital.net, peterz@infradead.org,
akpm@linux-foundation.org, torvalds@linux-foundation.org,
yinghai@kernel.org, linux-kernel@vger.kernel.org,
dvlasenk@redhat.com, mingo@kernel.org, tglx@linutronix.de,
bp@suse.de, luto@kernel.org, bhe@redhat.com, dyoung@redhat.com,
vgoyal@redhat.com, brgerst@gmail.com, bp@alien8.de,
hpa@zytor.com
Subject: [tip:x86/boot] x86/boot: Add missing file header comments
Date: Tue, 10 May 2016 01:41:14 -0700 [thread overview]
Message-ID: <tip-cb18ef0da259db611fbf52806592fde5f469ae67@git.kernel.org> (raw)
In-Reply-To: <1462825332-10505-3-git-send-email-keescook@chromium.org>
Commit-ID: cb18ef0da259db611fbf52806592fde5f469ae67
Gitweb: http://git.kernel.org/tip/cb18ef0da259db611fbf52806592fde5f469ae67
Author: Kees Cook <keescook@chromium.org>
AuthorDate: Mon, 9 May 2016 13:22:05 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 10 May 2016 10:12:03 +0200
x86/boot: Add missing file header comments
There were some files with missing header comments. Since they are
included from both compressed and regular kernels, make note of that.
Also corrects a typo in the mem_avoid comments.
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: kernel-hardening@lists.openwall.com
Cc: lasse.collin@tukaani.org
Link: http://lkml.kernel.org/r/1462825332-10505-3-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/boot/compressed/kaslr.c | 2 +-
arch/x86/boot/early_serial_console.c | 4 ++++
arch/x86/mm/ident_map.c | 5 +++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index f5a138c..f15d7b8 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -163,7 +163,7 @@ static bool mem_overlaps(struct mem_vector *one, struct mem_vector *two)
* memory ranges lead to really hard to debug boot failures.
*
* The initrd, cmdline, and boot_params are trivial to identify for
- * avoiding. The are MEM_AVOID_INITRD, MEM_AVOID_CMDLINE, and
+ * avoiding. They are MEM_AVOID_INITRD, MEM_AVOID_CMDLINE, and
* MEM_AVOID_BOOTPARAMS respectively below.
*
* What is not obvious how to avoid is the range of memory that is used
diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c
index 45a0768..f0b8d6d 100644
--- a/arch/x86/boot/early_serial_console.c
+++ b/arch/x86/boot/early_serial_console.c
@@ -1,3 +1,7 @@
+/*
+ * Serial port routines for use during early boot reporting. This code is
+ * included from both the compressed kernel and the regular kernel.
+ */
#include "boot.h"
#define DEFAULT_SERIAL_PORT 0x3f8 /* ttyS0 */
diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c
index 751ca92..ec21796 100644
--- a/arch/x86/mm/ident_map.c
+++ b/arch/x86/mm/ident_map.c
@@ -1,3 +1,7 @@
+/*
+ * Helper routines for building identity mapping page tables. This is
+ * included by both the compressed kernel and the regular kernel.
+ */
static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page,
unsigned long addr, unsigned long end)
@@ -10,6 +14,7 @@ static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page,
set_pmd(pmd, __pmd(addr | pmd_flag));
}
}
+
static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page,
unsigned long addr, unsigned long end)
{
next prev parent reply other threads:[~2016-05-10 8:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 20:22 [PATCH v7 0/9] x86/KASLR: Randomize virtual address separately Kees Cook
2016-05-09 20:22 ` [PATCH v7 1/9] x86/KASLR: Initialize mapping_info every time Kees Cook
2016-05-09 22:01 ` Yinghai Lu
2016-05-09 22:23 ` Yinghai Lu
2016-05-09 22:27 ` Yinghai Lu
2016-05-09 22:23 ` Kees Cook
2016-05-09 22:28 ` Yinghai Lu
2016-05-10 5:58 ` Ingo Molnar
2016-05-10 11:21 ` Borislav Petkov
2016-05-10 8:40 ` [tip:x86/boot] " tip-bot for Kees Cook
2016-05-09 20:22 ` [PATCH v7 2/9] x86/boot: Add missing file header comments Kees Cook
2016-05-10 8:41 ` tip-bot for Kees Cook [this message]
2016-05-09 20:22 ` [PATCH v7 3/9] x86/KASLR: Add slot_area to manage random_addr slots Kees Cook
2016-05-10 8:41 ` [tip:x86/boot] x86/KASLR: Add 'struct slot_area' " tip-bot for Baoquan He
2016-05-09 20:22 ` [PATCH v7 4/9] x86/KASLR: Return earliest overlap when avoiding regions Kees Cook
2016-05-10 8:42 ` [tip:x86/boot] " tip-bot for Kees Cook
2016-05-09 20:22 ` [PATCH v7 5/9] x86/KASLR: Add virtual address choosing function Kees Cook
2016-05-10 8:42 ` [tip:x86/boot] " tip-bot for Baoquan He
2016-05-09 20:22 ` [PATCH v7 6/9] x86/KASLR: Clarify purpose of each get_random_long() Kees Cook
2016-05-10 8:42 ` [tip:x86/boot] " tip-bot for Kees Cook
2016-05-09 20:22 ` [PATCH v7 7/9] x86/KASLR: Randomize virtual address separately Kees Cook
2016-05-09 20:22 ` [PATCH v7 8/9] x86/KASLR: Add physical address randomization >4G Kees Cook
2016-05-09 20:22 ` [PATCH v7 9/9] x86/KASLR: Allow randomization below load address Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-cb18ef0da259db611fbf52806592fde5f469ae67@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=dyoung@redhat.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=vgoyal@redhat.com \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).