res: ucmd-module: more sanity checks for sid_ucmd_dev_alias_get_* params

sid-project · Jul 30, 2024 · 03cd8f7 · 03cd8f7
1 parent 1e6e1a1
commit 03cd8f7
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/src/resource/ubridge.c b/src/resource/ubridge.c
@@ -3619,6 +3619,13 @@ const char **_do_sid_ucmd_dev_alias_get(sid_res_t           *mod_res,
 
 const char **sid_ucmd_dev_alias_get(sid_res_t *mod_res, struct sid_ucmd_ctx *ucmd_ctx, const char *alias_key, size_t *count)
 {
+	if (!mod_res || !ucmd_ctx)
+		return NULL;
+
+	if (!sid_mod_reg_match_dep(mod_res, ucmd_ctx->common->block_mod_reg_res) &&
+	    !sid_mod_reg_match_dep(mod_res, ucmd_ctx->common->type_mod_reg_res))
+		return NULL;
+
 	return _do_sid_ucmd_dev_alias_get(mod_res, ucmd_ctx, NULL, _owner_name(mod_res), alias_key, count);
 }
 
@@ -3628,7 +3635,11 @@ const char **sid_ucmd_dev_alias_get_foreign_dev(sid_res_t           *mod_res,
                                                 const char          *alias_key,
                                                 size_t              *count)
 {
-	if (UTIL_STR_EMPTY(foreign_dev_id))
+	if (!mod_res || !ucmd_ctx || UTIL_STR_EMPTY(foreign_dev_id))
+		return NULL;
+
+	if (!sid_mod_reg_match_dep(mod_res, ucmd_ctx->common->block_mod_reg_res) &&
+	    !sid_mod_reg_match_dep(mod_res, ucmd_ctx->common->type_mod_reg_res))
 		return NULL;
 
 	return _do_sid_ucmd_dev_alias_get(mod_res, ucmd_ctx, foreign_dev_id, _owner_name(mod_res), alias_key, count);
@@ -3640,7 +3651,11 @@ const char **sid_ucmd_dev_alias_get_foreign_mod(sid_res_t           *mod_res,
                                                 const char          *alias_key,
                                                 size_t              *count)
 {
-	if (UTIL_STR_EMPTY(foreign_mod_name))
+	if (!mod_res || !ucmd_ctx)
+		return NULL;
+
+	if (!sid_mod_reg_match_dep(mod_res, ucmd_ctx->common->block_mod_reg_res) &&
+	    !sid_mod_reg_match_dep(mod_res, ucmd_ctx->common->type_mod_reg_res))
 		return NULL;
 
 	return _do_sid_ucmd_dev_alias_get(mod_res, ucmd_ctx, NULL, foreign_mod_name, alias_key, count);
@@ -3653,7 +3668,11 @@ const char **sid_ucmd_dev_alias_get_foreign_dev_mod(sid_res_t           *mod_res
                                                     const char          *alias_key,
                                                     size_t              *count)
 {
-	if (UTIL_STR_EMPTY(foreign_dev_id) || UTIL_STR_EMPTY(foreign_mod_name))
+	if (!mod_res || !ucmd_ctx || UTIL_STR_EMPTY(foreign_dev_id))
+		return NULL;
+
+	if (!sid_mod_reg_match_dep(mod_res, ucmd_ctx->common->block_mod_reg_res) &&
+	    !sid_mod_reg_match_dep(mod_res, ucmd_ctx->common->type_mod_reg_res))
 		return NULL;
 
 	return _do_sid_ucmd_dev_alias_get(mod_res, ucmd_ctx, foreign_dev_id, foreign_mod_name, alias_key, count);