diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2009-05-21 06:34:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-21 19:50:24 -0400 |
commit | 7ae740df3a9c68622156476dca29991de664fae4 (patch) | |
tree | c2c63d862b9dba337c1eeafc848189e849850346 /net/netlabel/netlabel_mgmt.c | |
parent | 8f698d54532172de3591af1e9394dc669f29e6ca (diff) |
netlabel: Use genl_register_family_with_ops()
Use genl_register_family_with_ops() instead of a copy. This fixes genetlink
family leak on error path.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlabel/netlabel_mgmt.c')
-rw-r--r-- | net/netlabel/netlabel_mgmt.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c index 1821c5d50fb..8203623e65a 100644 --- a/net/netlabel/netlabel_mgmt.c +++ b/net/netlabel/netlabel_mgmt.c | |||
@@ -779,18 +779,6 @@ static struct genl_ops netlbl_mgmt_genl_ops[] = { | |||
779 | */ | 779 | */ |
780 | int __init netlbl_mgmt_genl_init(void) | 780 | int __init netlbl_mgmt_genl_init(void) |
781 | { | 781 | { |
782 | int ret_val, i; | 782 | return genl_register_family_with_ops(&netlbl_mgmt_gnl_family, |
783 | 783 | netlbl_mgmt_genl_ops, ARRAY_SIZE(netlbl_mgmt_genl_ops)); | |
784 | ret_val = genl_register_family(&netlbl_mgmt_gnl_family); | ||
785 | if (ret_val != 0) | ||
786 | return ret_val; | ||
787 | |||
788 | for (i = 0; i < ARRAY_SIZE(netlbl_mgmt_genl_ops); i++) { | ||
789 | ret_val = genl_register_ops(&netlbl_mgmt_gnl_family, | ||
790 | &netlbl_mgmt_genl_ops[i]); | ||
791 | if (ret_val != 0) | ||
792 | return ret_val; | ||
793 | } | ||
794 | |||
795 | return 0; | ||
796 | } | 784 | } |