From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752807AbdBKBiW (ORCPT ); Fri, 10 Feb 2017 20:38:22 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:36687 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752578AbdBKBiT (ORCPT ); Fri, 10 Feb 2017 20:38:19 -0500 From: Jess Frazelle To: John Stultz , Thomas Gleixner , Jess Frazelle , Rik van Riel , 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 Message-Id: <20170211013758.3288-2-me@jessfraz.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170211013758.3288-1-me@jessfraz.com> References: <20170211013758.3288-1-me@jessfraz.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Jess Frazelle Acked-by: Rik van Riel --- 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