Commit 9a484516 authored by Cong Wang's avatar Cong Wang Committed by Greg Kroah-Hartman

llc: avoid blocking in llc_sap_close()

[ Upstream commit 9708d2b5 ]

llc_sap_close() is called by llc_sap_put() which
could be called in BH context in llc_rcv(). We can't
block in BH.

There is no reason to block it here, kfree_rcu() should
be sufficient.
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 50e40ebc
...@@ -66,6 +66,7 @@ struct llc_sap { ...@@ -66,6 +66,7 @@ struct llc_sap {
int sk_count; int sk_count;
struct hlist_nulls_head sk_laddr_hash[LLC_SK_LADDR_HASH_ENTRIES]; struct hlist_nulls_head sk_laddr_hash[LLC_SK_LADDR_HASH_ENTRIES];
struct hlist_head sk_dev_hash[LLC_SK_DEV_HASH_ENTRIES]; struct hlist_head sk_dev_hash[LLC_SK_DEV_HASH_ENTRIES];
struct rcu_head rcu;
}; };
static inline static inline
......
...@@ -127,9 +127,7 @@ void llc_sap_close(struct llc_sap *sap) ...@@ -127,9 +127,7 @@ void llc_sap_close(struct llc_sap *sap)
list_del_rcu(&sap->node); list_del_rcu(&sap->node);
spin_unlock_bh(&llc_sap_list_lock); spin_unlock_bh(&llc_sap_list_lock);
synchronize_rcu(); kfree_rcu(sap, rcu);
kfree(sap);
} }
static struct packet_type llc_packet_type __read_mostly = { static struct packet_type llc_packet_type __read_mostly = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment