sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-12 16:39:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Address review findings on the VNC server, session auth and capture decoder

Browse Source
This commit is contained in:
Viktor Liu
2026-08-27 18:33:52 +02:00
parent 09e069a175
commit 47d8f912e5
18 changed files with 179 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vnc/server/capture_x11_shm_linux.go
+24 -10
View File
@@ -31,25 +31,27 @@ func (c *X11Capturer) initSHM() error {
return fmt.Errorf("shmat: %w", err)
}
if _, err := unix.SysvShmCtl(id, unix.IPC_RMID, nil); err != nil {
log.Debugf("shmctl IPC_RMID: %v", err)
}
seg, err := shm.NewSegId(c.conn)
if err != nil {
if detachErr := unix.SysvShmDetach(addr); detachErr != nil {
log.Debugf("shmdt on new-seg failure: %v", detachErr)
}
releaseShmSegment(id, addr)
return fmt.Errorf("new SHM seg: %w", err)
}
// The X server attaches before the segment is marked for deletion: since
// Linux 3.10 a shmat() against an IPC_RMID'd segment fails with EIDRM, so
// marking it first would push us onto the slow non-SHM path.
if err := shm.AttachChecked(c.conn, seg, uint32(id), false).Check(); err != nil {
if detachErr := unix.SysvShmDetach(addr); detachErr != nil {
log.Debugf("shmdt on attach-checked failure: %v", detachErr)
}
releaseShmSegment(id, addr)
return fmt.Errorf("SHM attach to X: %w", err)
}
// Both ends hold the segment at this point, so marking it for deletion
// frees it as soon as the last of them detaches, even if this process
// dies without cleaning up.
if _, err := unix.SysvShmCtl(id, unix.IPC_RMID, nil); err != nil {
log.Debugf("shmctl IPC_RMID: %v", err)
}
c.shmID = id
c.shmAddr = addr
c.shmSeg = uint32(seg)
@@ -57,6 +59,18 @@ func (c *X11Capturer) initSHM() error {
return nil
}
// releaseShmSegment gives a segment back on a setup path that failed after
// attaching it: detach this process, then mark it for deletion so it does not
// linger in the kernel's IPC table for the life of the host.
func releaseShmSegment(id int, addr []byte) {
if err := unix.SysvShmDetach(addr); err != nil {
log.Debugf("shmdt on setup failure: %v", err)
}
if _, err := unix.SysvShmCtl(id, unix.IPC_RMID, nil); err != nil {
log.Debugf("shmctl IPC_RMID on setup failure: %v", err)
}
}
func (c *X11Capturer) captureSHM() (*image.RGBA, error) {
if err := c.fillSHM(); err != nil {
return nil, err