diff options
| author |   Johannes Thumshirn <jthumshirn@suse.de> | 2018-01-25 09:09:25 +0100 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2018-01-25 18:41:39 +0100 |
| commit | 6e49412016f5f28ae36c3eaa5a36ec787b788951 (patch) | |
| tree | 91644918bd8b60f549d46231469a53335f49c1db /drivers/nvme | |
| parent | nvme-pci: Suspend queues after deleting them (diff) | |
| download | linux-dev-6e49412016f5f28ae36c3eaa5a36ec787b788951.tar.xz linux-dev-6e49412016f5f28ae36c3eaa5a36ec787b788951.zip | |
nvme: don't free uuid pointer before printing it
Commit df351ef73789 ("nvme-fabrics: fix memory leak when parsing host ID
option") fixed the leak of 'p' but in case uuid_parse() fails the memory
is freed before the error print that is using it.
Free it after printing eventual errors.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Fixes: df351ef73789 ("nvme-fabrics: fix memory leak when parsing host ID option")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/fabrics.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c index eb46967bb0d5..9cee72a80472 100644 --- a/drivers/nvme/host/fabrics.c +++ b/drivers/nvme/host/fabrics.c @@ -739,12 +739,13 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, goto out; } ret = uuid_parse(p, &hostid); - kfree(p); if (ret) { pr_err("Invalid hostid %s\n", p); ret = -EINVAL; + kfree(p); goto out; } + kfree(p); break; case NVMF_OPT_DUP_CONNECT: opts->duplicate_connect = true; |