Put some BugTracebacks in Systrap.

konstantin-s-bogom · gvisor-bot · commit 7048e11fa6c3 · 2025-08-06T13:22:55.000-07:00
PiperOrigin-RevId: 791816679
diff --git a/pkg/sentry/platform/systrap/subprocess.go b/pkg/sentry/platform/systrap/subprocess.go
@@ -228,7 +228,7 @@ func handlePtraceSyscallRequestError(req any, format string, values ...any) {
 	case requestStub:
 		req.(requestStub).done <- nil
 	}
-	log.Warningf("handlePtraceSyscallRequest failed: "+format, values...)
+	log.BugTracebackf("handlePtraceSyscallRequest failed: "+format, values...)
 }
 
 // handlePtraceSyscallRequest executes system calls that can't be run via
@@ -846,7 +846,9 @@ func (s *subprocess) switchToApp(c *platformContext, ac *arch.Context64) (isSysc
 	threadID := ctx.threadID()
 	if threadID != invalidThreadID {
 		if sysThread, ok := s.sysmsgThreads[threadID]; ok && sysThread.msg.Err != 0 {
-			return false, false, hostarch.NoAccess, sysThread.msg.ConvertSysmsgErr()
+			sysmsgErr := sysThread.msg.ConvertSysmsgErr()
+			log.BugTraceback(sysmsgErr)
+			return false, false, hostarch.NoAccess, sysmsgErr
 		}
 		return false, false, hostarch.NoAccess, corruptedSharedMemoryErr(fmt.Sprintf("found unexpected ThreadContext.ThreadID field, expected %d found %d", invalidThreadID, threadID))
 	}

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ func handlePtraceSyscallRequestError(req any, format string, values ...any) {`
`228`	`228`	`case requestStub:`
`229`	`229`	`req.(requestStub).done <- nil`
`230`	`230`	`}`
`231`		`- log.Warningf("handlePtraceSyscallRequest failed: "+format, values...)`
	`231`	`+ log.BugTracebackf("handlePtraceSyscallRequest failed: "+format, values...)`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`// handlePtraceSyscallRequest executes system calls that can't be run via`
`@@ -846,7 +846,9 @@ func (s subprocess) switchToApp(c platformContext, ac *arch.Context64) (isSysc`
`846`	`846`	`threadID := ctx.threadID()`
`847`	`847`	`if threadID != invalidThreadID {`
`848`	`848`	`if sysThread, ok := s.sysmsgThreads[threadID]; ok && sysThread.msg.Err != 0 {`
`849`		`- return false, false, hostarch.NoAccess, sysThread.msg.ConvertSysmsgErr()`
	`849`	`+ sysmsgErr := sysThread.msg.ConvertSysmsgErr()`
	`850`	`+ log.BugTraceback(sysmsgErr)`
	`851`	`+ return false, false, hostarch.NoAccess, sysmsgErr`
`850`	`852`	`}`
`851`	`853`	`return false, false, hostarch.NoAccess, corruptedSharedMemoryErr(fmt.Sprintf("found unexpected ThreadContext.ThreadID field, expected %d found %d", invalidThreadID, threadID))`
`852`	`854`	`}`