From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754468AbcFQAqe (ORCPT ); Thu, 16 Jun 2016 20:46:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54984 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754091AbcFQAqc (ORCPT ); Thu, 16 Jun 2016 20:46:32 -0400 From: Prarit Bhargava To: linux-kernel@vger.kernel.org Cc: Prarit Bhargava , Andrew Morton , Thomas Gleixner , Yang Shi , Ingo Molnar , Mel Gorman , Rasmus Villemoes , Kees Cook , Yaowei Bai , Andrey Ryabinin Subject: [PATCH v2] init, allow blacklisting of module_init functions Date: Thu, 16 Jun 2016 20:46:27 -0400 Message-Id: <1466124387-20446-1-git-send-email-prarit@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 17 Jun 2016 00:46:32 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sprint_symbol_no_offset() returns the string "function_name [module_name]" where [module_name] is not printed for built in kernel functions. This means that the blacklisting code will fail when comparing module function names with the extended string. This patch adds the functionality to block a module's module_init() function by finding the space in the string and truncating the comparison to that length. [v2]: linux@rasmusvillemoes.dk, switch to strreplace() Signed-off-by: Prarit Bhargava Cc: Andrew Morton Cc: Thomas Gleixner Cc: Yang Shi Cc: Prarit Bhargava Cc: Ingo Molnar Cc: Mel Gorman Cc: Rasmus Villemoes Cc: Kees Cook Cc: Yaowei Bai Cc: Andrey Ryabinin --- init/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/init/main.c b/init/main.c index 4c17fda5c2ff..e8fb1b537d08 100644 --- a/init/main.c +++ b/init/main.c @@ -713,6 +713,11 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn) return false; sprint_symbol_no_offset(fn_name, (unsigned long)fn); + /* + * fn will be "function_name [module_name]" where [module_name] is not + * displayed for built-in init functions. Strip off the [module_name]. + */ + strreplace(fn_name, ' ', '\0'); list_for_each_entry(entry, &blacklisted_initcalls, next) { if (!strcmp(fn_name, entry->buf)) { -- 1.7.9.3