genetlink: remove genl_bind
Subsystems (2)
PATCH v2 1/1 genetlink: remove genl_bind
A potential deadlock can occur during registering or unregistering a new generic netlink family between the main nl_table_lock and the cb_lock where each thread wants the lock held by the other, as demonstrated below.
1) Thread 1 is performing a netlink_bind() operation on a socket. As part of this call, it will call netlink_lock_table(), incrementing the nl_table_users count to 1.
2) Thread 2 is registering (or unregistering) a genl_family via the genl_(un)register_family() API. The cb_lock semaphore will be taken for writing.
3) Thread 1 will call genl_bind() as part of the bind operation to handle subscribing to GENL multicast groups at the request of the user. It will attempt to take the cb_lock semaphore for reading, but it will fail and be scheduled away, waiting for Thread 2 to finish the write.
4) Thread 2 will call netlink_table_grab() during the (un)registration call. However, as Thread 1 has incremented nl_table_users, it will not be able to proceed, and both threads will be stuck waiting for the other.
genl_bind() is a noop, unless a genl_family implements the mcast_bind() function to handle setting up family-specific multicast operations. Since no one in-tree uses this functionality as Cong pointed out, simply removing the genl_bind() function will remove the possibility for deadlock, as there is no attempt by Thread 1 above to take the cb_lock semaphore.
--- include/net/genetlink.h | 8 -------- net/netlink/genetlink.c | 49 ------------------------------------------------- 2 files changed, 57 deletions(-)
include/net/genetlink.h +0 -8
@@ -35,12 +35,6 @@ struct genl_multicast_group {* do additional, common, filtering and return an error * @post_doit: called after an operation's doit callback, it may * undo operations done by pre_doit, for example release locks -* @mcast_bind: a socket bound to the given multicast group (which -* is given as the offset into the groups array) -* @mcast_unbind: a socket was unbound from the given multicast group. -* Note that unbind() will not be called symmetrically if the -* generic netlink family is removed while there are still open -* sockets. * @attrbuf: buffer to store parsed attributes (private) * @mcgrps: multicast groups used by this family * @n_mcgrps: number of multicast groups
@@ -64,8 +58,6 @@ struct genl_family {void (*post_doit)(const struct genl_ops *ops,struct sk_buff *skb,struct genl_info *info); -int (*mcast_bind)(struct net *net,int group); -void (*mcast_unbind)(struct net *net,int group);struct nlattr ** attrbuf;/* private */ const struct genl_ops * ops;const struct genl_multicast_group *mcgrps;
net/netlink/genetlink.c +0 -49
60 lines not on this page · raw message
Signature · 1 line
1.9.1
Quoted 21 lines · Sean Tranchetti
A potential deadlock can occur during registering or unregistering a new generic netlink family between the main
nl_table_lockand thecb_lockwhere each thread wants the lock held by the other, as demonstrated below.1) Thread 1 is performing a
netlink_bind()operation on a socket. As part of this call, it will callnetlink_lock_table(), incrementing thenl_table_userscount to 1.
2) Thread 2 is registering (or unregistering) agenl_familyvia the genl_(un)register_family() API. Thecb_locksemaphore will be taken for writing.
3) Thread 1 will callgenl_bind()as part of the bind operation to handle subscribing to GENL multicast groups at the request of the user. It will attempt to take thecb_locksemaphore for reading, but it will fail and be scheduled away, waiting for Thread 2 to finish the write.
4) Thread 2 will callnetlink_table_grab()during the (un)registration call. However, as Thread 1 has incrementednl_table_users, it will not be able to proceed, and both threads will be stuck waiting for the other.
Quoted 5 lines
genl_bind()is a noop, unless agenl_familyimplements themcast_bind()function to handle setting up family-specific multicast operations. Since no one in-tree uses this functionality as Cong pointed out, simply removing thegenl_bind()function will remove the possibility for deadlock, as there is no attempt by Thread 1 above to take thecb_locksemaphore.
I think it is worth noting removing the -ENOENT is probably okay, as mentioned in commit 023e2cfa36c31b0ad28c159a1bb0d61ff57334c8:
Also do this in generic netlink, and there also make sure that any bind for multicast groups that only exist in init_net is rejected. This isn't really a problem if it is accepted since a client in a different namespace will never receive any notifications from such a group, but it can confuse the family if not rejected (it's also possible to silently (without telling the family) accept it, but it would also have to be ignored on unbind so families that take any kind of action on bind/unbind won't do unnecessary work for invalid clients like that.
Thanks.
David Miller
maintainerFrom: Sean Tranchetti <[email protected]>
Date: Tue, 30 Jun 2020 11:50:17 -0600
Quoted 26 lines
A potential deadlock can occur during registering or unregistering a new generic netlink family between the main
nl_table_lockand thecb_lockwhere each thread wants the lock held by the other, as demonstrated below.1) Thread 1 is performing a
netlink_bind()operation on a socket. As part of this call, it will callnetlink_lock_table(), incrementing thenl_table_userscount to 1.
2) Thread 2 is registering (or unregistering) agenl_familyvia the genl_(un)register_family() API. Thecb_locksemaphore will be taken for writing.
3) Thread 1 will callgenl_bind()as part of the bind operation to handle subscribing to GENL multicast groups at the request of the user. It will attempt to take thecb_locksemaphore for reading, but it will fail and be scheduled away, waiting for Thread 2 to finish the write.
4) Thread 2 will callnetlink_table_grab()during the (un)registration call. However, as Thread 1 has incrementednl_table_users, it will not be able to proceed, and both threads will be stuck waiting for the other.
genl_bind()is a noop, unless agenl_familyimplements themcast_bind()function to handle setting up family-specific multicast operations. Since no one in-tree uses this functionality as Cong pointed out, simply removing thegenl_bind()function will remove the possibility for deadlock, as there is no attempt by Thread 1 above to take thecb_locksemaphore.
Quoted 5 lines
Fixes c380d9a7afff ("genetlink: pass multicast bind/unbind to families")Suggested-by Cong Wang <[email protected]>Acked-by Johannes Berg <[email protected]>Reported-by kernel test robot <[email protected]>Signed-off-by Sean Tranchetti <[email protected]>
Applied and queued up for -stable, thanks.