[PATCH 1/1] powerpc/pseries/dlpar: Fix a missing check in dlpar_parse_cc_property()

Tyler Hicks tyhicks at canonical.com
Mon Jul 15 19:53:39 UTC 2019


From: Gen Zhang <blackgod016574 at gmail.com>

In dlpar_parse_cc_property(), 'prop->name' is allocated by kstrdup().
kstrdup() may return NULL, so it should be checked and handle error.
And prop should be freed if 'prop->name' is NULL.

Signed-off-by: Gen Zhang <blackgod016574 at gmail.com>
Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>

CVE-2019-12614

(cherry picked from commit efa9ace68e487ddd29c2b4d6dd23242158f1f607)
Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
 arch/powerpc/platforms/pseries/dlpar.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 437a74173db2..ee4aa1dd34c9 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -58,6 +58,10 @@ static struct property *dlpar_parse_cc_property(struct cc_workarea *ccwa)
 
 	name = (char *)ccwa + be32_to_cpu(ccwa->name_offset);
 	prop->name = kstrdup(name, GFP_KERNEL);
+	if (!prop->name) {
+		dlpar_free_cc_property(prop);
+		return NULL;
+	}
 
 	prop->length = be32_to_cpu(ccwa->prop_length);
 	value = (char *)ccwa + be32_to_cpu(ccwa->prop_offset);
-- 
2.7.4




More information about the kernel-team mailing list