From b97327e1f6924892381e6a1b9d0a37f60e4bebdb Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 11 Apr 2022 21:15:13 +0200 Subject: [PATCH] module: handle type register errors Registering an export type can give an error when the type is already registered. Handle those errors and refuse to load the module. See #2281 --- src/modules/module-client-device.c | 11 ++++++++--- src/modules/module-client-node.c | 18 +++++++++++++----- src/modules/module-metadata.c | 6 +++++- .../module-session-manager/endpoint-link.c | 7 ++++++- .../module-session-manager/endpoint-stream.c | 7 ++++++- src/modules/module-session-manager/endpoint.c | 7 ++++++- src/modules/module-session-manager/session.c | 7 ++++++- 7 files changed, 50 insertions(+), 13 deletions(-) diff --git a/src/modules/module-client-device.c b/src/modules/module-client-device.c index 682540501..92a184b80 100644 --- a/src/modules/module-client-device.c +++ b/src/modules/module-client-device.c @@ -175,6 +175,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) struct pw_context *context = pw_impl_module_get_context(module); struct pw_impl_factory *factory; struct factory_data *data; + int res; PW_LOG_TOPIC_INIT(mod_topic); factory = pw_context_create_factory(context, @@ -198,15 +199,19 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) &impl_factory, data); - pw_protocol_native_ext_client_device_init(context); - data->export_spadevice.type = SPA_TYPE_INTERFACE_Device; data->export_spadevice.func = pw_core_spa_device_export; - pw_context_register_export_type(context, &data->export_spadevice); + if ((res = pw_context_register_export_type(context, &data->export_spadevice)) < 0) + goto error; + + pw_protocol_native_ext_client_device_init(context); pw_impl_module_add_listener(module, &data->module_listener, &module_events, data); pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props)); return 0; +error: + pw_impl_factory_destroy(data->this); + return res; } diff --git a/src/modules/module-client-node.c b/src/modules/module-client-node.c index 9e7205601..092d9854d 100644 --- a/src/modules/module-client-node.c +++ b/src/modules/module-client-node.c @@ -163,6 +163,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) struct pw_context *context = pw_impl_module_get_context(module); struct pw_impl_factory *factory; struct factory_data *data; + int res; PW_LOG_TOPIC_INIT(mod_topic); @@ -185,20 +186,27 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) &impl_factory, data); - pw_protocol_native_ext_client_node_init(context); - pw_protocol_native_ext_client_node0_init(context); - data->export_node.type = PW_TYPE_INTERFACE_Node; data->export_node.func = pw_core_node_export; - pw_context_register_export_type(context, &data->export_node); + if ((res = pw_context_register_export_type(context, &data->export_node)) < 0) + goto error; data->export_spanode.type = SPA_TYPE_INTERFACE_Node; data->export_spanode.func = pw_core_spa_node_export; - pw_context_register_export_type(context, &data->export_spanode); + if ((res = pw_context_register_export_type(context, &data->export_spanode)) < 0) + goto error_remove; + + pw_protocol_native_ext_client_node_init(context); + pw_protocol_native_ext_client_node0_init(context); pw_impl_module_add_listener(module, &data->module_listener, &module_events, data); pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props)); return 0; +error_remove: + spa_list_remove(&data->export_node.link); +error: + pw_impl_factory_destroy(data->this); + return res; } diff --git a/src/modules/module-metadata.c b/src/modules/module-metadata.c index 054daa758..7a9f125e4 100644 --- a/src/modules/module-metadata.c +++ b/src/modules/module-metadata.c @@ -212,11 +212,15 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) data->export_metadata.type = PW_TYPE_INTERFACE_Metadata; data->export_metadata.func = pw_core_metadata_export; - pw_context_register_export_type(context, &data->export_metadata); + if ((res = pw_context_register_export_type(context, &data->export_metadata)) < 0) + goto error; pw_impl_module_add_listener(module, &data->module_listener, &module_events, data); pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props)); return 0; +error: + pw_impl_factory_destroy(data->this); + return res; } diff --git a/src/modules/module-session-manager/endpoint-link.c b/src/modules/module-session-manager/endpoint-link.c index 326af3c56..58c1afbbb 100644 --- a/src/modules/module-session-manager/endpoint-link.c +++ b/src/modules/module-session-manager/endpoint-link.c @@ -540,6 +540,7 @@ int endpoint_link_factory_init(struct pw_impl_module *module) struct pw_context *context = pw_impl_module_get_context(module); struct pw_impl_factory *factory; struct factory_data *data; + int res; factory = pw_context_create_factory(context, "endpoint-link", @@ -558,9 +559,13 @@ int endpoint_link_factory_init(struct pw_impl_module *module) data->export.type = PW_TYPE_INTERFACE_EndpointLink; data->export.func = pw_core_endpoint_link_export; - pw_context_register_export_type(context, &data->export); + if ((res = pw_context_register_export_type(context, &data->export)) < 0) + goto error; pw_impl_module_add_listener(module, &data->module_listener, &module_events, data); return 0; +error: + pw_impl_factory_destroy(data->this); + return res; } diff --git a/src/modules/module-session-manager/endpoint-stream.c b/src/modules/module-session-manager/endpoint-stream.c index 939e28e6c..80810e30a 100644 --- a/src/modules/module-session-manager/endpoint-stream.c +++ b/src/modules/module-session-manager/endpoint-stream.c @@ -531,6 +531,7 @@ int endpoint_stream_factory_init(struct pw_impl_module *module) struct pw_context *context = pw_impl_module_get_context(module); struct pw_impl_factory *factory; struct factory_data *data; + int res; factory = pw_context_create_factory(context, "endpoint-stream", @@ -549,9 +550,13 @@ int endpoint_stream_factory_init(struct pw_impl_module *module) data->export.type = PW_TYPE_INTERFACE_EndpointStream; data->export.func = pw_core_endpoint_stream_export; - pw_context_register_export_type(context, &data->export); + if ((res = pw_context_register_export_type(context, &data->export)) < 0) + goto error; pw_impl_module_add_listener(module, &data->module_listener, &module_events, data); return 0; +error: + pw_impl_factory_destroy(data->this); + return res; } diff --git a/src/modules/module-session-manager/endpoint.c b/src/modules/module-session-manager/endpoint.c index 41425cdba..2059d4414 100644 --- a/src/modules/module-session-manager/endpoint.c +++ b/src/modules/module-session-manager/endpoint.c @@ -540,6 +540,7 @@ int endpoint_factory_init(struct pw_impl_module *module) struct pw_context *context = pw_impl_module_get_context(module); struct pw_impl_factory *factory; struct factory_data *data; + int res; factory = pw_context_create_factory(context, "endpoint", @@ -558,9 +559,13 @@ int endpoint_factory_init(struct pw_impl_module *module) data->export.type = PW_TYPE_INTERFACE_Endpoint; data->export.func = pw_core_endpoint_export; - pw_context_register_export_type(context, &data->export); + if ((res = pw_context_register_export_type(context, &data->export)) < 0) + goto error; pw_impl_module_add_listener(module, &data->module_listener, &module_events, data); return 0; +error: + pw_impl_factory_destroy(data->this); + return res; } diff --git a/src/modules/module-session-manager/session.c b/src/modules/module-session-manager/session.c index 35e4fccfa..5473da71f 100644 --- a/src/modules/module-session-manager/session.c +++ b/src/modules/module-session-manager/session.c @@ -529,6 +529,7 @@ int session_factory_init(struct pw_impl_module *module) struct pw_context *context = pw_impl_module_get_context(module); struct pw_impl_factory *factory; struct factory_data *data; + int res; factory = pw_context_create_factory(context, "session", @@ -547,9 +548,13 @@ int session_factory_init(struct pw_impl_module *module) data->export.type = PW_TYPE_INTERFACE_Session; data->export.func = pw_core_session_export; - pw_context_register_export_type(context, &data->export); + if ((res = pw_context_register_export_type(context, &data->export)) < 0) + goto error; pw_impl_module_add_listener(module, &data->module_listener, &module_events, data); return 0; +error: + pw_impl_factory_destroy(data->this); + return res; }