|
| 1 | +From 7d374a1869d3a84971d027a7f4233878c8f25a62 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Mateusz Grzonka <mateusz.grzonka@intel.com> |
| 3 | +Date: Tue, 27 Jul 2021 10:25:18 +0200 |
| 4 | +Subject: Fix memory leak after "mdadm --detail" |
| 5 | + |
| 6 | +Signed-off-by: Mateusz Grzonka <mateusz.grzonka@intel.com> |
| 7 | +Signed-off-by: Jes Sorensen <jsorensen@fb.com> |
| 8 | + |
| 9 | +Upstream Patch reference: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=7d374a1869d3a84971d027a7f4233878c8f25a62 |
| 10 | +--- |
| 11 | + Detail.c | 20 +++++++++----------- |
| 12 | + 1 file changed, 9 insertions(+), 11 deletions(-) |
| 13 | + |
| 14 | +diff --git a/Detail.c b/Detail.c |
| 15 | +index ad56344f..d3af0ab5 100644 |
| 16 | +--- a/Detail.c |
| 17 | ++++ b/Detail.c |
| 18 | +@@ -66,11 +66,11 @@ int Detail(char *dev, struct context *c) |
| 19 | + int spares = 0; |
| 20 | + struct stat stb; |
| 21 | + int failed = 0; |
| 22 | +- struct supertype *st; |
| 23 | ++ struct supertype *st = NULL; |
| 24 | + char *subarray = NULL; |
| 25 | + int max_disks = MD_SB_DISKS; /* just a default */ |
| 26 | + struct mdinfo *info = NULL; |
| 27 | +- struct mdinfo *sra; |
| 28 | ++ struct mdinfo *sra = NULL; |
| 29 | + struct mdinfo *subdev; |
| 30 | + char *member = NULL; |
| 31 | + char *container = NULL; |
| 32 | +@@ -93,8 +93,7 @@ int Detail(char *dev, struct context *c) |
| 33 | + if (!sra) { |
| 34 | + if (md_get_array_info(fd, &array)) { |
| 35 | + pr_err("%s does not appear to be an md device\n", dev); |
| 36 | +- close(fd); |
| 37 | +- return rv; |
| 38 | ++ goto out; |
| 39 | + } |
| 40 | + } |
| 41 | + external = (sra != NULL && sra->array.major_version == -1 && |
| 42 | +@@ -108,16 +107,13 @@ int Detail(char *dev, struct context *c) |
| 43 | + sra->devs == NULL) { |
| 44 | + pr_err("Array associated with md device %s does not exist.\n", |
| 45 | + dev); |
| 46 | +- close(fd); |
| 47 | +- sysfs_free(sra); |
| 48 | +- return rv; |
| 49 | ++ goto out; |
| 50 | + } |
| 51 | + array = sra->array; |
| 52 | + } else { |
| 53 | + pr_err("cannot get array detail for %s: %s\n", |
| 54 | + dev, strerror(errno)); |
| 55 | +- close(fd); |
| 56 | +- return rv; |
| 57 | ++ goto out; |
| 58 | + } |
| 59 | + } |
| 60 | + |
| 61 | +@@ -827,10 +823,12 @@ out: |
| 62 | + close(fd); |
| 63 | + free(subarray); |
| 64 | + free(avail); |
| 65 | +- for (d = 0; d < n_devices; d++) |
| 66 | +- free(devices[d]); |
| 67 | ++ if (devices) |
| 68 | ++ for (d = 0; d < n_devices; d++) |
| 69 | ++ free(devices[d]); |
| 70 | + free(devices); |
| 71 | + sysfs_free(sra); |
| 72 | ++ free(st); |
| 73 | + return rv; |
| 74 | + } |
| 75 | + |
| 76 | +-- |
| 77 | +cgit 1.2.3-korg |
| 78 | + |
0 commit comments