From: Jess Frazelle <me@jessfraz.com>
To: John Stultz <john.stultz@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Jess Frazelle <me@jessfraz.com>, Rik van Riel <riel@redhat.com>,
linux-kernel@vger.kernel.org (open list)
Cc: kernel-hardening@lists.openwall.com
Subject: [PATCH v2 2/5] time: mark syscore_ops as __ro_after_init
Date: Fri, 10 Feb 2017 17:37:55 -0800 [thread overview]
Message-ID: <20170211013758.3288-2-me@jessfraz.com> (raw)
In-Reply-To: <20170211013758.3288-1-me@jessfraz.com>
Marked syscore_ops structs as __ro_after_init when register_syscore_ops was
called only during init. Most of the caller functions were already annotated as
__init.
unregister_syscore_ops() was never called on these ops.
This protects the data structure from accidental corruption.
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jess Frazelle <me@jessfraz.com>
Acked-by: Rik van Riel <riel@redhat.com>
---
kernel/time/sched_clock.c | 2 +-
kernel/time/timekeeping.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
index a26036d37a38..5df2fc07300b 100644
--- a/kernel/time/sched_clock.c
+++ b/kernel/time/sched_clock.c
@@ -289,7 +289,7 @@ static void sched_clock_resume(void)
rd->read_sched_clock = cd.actual_read_sched_clock;
}
-static struct syscore_ops sched_clock_ops = {
+static struct syscore_ops sched_clock_ops __ro_after_init = {
.suspend = sched_clock_suspend,
.resume = sched_clock_resume,
};
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index db087d7e106d..467e3021723a 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1756,7 +1756,7 @@ int timekeeping_suspend(void)
}
/* sysfs resume/suspend bits for timekeeping */
-static struct syscore_ops timekeeping_syscore_ops = {
+static struct syscore_ops timekeeping_syscore_ops __ro_after_init = {
.resume = timekeeping_resume,
.suspend = timekeeping_suspend,
};
--
2.11.0
next prev parent reply other threads:[~2017-02-11 1:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-11 1:37 [PATCH v2 1/5] irq: set {msi_domain,syscore}_ops as __ro_after_init Jess Frazelle
2017-02-11 1:37 ` Jess Frazelle [this message]
2017-02-11 2:12 ` [PATCH v2 2/5] time: mark syscore_ops " John Stultz
2017-02-11 9:23 ` Thomas Gleixner
2017-02-11 1:37 ` [PATCH v2 3/5] pci: set msi_domain_ops " Jess Frazelle
2017-02-12 4:08 ` KY Srinivasan
2017-02-13 18:14 ` Keith Busch
2017-02-15 20:33 ` Bjorn Helgaas
2017-02-15 20:46 ` Kees Cook
2017-02-15 21:16 ` Thomas Gleixner
2017-02-16 14:35 ` Bjorn Helgaas
2017-02-16 14:38 ` Thomas Gleixner
2017-03-07 19:07 ` Bjorn Helgaas
2017-03-14 18:50 ` Jessica Frazelle
2017-03-14 19:24 ` Bjorn Helgaas
2017-02-11 1:37 ` [PATCH v2 4/5] staging: " Jess Frazelle
2017-02-11 1:37 ` [PATCH v2 5/5] x86: " Jess Frazelle
2017-02-11 9:14 ` [PATCH v2 1/5] irq: set {msi_domain,syscore}_ops " Thomas Gleixner
2017-02-11 9:23 ` Thomas Gleixner
2017-02-11 10:48 ` Jess Frazelle
2017-02-11 12:00 ` Thomas Gleixner
2017-02-11 12:17 ` Jessica Frazelle
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=20170211013758.3288-2-me@jessfraz.com \
--to=me@jessfraz.com \
--cc=john.stultz@linaro.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.kernel.org \
--cc=riel@redhat.com \
--cc=tglx@linutronix.de \
/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