ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: Use not malloc'ed but fixed size string for host NQN

Browse Source 
Maximum size of NQN is already defined to be SPDK_NVMF_NQN_MAX_LEN,
and hence use fixed size string whose size is SPDK_NVMF_NQN_MAX_LEN
+ 1 for spdk_nvmf_vhost::nqn.

This change will reduce the potential malloc failure.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I2b9c7cc21200b3e88b5485ebfdcd5040bc6e3589
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459742
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-06-28 17:28:24 +09:00 committed by Changpeng Liu
parent dae8e89253
commit 12d6dce2aa
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nvmf/nvmf_internal.h
View File

@ -90,7 +90,7 @@ struct spdk_nvmf_tgt {
};
struct spdk_nvmf_host {
char *nqn;
char nqn[SPDK_NVMF_NQN_MAX_LEN + 1];
TAILQ_ENTRY(spdk_nvmf_host) link;
};

8
lib/nvmf/subsystem.c
View File

@ -308,7 +308,6 @@ static void
_spdk_nvmf_subsystem_remove_host(struct spdk_nvmf_subsystem *subsystem, struct spdk_nvmf_host *host)
{
TAILQ_REMOVE(&subsystem->hosts, host, link);
free(host->nqn);
free(host);
}
@ -648,11 +647,8 @@ spdk_nvmf_subsystem_add_host(struct spdk_nvmf_subsystem *subsystem, const char *
if (!host) {
return -ENOMEM;
}
host->nqn = strdup(hostnqn);
if (!host->nqn) {
free(host);
return -ENOMEM;
}
snprintf(host->nqn, sizeof(host->nqn), "%s", hostnqn);
TAILQ_INSERT_HEAD(&subsystem->hosts, host, link);
subsystem->tgt->discovery_genctr++;