Skip to content

Commit 7a5ce20

Browse files
umgwanakikbutiTiejunChina
authored andcommitted
connector/cn_proc: Protect send_msg() with a local lock on RT
|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:931 |in_atomic(): 1, irqs_disabled(): 0, pid: 31807, name: sleep |Preemption disabled at:[<ffffffff8148019b>] proc_exit_connector+0xbb/0x140 | |CPU: 4 PID: 31807 Comm: sleep Tainted: G W E 4.8.0-rt11-rt #106 |Call Trace: | [<ffffffff813436cd>] dump_stack+0x65/0x88 | [<ffffffff8109c425>] ___might_sleep+0xf5/0x180 | [<ffffffff816406b0>] __rt_spin_lock+0x20/0x50 | [<ffffffff81640978>] rt_read_lock+0x28/0x30 | [<ffffffff8156e209>] netlink_broadcast_filtered+0x49/0x3f0 | [<ffffffff81522621>] ? __kmalloc_reserve.isra.33+0x31/0x90 | [<ffffffff8156e5cd>] netlink_broadcast+0x1d/0x20 | [<ffffffff8147f57a>] cn_netlink_send_mult+0x19a/0x1f0 | [<ffffffff8147f5eb>] cn_netlink_send+0x1b/0x20 | [<ffffffff814801d8>] proc_exit_connector+0xf8/0x140 | [<ffffffff81077f71>] do_exit+0x5d1/0xba0 | [<ffffffff810785cc>] do_group_exit+0x4c/0xc0 | [<ffffffff81078654>] SyS_exit_group+0x14/0x20 | [<ffffffff81640a72>] entry_SYSCALL_64_fastpath+0x1a/0xa4 Since ab8ed95 ("connector: fix out-of-order cn_proc netlink message delivery") which is v4.7-rc6. Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 parent a8508f3 commit 7a5ce20

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/connector/cn_proc.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <linux/pid_namespace.h>
3333

3434
#include <linux/cn_proc.h>
35+
#include <linux/locallock.h>
3536

3637
/*
3738
* Size of a cn_msg followed by a proc_event structure. Since the
@@ -54,10 +55,11 @@ static struct cb_id cn_proc_event_id = { CN_IDX_PROC, CN_VAL_PROC };
5455

5556
/* proc_event_counts is used as the sequence number of the netlink message */
5657
static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
58+
static DEFINE_LOCAL_IRQ_LOCK(send_msg_lock);
5759

5860
static inline void send_msg(struct cn_msg *msg)
5961
{
60-
preempt_disable();
62+
local_lock(send_msg_lock);
6163

6264
msg->seq = __this_cpu_inc_return(proc_event_counts) - 1;
6365
((struct proc_event *)msg->data)->cpu = smp_processor_id();
@@ -70,7 +72,7 @@ static inline void send_msg(struct cn_msg *msg)
7072
*/
7173
cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_NOWAIT);
7274

73-
preempt_enable();
75+
local_unlock(send_msg_lock);
7476
}
7577

7678
void proc_fork_connector(struct task_struct *task)

0 commit comments

Comments
 (0)