drm: validate cursor body length and coalesce _drm frames to latest-wins (review 4.1, 4.8)

4.1: the DrmCursor consumer handed the wire body straight to the client, which
renders width*height*4 RGBA bytes. Reject a body shorter than that so a truncated
cursor cannot make the client read past the buffer. The hidden-cursor sentinel is
0x0 with an empty body, for which the bound is 0 and the check is a no-op.
4.8: the _drm socket is a FIFO, so a consumer that drains slower than we produce
(a 4K convert on a modest GPU) fell seconds behind stale frames. Drain the producer
channel without blocking each tick and forward only the newest frame; replaced
frames drop in place, closing the zero-copy OwnedFd and freeing the CPU-path pixel
buffer. Cursor updates stay in order and are never coalesced away.

src/ipc.rs

@@ -2123,7 +2123,7 @@ async fn handle_drm_conn(stream: Connection) -> ResultType<()> {
     // atomic load per frame; a genuinely idle stream tears down after MAX_STALLED and the consumer
     // reconnects to a fresh list anyway.
     let mut seen_gen = DRM_DISPLAY_GENERATION.load(Ordering::Acquire);
-    while let Some(msg) = frame_rx.recv().await {
+    while let Some(first) = frame_rx.recv().await {
         // Re-authorize per frame (review 3.3): root (0) is always allowed; any other peer must still
         // be the active-session uid. On a session change the outgoing --server no longer matches, so
         // we stop within one frame (~33ms) instead of streaming the new session's screen to it. Fail
@@ -2148,8 +2148,46 @@ async fn handle_drm_conn(stream: Connection) -> ResultType<()> {
                 conn.send_msg(&Data::DrmDisplaysChanged(fresh), None).await?;
             }
         }
-        match msg {
+        // Coalesce to latest-wins at the source (review 4.8). The `_drm` socket is a FIFO, so a
-            DrmProducerMsg::Frame { mut desc, fd } => {
+        // consumer that drains slower than we produce (a 4K convert on a modest GPU) would fall
+        // seconds behind stale frames. Drain everything already queued without blocking and forward
+        // only the NEWEST frame; each replaced frame drops here, closing its OwnedFd (zero-copy path)
+        // and freeing its pixel buffer (CPU path). Cursor updates are latency-insensitive state
+        // (latest-wins by id downstream), so they are forwarded in order and never coalesced away.
+        let mut latest_frame: Option<DrmProducerMsg> = None;
+        let mut msg = Some(first);
+        while let Some(m) = msg.take() {
+            match m {
+                f @ (DrmProducerMsg::Frame { .. } | DrmProducerMsg::FrameCpu { .. }) => {
+                    latest_frame = Some(f);
+                }
+                DrmProducerMsg::Cursor {
+                    id,
+                    width,
+                    height,
+                    hotx,
+                    hoty,
+                    colors,
+                } => {
+                    conn.send_msg(
+                        &Data::DrmCursor {
+                            id,
+                            width,
+                            height,
+                            hotx,
+                            hoty,
+                        },
+                        None,
+                    )
+                    .await?;
+                    conn.send_raw(Bytes::from(colors)).await?;
+                }
+                DrmProducerMsg::Displays(_) => {}
+            }
+            msg = frame_rx.try_recv().ok();
+        }
+        match latest_frame {
+            Some(DrmProducerMsg::Frame { mut desc, fd }) => {
                 // The worker always supplies a real fd; the ledger decides whether to attach it.
                 let send_fd = fd.is_some() && ledger.should_send_fd(&desc);
                 desc.has_fd = send_fd;
@@ -2158,37 +2196,16 @@ async fn handle_drm_conn(stream: Connection) -> ResultType<()> {
                 // `fd` (OwnedFd) is closed here whether or not it was attached (the cmsg dup'd it into
                 // the peer). Closing immediately bounds our fd usage to ~1 in flight per frame.
             }
-            DrmProducerMsg::FrameCpu {
+            Some(DrmProducerMsg::FrameCpu {
                 width,
                 height,
                 data,
-            } => {
+            }) => {
                 // CPU-mapped fallback: pixels cross the wire, exactly like the pre-split protocol.
                 conn.send_msg(&Data::DrmFrame { width, height }, None).await?;
                 conn.send_raw(data).await?;
             }
-            DrmProducerMsg::Cursor {
+            _ => {}
-                id,
-                width,
-                height,
-                hotx,
-                hoty,
-                colors,
-            } => {
-                conn.send_msg(
-                    &Data::DrmCursor {
-                        id,
-                        width,
-                        height,
-                        hotx,
-                        hoty,
-                    },
-                    None,
-                )
-                .await?;
-                conn.send_raw(Bytes::from(colors)).await?;
-            }
-            DrmProducerMsg::Displays(_) => {}
         }
     }
     Ok(())

src/server/drm_capturer.rs

@@ -375,20 +375,37 @@ async fn recv_thread(
                 height,
                 hotx,
                 hoty,
-            } => match conn.next_raw().await {
+            } => {
-                Ok(raw) => set_drm_cursor(
+                // get_cursor_data() hands `colors` straight to the client, which renders
-                    display,
+                // width*height*4 RGBA bytes. Require the body to carry at least that many so a short
-                    DrmCursorData {
+                // body cannot make the client read past the buffer. A hidden-cursor sentinel arrives
-                        id,
+                // as 0x0 with an empty body, for which `need` is 0 and this check is a no-op.
-                        width: width as i32,
+                let need = (width as usize)
-                        height: height as i32,
+                    .saturating_mul(height as usize)
-                        hotx,
+                    .saturating_mul(4);
-                        hoty,
+                match conn.next_raw().await {
-                        colors: raw.to_vec(),
+                    Ok(raw) => {
-                    },
+                        if raw.len() < need {
-                ),
+                            break format!(
-                Err(err) => break format!("cursor body: {err}"),
+                                "cursor body {} bytes < {need} for {width}x{height}",
-            },
+                                raw.len()
+                            );
+                        }
+                        set_drm_cursor(
+                            display,
+                            DrmCursorData {
+                                id,
+                                width: width as i32,
+                                height: height as i32,
+                                hotx,
+                                hoty,
+                                colors: raw.to_vec(),
+                            },
+                        );
+                    }
+                    Err(err) => break format!("cursor body: {err}"),
+                }
+            }
             // Live hotplug: the service pushed a fresh display list after a connector-topology change.
             // Swap it into the sticky positive availability cache directly (no re-probe over `_drm`, so
             // this never trips the wayland::clear() re-probe restart loop). A subsequent