summaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorJia-Ju Bai <baijiaju1990@163.com>2017-06-10 17:03:35 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-05 14:40:14 +0200
commit57360bc3c7a6fc9c7422e422508bf77166a05028 (patch)
tree9e0be237abd91b1339e7a53d603474e1a776c265 /net/tipc
parentbb566ce3a60eded40ae4a3421a59c0f5f1c7ef20 (diff)
net: tipc: Fix a sleep-in-atomic bug in tipc_msg_reverse
[ Upstream commit 343eba69c6968190d8654b857aea952fed9a6749 ] The kernel may sleep under a rcu read lock in tipc_msg_reverse, and the function call path is: tipc_l2_rcv_msg (acquire the lock by rcu_read_lock) tipc_rcv tipc_sk_rcv tipc_msg_reverse pskb_expand_head(GFP_KERNEL) --> may sleep tipc_node_broadcast tipc_node_xmit_skb tipc_node_xmit tipc_sk_rcv tipc_msg_reverse pskb_expand_head(GFP_KERNEL) --> may sleep To fix it, "GFP_KERNEL" is replaced with "GFP_ATOMIC". Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 17201aa8423d..1bd9817be13a 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -508,7 +508,7 @@ bool tipc_msg_reverse(u32 own_node, struct sk_buff **skb, int err)
}
if (skb_cloned(_skb) &&
- pskb_expand_head(_skb, BUF_HEADROOM, BUF_TAILROOM, GFP_KERNEL))
+ pskb_expand_head(_skb, BUF_HEADROOM, BUF_TAILROOM, GFP_ATOMIC))
goto exit;
/* Now reverse the concerned fields */