Skip to contentSkip to conversation

staging: ion: WARN when the handle kmap_cnt is going to wrap around

PATCH RESEND New Mitchel Humpherys 1 participant 1 message May 23, 2014

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

PATCH RESEND 1/1 staging: ion: WARN when the handle kmap_cnt is going to wrap around

There are certain client bugs (double unmap, for example) that can cause the handle->kmap_cnt (an unsigned int) to wrap around from zero. This causes problems when the handle is destroyed because we have:

        while (handle->kmap_cnt)
                ion_handle_kmap_put(handle);

which takes a long time to complete when kmap_cnt starts at ~0 and can result in a watchdog timeout.

WARN and bail when kmap_cnt is about to wrap around from zero.

---
Resending since I missed a few folks on the original. Also retaining Colin's Acked-by.

---
 drivers/staging/android/ion/ion.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/staging/android/ion/ion.c +4 -0
index 3d5bf14722..f55f61a4cc 100644
@@ -626,6 +626,10 @@ static void ion_handle_kmap_put(struct ion_handle *handle)
 {
 	struct ion_buffer *buffer = handle->buffer;
 
+	if (!handle->kmap_cnt) {
+		WARN(1, "%s: Double unmap detected! bailing...\n", __func__);
+		return;
+	}
 	handle->kmap_cnt--;
 	if (!handle->kmap_cnt)
 		ion_buffer_kmap_put(buffer);
Signature · 8 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected].  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>