From: Jim Warner <james.warner@comcast.net>
Date: Wed, 19 Aug 2020 05:00:00 +0000 (-0500)
Subject: library: fix a flaw in one 'new' function, <diskstats>
X-Git-Tag: v4.0.0~315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81db6664c92ca54c5274b17666e2724527a22326;p=procps-ng

library: fix a flaw in one 'new' function, <diskstats>

At 'new' time, the major API modules each ensure their
'info' parameter isn't NULL but what it pointed to was
except this single straggler, for some unknown reason.

So, this patch brings him into line with those others.

[ And, without going into the ugly details, this was ]
[ the reason I never experienced an abend originally ]
[ but Craig did. And, though related to stacks mgmt, ]
[ zero initialization was not a factor. Anyway, with ]
[ this patch, everybody would have experienced abend ]
[ under the original (faulty) test_Itemtables logic! ]

Reference(s):
https://www.freelists.org/post/procps/keep-on-patchin,13

Signed-off-by: Jim Warner <james.warner@comcast.net>
---

diff --git a/proc/diskstats.c b/proc/diskstats.c
index 3f9ff7c4..0fb5d58b 100644
--- a/proc/diskstats.c
+++ b/proc/diskstats.c
@@ -733,7 +733,7 @@ PROCPS_EXPORT int procps_diskstats_new (
     if (failed) _Exit(EXIT_FAILURE);
 #endif
 
-    if (info == NULL)
+    if (info == NULL || *info != NULL)
         return -EINVAL;
     if (!(p = calloc(1, sizeof(struct diskstats_info))))
         return -ENOMEM;