]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
Merge pull request #275 from minwooim/v1.6/fix_memory_leak
authorKeith Busch <keith.busch@intel.com>
Thu, 18 Jan 2018 08:40:49 +0000 (01:40 -0700)
committerGitHub <noreply@github.com>
Thu, 18 Jan 2018 08:40:49 +0000 (01:40 -0700)
nvme-cli: fix memory leak in nvme.c

1  2 
nvme.c

diff --cc nvme.c
index 7b6ab45b1c096c39652abda4503d6243c94e2259,bf9b18d1ef1247f6bddfe89ea28b225fbcc595a1..2723cb6f77266fa1f8e9244e6200aeb87d187b1e
--- 1/nvme.c
--- 2/nvme.c
+++ b/nvme.c
@@@ -3766,15 -3675,12 +3791,17 @@@ static int passthru(int argc, char **ar
                }
        }
  
 -      if (cfg.metadata_len)
 +      if (cfg.metadata_len) {
                metadata = malloc(cfg.metadata_len);
 +              if (!metadata) {
 +                      fprintf(stderr, "can not allocate metadata payload\n");
 +                      return ENOMEM;
 +              }
 +      }
        if (cfg.data_len) {
                if (posix_memalign(&data, getpagesize(), cfg.data_len)) {
+                       if (metadata)
+                               free(metadata);
                        fprintf(stderr, "can not allocate data payload\n");
                        return ENOMEM;
                }