Bug 1865121 [Linux] Restrict dmabuf surface plane count r=emilio

stransky · stransky · commit 835b4b8a8c3d · 2024-01-03T17:04:16.000Z
- Don't release dmabuf with incorrect plane count - Don't save incorrect plane count to dmabuf surface Differential Revision: https://phabricator.services.mozilla.com/D194041
diff --git a/widget/gtk/DMABufSurface.cpp b/widget/gtk/DMABufSurface.cpp
@@ -471,8 +471,9 @@ bool DMABufSurfaceRGBA::Create(int aWidth, int aHeight,
   if (mBufferModifiers[0] != DRM_FORMAT_MOD_INVALID) {
     mBufferPlaneCount = GbmLib::GetPlaneCount(mGbmBufferObject[0]);
     if (mBufferPlaneCount > DMABUF_BUFFER_PLANES) {
-      LOGDMABUF(("    There's too many dmabuf planes!"));
-      ReleaseSurface();
+      LOGDMABUF(
+          ("    There's too many dmabuf planes! (%d)", mBufferPlaneCount));
+      mBufferPlaneCount = DMABUF_BUFFER_PLANES;
       return false;
     }
 
@@ -510,6 +511,7 @@ bool DMABufSurfaceRGBA::Create(mozilla::gl::GLContext* aGLContext,
   }
   if (mBufferPlaneCount > DMABUF_BUFFER_PLANES) {
     LOGDMABUF(("  wrong plane count %d, quit\n", mBufferPlaneCount));
+    mBufferPlaneCount = DMABUF_BUFFER_PLANES;
     return false;
   }
   if (!egl->fExportDMABUFImage(mEGLImage, mDmabufFds, mStrides, mOffsets)) {

Original file line number	Diff line number	Diff line change
`@@ -471,8 +471,9 @@ bool DMABufSurfaceRGBA::Create(int aWidth, int aHeight,`
`471`	`471`	`if (mBufferModifiers[0] != DRM_FORMAT_MOD_INVALID) {`
`472`	`472`	`mBufferPlaneCount = GbmLib::GetPlaneCount(mGbmBufferObject[0]);`
`473`	`473`	`if (mBufferPlaneCount > DMABUF_BUFFER_PLANES) {`
`474`		`- LOGDMABUF((" There's too many dmabuf planes!"));`
`475`		`- ReleaseSurface();`
	`474`	`+ LOGDMABUF(`
	`475`	`+ (" There's too many dmabuf planes! (%d)", mBufferPlaneCount));`
	`476`	`+ mBufferPlaneCount = DMABUF_BUFFER_PLANES;`
`476`	`477`	`return false;`
`477`	`478`	`}`
`478`	`479`
`@@ -510,6 +511,7 @@ bool DMABufSurfaceRGBA::Create(mozilla::gl::GLContext* aGLContext,`
`510`	`511`	`}`
`511`	`512`	`if (mBufferPlaneCount > DMABUF_BUFFER_PLANES) {`
`512`	`513`	`LOGDMABUF((" wrong plane count %d, quit\n", mBufferPlaneCount));`
	`514`	`+ mBufferPlaneCount = DMABUF_BUFFER_PLANES;`
`513`	`515`	`return false;`
`514`	`516`	`}`
`515`	`517`	`if (!egl->fExportDMABUFImage(mEGLImage, mDmabufFds, mStrides, mOffsets)) {`