diff options
| author | Jiri Pirko <jiri@nvidia.com> | 2022-08-25 10:19:40 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-08-26 18:47:21 -0700 |
| commit | 8f1948bdcf2fb50e9092c0950c3c9ac591382101 (patch) | |
| tree | c1226196268ab3fef0332a460132f84e31186594 | |
| parent | 0c1f77d87d699346f8e8a4874692eb82cbcf9c65 (diff) | |
| download | linux-8f1948bdcf2fb50e9092c0950c3c9ac591382101.tar.gz linux-8f1948bdcf2fb50e9092c0950c3c9ac591382101.tar.bz2 linux-8f1948bdcf2fb50e9092c0950c3c9ac591382101.zip | |
genetlink: hold read cb_lock during iteration of genl_fam_idr in genl_bind()
In genl_bind(), currently genl_lock and write cb_lock are taken
for iteration of genl_fam_idr and processing of static values
stored in struct genl_family. Take just read cb_lock for this task
as it is sufficient to guard the idr and the struct against
concurrent genl_register/unregister_family() calls.
This will allow to run genl command processing in genl_rcv() and
mnl_socket_setsockopt(.., NETLINK_ADD_MEMBERSHIP, ..) in parallel.
Reported-by: Vikas Gupta <vikas.gupta@broadcom.com>
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20220825081940.1283335-1-jiri@resnulli.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/netlink/genetlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 57010927e20a..76aed0571e3a 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -1362,7 +1362,7 @@ static int genl_bind(struct net *net, int group) unsigned int id; int ret = 0; - genl_lock_all(); + down_read(&cb_lock); idr_for_each_entry(&genl_fam_idr, family, id) { const struct genl_multicast_group *grp; @@ -1383,7 +1383,7 @@ static int genl_bind(struct net *net, int group) break; } - genl_unlock_all(); + up_read(&cb_lock); return ret; } |