Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753032AbdCFJ2G (ORCPT ); Mon, 6 Mar 2017 04:28:06 -0500 Received: from mx2.suse.de ([195.135.220.15]:37223 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753243AbdCFJNf (ORCPT ); Mon, 6 Mar 2017 04:13:35 -0500 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Yang Yang , jiang.biao2@zte.com.cn, jiang.zhengxiong@zte.com.cn, zhong.weidong@zte.com.cn, deng.huali@zte.com.cn, Peter Zijlstra , Thomas Gleixner , Jiri Slaby Subject: [PATCH 3.12 068/113] futex: Move futex_init() to core_initcall Date: Mon, 6 Mar 2017 10:11:32 +0100 Message-Id: <66074989bb428ddc0ee7900fc02c0d9a495a1735.1488791431.git.jslaby@suse.cz> X-Mailer: git-send-email 2.12.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1719 Lines: 52 From: Yang Yang 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 25f71d1c3e98ef0e52371746220d66458eac75bc upstream. The UEVENT user mode helper is enabled before the initcalls are executed and is available when the root filesystem has been mounted. The user mode helper is triggered by device init calls and the executable might use the futex syscall. futex_init() is marked __initcall which maps to device_initcall, but there is no guarantee that futex_init() is invoked _before_ the first device init call which triggers the UEVENT user mode helper. If the user mode helper uses the futex syscall before futex_init() then the syscall crashes with a NULL pointer dereference because the futex subsystem has not been initialized yet. Move futex_init() to core_initcall so futexes are initialized before the root filesystem is mounted and the usermode helper becomes available. [ tglx: Rewrote changelog ] Signed-off-by: Yang Yang Cc: jiang.biao2@zte.com.cn Cc: jiang.zhengxiong@zte.com.cn Cc: zhong.weidong@zte.com.cn Cc: deng.huali@zte.com.cn Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1483085875-6130-1-git-send-email-yang.yang29@zte.com.cn Signed-off-by: Thomas Gleixner Signed-off-by: Jiri Slaby --- kernel/futex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/futex.c b/kernel/futex.c index 509bdd404414..9c6394afd10f 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2905,4 +2905,4 @@ static int __init futex_init(void) return 0; } -__initcall(futex_init); +core_initcall(futex_init); -- 2.12.0