Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2476631yba; Mon, 15 Apr 2019 12:26:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqy240IbuAEGBYqbEY52bAS1ZQlUMGS2hlVrWLOSNIju/KTd4nNSy8SFLznvY6wi55DqTwV5 X-Received: by 2002:a17:902:e305:: with SMTP id cg5mr9712364plb.112.1555356419117; Mon, 15 Apr 2019 12:26:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555356419; cv=none; d=google.com; s=arc-20160816; b=aq0lqOxUoLuNAxSwW6Bg/ZjYqSID5qNGIJpSSlnTyKqh0ifJYfx/GiNlS7iAmSqRzm 6HOG7j9zsU/fVPbuSXgH++wkV0lyMj0Mc8s4+JOabXq3DgnEIBd6sfPkEo2D15EZNfI/ SNYa7K9L/BpQV8cCUqYXXAhOQFesYPRsRdVrMmhh2g84OjOiFB4Vrvf2aAej6SncxoAB Ig01UgRPET1BDudAJT+S1qO6XWnaZRLWEUKhLnpa7cLPL7qsr9SFFQdFjFO0W9g8Bjn1 TDktnSEJQsj9D5E9b3sVWkHF594mBZIVGCvNw9zi0u2R3TR4RLxz50yfYZqqddWJ4Kh1 T/QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pXSOx2nzoNJNl5WT/ZvkNtLWHPGxyqbdVfnbf7ag7P0=; b=Q7aGn2Eyo7Y+pBHiaIXLj1/xNlNz1eDv+7I7Ev1ZeYJy63vSAAZh1J5H9Ef+ugIOFc ySJRrMEFdvLuB58VBNHOf2WpA+j6QXF96G63UvBLhMkOSYEaG9EouN6NBbqlB5HQhfO1 jJQHwPYRbD9kOErNJZj0xiUTmF4omvp+JnNFN5FCStJibYYvllAyQt1vSWgvpC/sQ25P DvPjTnejduViRbfHG2say9rhYlXY7tjwweDuAV3vOiPI+d9iDBJLG5qwn5EaRqTmYOnX 2AGfTgqA41pjP014+h+uIycz2ufbFLQWlNnsLOQbe8Q8ZMMd5FHIc3DCsfmhzTBU0DLb sU9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E7NMQEjU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o12si16884458plk.310.2019.04.15.12.26.42; Mon, 15 Apr 2019 12:26:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E7NMQEjU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728845AbfDOTFY (ORCPT + 99 others); Mon, 15 Apr 2019 15:05:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:38904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729158AbfDOTFR (ORCPT ); Mon, 15 Apr 2019 15:05:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 251092087C; Mon, 15 Apr 2019 19:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355116; bh=XIx9ARAKjIZ9JLOSw4XBCYpzVv7FyVXP5tEeOMQhOMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E7NMQEjUh7BYYeyTTrnk4xNKfDEMWo2Tq3NMI0Ldl8DHzukvBhmiaTeZZuVcjcgXN H+XEdOnU4DyK4GMoJKo2jSr5oYvnQEYCIcBkjBEi4tcUpHGhpmLByPRpdi9D3BKb+1 ujRe1FKyBTY55buQ5ylXUQnVtPz54ZxAed9PTmt8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michal Kubecek , Jiri Slaby , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 009/101] kcm: switch order of device registration to fix a crash Date: Mon, 15 Apr 2019 20:58:07 +0200 Message-Id: <20190415183740.861754206@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183740.341577907@linuxfoundation.org> References: <20190415183740.341577907@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 3c446e6f96997f2a95bf0037ef463802162d2323 ] When kcm is loaded while many processes try to create a KCM socket, a crash occurs: BUG: unable to handle kernel NULL pointer dereference at 000000000000000e IP: mutex_lock+0x27/0x40 kernel/locking/mutex.c:240 PGD 8000000016ef2067 P4D 8000000016ef2067 PUD 3d6e9067 PMD 0 Oops: 0002 [#1] SMP KASAN PTI CPU: 0 PID: 7005 Comm: syz-executor.5 Not tainted 4.12.14-396-default #1 SLE15-SP1 (unreleased) RIP: 0010:mutex_lock+0x27/0x40 kernel/locking/mutex.c:240 RSP: 0018:ffff88000d487a00 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 000000000000000e RCX: 1ffff100082b0719 ... CR2: 000000000000000e CR3: 000000004b1bc003 CR4: 0000000000060ef0 Call Trace: kcm_create+0x600/0xbf0 [kcm] __sock_create+0x324/0x750 net/socket.c:1272 ... This is due to race between sock_create and unfinished register_pernet_device. kcm_create tries to do "net_generic(net, kcm_net_id)". but kcm_net_id is not initialized yet. So switch the order of the two to close the race. This can be reproduced with mutiple processes doing socket(PF_KCM, ...) and one process doing module removal. Fixes: ab7ac4eb9832 ("kcm: Kernel Connection Multiplexor module") Reviewed-by: Michal Kubecek Signed-off-by: Jiri Slaby Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/kcm/kcmsock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 571d824e4e24..b919db02c7f9 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -2054,14 +2054,14 @@ static int __init kcm_init(void) if (err) goto fail; - err = sock_register(&kcm_family_ops); - if (err) - goto sock_register_fail; - err = register_pernet_device(&kcm_net_ops); if (err) goto net_ops_fail; + err = sock_register(&kcm_family_ops); + if (err) + goto sock_register_fail; + err = kcm_proc_init(); if (err) goto proc_init_fail; @@ -2069,12 +2069,12 @@ static int __init kcm_init(void) return 0; proc_init_fail: - unregister_pernet_device(&kcm_net_ops); - -net_ops_fail: sock_unregister(PF_KCM); sock_register_fail: + unregister_pernet_device(&kcm_net_ops); + +net_ops_fail: proto_unregister(&kcm_proto); fail: @@ -2090,8 +2090,8 @@ static int __init kcm_init(void) static void __exit kcm_exit(void) { kcm_proc_exit(); - unregister_pernet_device(&kcm_net_ops); sock_unregister(PF_KCM); + unregister_pernet_device(&kcm_net_ops); proto_unregister(&kcm_proto); destroy_workqueue(kcm_wq); -- 2.19.1