Skip to contentSkip to conversation

drm/selftests/test-drm_dp_mst_helper: Fix memory leak in sideband_msg_req_encode_decode

PATCH Applied José Expósito 2 participants 2 messages Jan 8, 2022 – Jan 19, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drm/selftests/test-drm_dp_mst_helper: Fix memory leak in sideband_msg_req_encode_decode

Avoid leaking the "out" variable if it is not possible to allocate the "txmsg" variable.

Fixes 09234b88ef55 ("drm/selftests/test-drm_dp_mst_helper: Move 'sideband_msg_req_encode_decode' onto the heap")

Addresses-Coverity-ID: 1475685 ("Resource leak")

---

v2: Improve commit message

---
 drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c +3 -1
index 6b4759ed6bfd..c491429f1a02 100644
@@ -131,8 +131,10 @@ sideband_msg_req_encode_decode(struct drm_dp_sideband_msg_req_body *in)
 		return false;
 
 	txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
-	if (!txmsg)
+	if (!txmsg) {
+		kfree(out);
 		return false;
+	}
 
 	drm_dp_encode_sideband_req(in, txmsg);
 	ret = drm_dp_decode_sideband_req(txmsg, out);
Signature · 1 line
2.25.1
#1 lore raw
Quoted 10 lines · José Expósito

Avoid leaking the "out" variable if it is not possible to allocate the "txmsg" variable.

Fixes 09234b88ef55 ("drm/selftests/test-drm_dp_mst_helper: Move 'sideband_msg_req_encode_decode' onto the heap")

Addresses-Coverity-ID: 1475685 ("Resource leak")

---

v2: Improve commit message

Applied to drm-misc-next, thanks.
-Daniel

Quoted 23 lines
---
 drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c +3 -1
index 6b4759ed6bfd..c491429f1a02 100644
@@ -131,8 +131,10 @@ sideband_msg_req_encode_decode(struct drm_dp_sideband_msg_req_body *in)
 		return false;
 
 	txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
-	if (!txmsg)
+	if (!txmsg) {
+		kfree(out);
 		return false;
+	}
 
 	drm_dp_encode_sideband_req(in, txmsg);
 	ret = drm_dp_decode_sideband_req(txmsg, out);
Signature · 1 line
2.25.1
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch