security/hakurei
security/hakurei
6
3
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

internal/pipewire: do not clobber error parsing SCMs
All checks were successful
Test / Create distribution (push) Successful in 35s
Details
Test / Sandbox (push) Successful in 2m35s
Details
Test / Sandbox (race detector) (push) Successful in 4m43s
Details
Test / Hakurei (push) Successful in 4m50s
Details
Test / Hpkg (push) Successful in 4m54s
Details
Test / Hakurei (race detector) (push) Successful in 6m29s
Details
Test / Flake checks (push) Successful in 1m21s
Details

Browse Source 
The error is handled later, clobbering it here breaks error handling when SCMs are present.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-12-09 06:02:15 +09:00
parent be2075f169
commit 5ec4045e24
Signed by: cat
SSH Key Fingerprint: SHA256:wr6yH7sDDbUFi81k/GsIGwpM3O2QrwqYlLF26CcJa4w
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/pipewire/pipewire.go
View File

@ -271,16 +271,20 @@ func (ctx *Context) recvmsg(remaining []byte) (payload []byte, err error) {
n, oobn, recvflags, err = ctx.conn.Recvmsg(ctx.iovecBuf[len(remaining):], ctx.oobBuf[:], recvmsgFlags) n, oobn, recvflags, err = ctx.conn.Recvmsg(ctx.iovecBuf[len(remaining):], ctx.oobBuf[:], recvmsgFlags)
if oob := ctx.oobBuf[:oobn]; len(oob) > 0 { if oob := ctx.oobBuf[:oobn]; len(oob) > 0 {
var oobErr error
var scm []syscall.SocketControlMessage var scm []syscall.SocketControlMessage
if scm, err = syscall.ParseSocketControlMessage(oob); err != nil { if scm, oobErr = syscall.ParseSocketControlMessage(oob); oobErr != nil {
ctx.closeReceivedFiles() ctx.closeReceivedFiles()
err = oobErr
return return
} }
var fds []int var fds []int
for i := range scm { for i := range scm {
if fds, err = syscall.ParseUnixRights(&scm[i]); err != nil { if fds, oobErr = syscall.ParseUnixRights(&scm[i]); oobErr != nil {
ctx.closeReceivedFiles() ctx.closeReceivedFiles()
err = oobErr
return return
} }
ctx.receivedFiles = append(ctx.receivedFiles, fds...) ctx.receivedFiles = append(ctx.receivedFiles, fds...)