Skip to content

Commit

Permalink
ucmd: module: cleanup argument checks in API functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@prajnoha
prajnoha committed Dec 13, 2023
1 parent 07a557c commit 35f4965
Showing 1 changed file with 20 additions and 32 deletions.
52 changes: 20 additions & 32 deletions src/resource/ubridge.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2352,7 +2352,7 @@ void *sid_ucmd_set_kv(sid_resource_t *mod_res,
{
const char *dom;

if (!mod_res || !ucmd_ctx || (ns == KV_NS_UNDEFINED) || !key || !*key || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
if (!mod_res || !ucmd_ctx || (ns == KV_NS_UNDEFINED) || UTIL_STR_EMPTY(key) || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
return NULL;

if (ns == KV_NS_UDEV) {
Expand Down Expand Up @@ -2447,7 +2447,7 @@ const void *sid_ucmd_get_kv(sid_resource_t *mod_res,
{
const char *dom;

if (!mod_res || !ucmd_ctx || (ns == KV_NS_UNDEFINED) || !key || !*key || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
if (!mod_res || !ucmd_ctx || (ns == KV_NS_UNDEFINED) || UTIL_STR_EMPTY(key) || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
return NULL;

if (ns == KV_NS_UDEV)
Expand Down Expand Up @@ -2492,8 +2492,8 @@ const void *sid_ucmd_get_foreign_mod_kv(sid_resource_t *mod_res,
{
const char *dom;

if (!mod_res || !ucmd_ctx || !foreign_mod_name || !*foreign_mod_name || (ns == KV_NS_UNDEFINED) || !key || !*key ||
(key[0] == KV_PREFIX_KEY_SYS_C[0]))
if (!mod_res || !ucmd_ctx || UTIL_STR_EMPTY(foreign_mod_name) || !*foreign_mod_name || (ns == KV_NS_UNDEFINED) ||
UTIL_STR_EMPTY(key) || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
return NULL;

dom = ns == KV_NS_UDEV ? NULL : KV_KEY_DOM_USER;
Expand All @@ -2512,7 +2512,7 @@ const void *sid_ucmd_get_foreign_dev_kv(sid_resource_t *mod_res,
{
const char *dom;

if (!mod_res || !ucmd_ctx || !foreign_dev_id || !*foreign_dev_id || (ns == KV_NS_UNDEFINED) || !key || !*key ||
if (!mod_res || !ucmd_ctx || UTIL_STR_EMPTY(foreign_dev_id) || (ns == KV_NS_UNDEFINED) || UTIL_STR_EMPTY(key) ||
(key[0] == KV_PREFIX_KEY_SYS_C[0]))
return NULL;

Expand All @@ -2533,8 +2533,8 @@ const void *sid_ucmd_get_foreign_dev_mod_kv(sid_resource_t *mod_res,
{
const char *dom;

if (!mod_res || !ucmd_ctx || !foreign_dev_id || !*foreign_dev_id || !foreign_mod_name || !*foreign_mod_name ||
(ns == KV_NS_UNDEFINED) || !key || !*key || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
if (!mod_res || !ucmd_ctx || UTIL_STR_EMPTY(foreign_dev_id) || UTIL_STR_EMPTY(foreign_mod_name) ||
(ns == KV_NS_UNDEFINED) || UTIL_STR_EMPTY(key) || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
return NULL;

dom = ns == KV_NS_UDEV ? NULL : KV_KEY_DOM_USER;
Expand Down Expand Up @@ -2629,7 +2629,7 @@ int sid_ucmd_mod_reserve_kv(sid_resource_t *mod_res,
{
const char *dom;

if (!mod_res || !common || !key || !*key || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
if (!mod_res || !common || UTIL_STR_EMPTY(key) || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
return -EINVAL;

dom = ns == KV_NS_UDEV ? NULL : KV_KEY_DOM_USER;
Expand All @@ -2644,7 +2644,7 @@ int sid_ucmd_mod_unreserve_kv(sid_resource_t *mod_res,
{
const char *dom;

if (!mod_res || !common || !key || !*key || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
if (!mod_res || !common || UTIL_STR_EMPTY(key) || (key[0] == KV_PREFIX_KEY_SYS_C[0]))
return -EINVAL;

dom = ns == KV_NS_UDEV ? NULL : KV_KEY_DOM_USER;
Expand All @@ -2666,9 +2666,6 @@ static int _do_sid_ucmd_dev_set_ready(sid_resource_t *mod_res, struct sid_ucmd_c
{
dev_ready_t old_ready;

if (!ucmd_ctx)
return -EINVAL;

if (!(_cmd_scan_phase_regs[ucmd_ctx->scan.phase].flags & CMD_SCAN_CAP_RDY))
return -EPERM;

Expand Down Expand Up @@ -2723,7 +2720,7 @@ static int _do_sid_ucmd_dev_set_ready(sid_resource_t *mod_res, struct sid_ucmd_c

int sid_ucmd_dev_set_ready(sid_resource_t *mod_res, struct sid_ucmd_ctx *ucmd_ctx, dev_ready_t ready)
{
if (!mod_res)
if (!mod_res || !ucmd_ctx)
return -EINVAL;

return _do_sid_ucmd_dev_set_ready(mod_res, ucmd_ctx, ready);
Expand All @@ -2734,9 +2731,6 @@ static dev_ready_t _do_sid_ucmd_dev_get_ready(sid_resource_t *mod_res, struct si
const void *val;
dev_ready_t ready_arch;

if (!ucmd_ctx)
return DEV_RDY_UNDEFINED;

if (archive) {
if ((val = _do_sid_ucmd_get_kv(mod_res, ucmd_ctx, NULL, KV_NS_DEVICE, KV_KEY_DEV_READY, NULL, NULL, archive)))
memcpy(&ready_arch, val, sizeof(dev_ready_t));
Expand All @@ -2756,7 +2750,7 @@ static dev_ready_t _do_sid_ucmd_dev_get_ready(sid_resource_t *mod_res, struct si

dev_ready_t sid_ucmd_dev_get_ready(sid_resource_t *mod_res, struct sid_ucmd_ctx *ucmd_ctx, unsigned int archive)
{
if (!mod_res)
if (!mod_res || !ucmd_ctx)
return DEV_RDY_UNDEFINED;

return _do_sid_ucmd_dev_get_ready(mod_res, ucmd_ctx, archive);
Expand All @@ -2766,9 +2760,6 @@ static int _do_sid_ucmd_dev_set_reserved(sid_resource_t *mod_res, struct sid_ucm
{
dev_reserved_t old_reserved;

if (!ucmd_ctx)
return -EINVAL;

if (!(_cmd_scan_phase_regs[ucmd_ctx->scan.phase].flags & CMD_SCAN_CAP_RES))
return -EPERM;

Expand Down Expand Up @@ -2810,7 +2801,7 @@ static int _do_sid_ucmd_dev_set_reserved(sid_resource_t *mod_res, struct sid_ucm

int sid_ucmd_dev_set_reserved(sid_resource_t *mod_res, struct sid_ucmd_ctx *ucmd_ctx, dev_reserved_t reserved)
{
if (!mod_res)
if (!mod_res || !ucmd_ctx)
return -EINVAL;

return _do_sid_ucmd_dev_set_reserved(mod_res, ucmd_ctx, reserved);
Expand All @@ -2821,9 +2812,6 @@ static dev_reserved_t _do_sid_ucmd_dev_get_reserved(sid_resource_t *mod_res, str
const void *val;
dev_reserved_t reserved_arch;

if (!ucmd_ctx)
return DEV_RES_UNDEFINED;

if (archive) {
if ((val = _do_sid_ucmd_get_kv(mod_res, ucmd_ctx, NULL, KV_NS_DEVICE, KV_KEY_DEV_RESERVED, NULL, NULL, archive)))
memcpy(&reserved_arch, val, sizeof(dev_ready_t));
Expand All @@ -2843,7 +2831,7 @@ static dev_reserved_t _do_sid_ucmd_dev_get_reserved(sid_resource_t *mod_res, str

dev_reserved_t sid_ucmd_dev_get_reserved(sid_resource_t *mod_res, struct sid_ucmd_ctx *ucmd_ctx, unsigned int archive)
{
if (!mod_res)
if (!mod_res || !ucmd_ctx)
return DEV_RES_UNDEFINED;

return _do_sid_ucmd_dev_get_reserved(mod_res, ucmd_ctx, archive);
Expand Down Expand Up @@ -2919,15 +2907,15 @@ static int _handle_dev_for_group(sid_resource_t *mod_res,

int sid_ucmd_dev_add_alias(sid_resource_t *mod_res, struct sid_ucmd_ctx *ucmd_ctx, const char *alias_cat, const char *alias_id)
{
if (!mod_res || !ucmd_ctx || !alias_cat || !*alias_cat || !alias_id || !*alias_id)
if (!mod_res || !ucmd_ctx || UTIL_STR_EMPTY(alias_cat) || UTIL_STR_EMPTY(alias_id))
return -EINVAL;

return _handle_dev_for_group(mod_res, ucmd_ctx, NULL, KV_KEY_DOM_ALIAS, KV_NS_MODULE, alias_cat, alias_id, KV_OP_PLUS);
}

int sid_ucmd_dev_remove_alias(sid_resource_t *mod_res, struct sid_ucmd_ctx *ucmd_ctx, const char *alias_cat, const char *alias_id)
{
if (!mod_res || !ucmd_ctx || !alias_cat || !*alias_cat || !alias_id || !*alias_id)
if (!mod_res || !ucmd_ctx || UTIL_STR_EMPTY(alias_cat) || UTIL_STR_EMPTY(alias_id))
return -EINVAL;

return _handle_dev_for_group(mod_res, ucmd_ctx, NULL, KV_KEY_DOM_ALIAS, KV_NS_MODULE, alias_cat, alias_id, KV_OP_MINUS);
Expand Down Expand Up @@ -3004,7 +2992,7 @@ int sid_ucmd_group_create(sid_resource_t *mod_res,
const char *group_cat,
const char *group_id)
{
if (!mod_res || !ucmd_ctx || (group_ns == KV_NS_UNDEFINED) || !group_id || !*group_id)
if (!mod_res || !ucmd_ctx || (group_ns == KV_NS_UNDEFINED) || UTIL_STR_EMPTY(group_id))
return -EINVAL;

group_flags &= ~KV_ALIGN;
Expand All @@ -3018,7 +3006,7 @@ int sid_ucmd_group_add_current_dev(sid_resource_t *mod_res,
const char *group_cat,
const char *group_id)
{
if (!mod_res || !ucmd_ctx || (group_ns == KV_NS_UNDEFINED) || !group_cat || !*group_cat || !group_id || !*group_id)
if (!mod_res || !ucmd_ctx || (group_ns == KV_NS_UNDEFINED) || UTIL_STR_EMPTY(group_cat) || UTIL_STR_EMPTY(group_id))
return -EINVAL;

return _handle_dev_for_group(mod_res, ucmd_ctx, NULL, KV_KEY_DOM_GROUP, group_ns, group_cat, group_id, KV_OP_PLUS);
Expand All @@ -3030,7 +3018,7 @@ int sid_ucmd_group_remove_current_dev(sid_resource_t *mod_res,
const char *group_cat,
const char *group_id)
{
if (!mod_res || !ucmd_ctx || (group_ns == KV_NS_UNDEFINED) || !group_cat || !*group_cat || !group_id || !*group_id)
if (!mod_res || !ucmd_ctx || (group_ns == KV_NS_UNDEFINED) || UTIL_STR_EMPTY(group_cat) || UTIL_STR_EMPTY(group_id))
return -EINVAL;

return _handle_dev_for_group(mod_res, ucmd_ctx, NULL, KV_KEY_DOM_GROUP, group_ns, group_cat, group_id, KV_OP_MINUS);
Expand Down Expand Up @@ -3113,7 +3101,7 @@ int sid_ucmd_group_destroy(sid_resource_t *mod_res,
const char *group_id,
int force)
{
if (!mod_res || !ucmd_ctx || (group_ns == KV_NS_UNDEFINED) || !group_id || !*group_id)
if (!mod_res || !ucmd_ctx || (group_ns == KV_NS_UNDEFINED) || UTIL_STR_EMPTY(group_id))
return -EINVAL;

return _do_sid_ucmd_group_destroy(mod_res, ucmd_ctx, KV_KEY_DOM_GROUP, group_ns, group_cat, group_id, force);
Expand Down Expand Up @@ -3702,7 +3690,7 @@ const void *sid_ucmd_part_get_disk_kv(sid_resource_t *mod_res,
.id = ID_NULL,
.core = key_core};

if (!mod_res || !ucmd_ctx || !key_core || !*key_core || (key_core[0] == KV_PREFIX_KEY_SYS_C[0]))
if (!mod_res || !ucmd_ctx || UTIL_STR_EMPTY(key_core) || (key_core[0] == KV_PREFIX_KEY_SYS_C[0]))
return NULL;

if (_part_get_whole_disk(mod_res, ucmd_ctx, devno_buf, sizeof(devno_buf)) < 0)
Expand Down

0 comments on commit 35f4965

Please sign in to comment.