ad0044fec8 previously disabled it due to
seccomp crashes. This was caused by `golang.org/x/sys`'s
`unix.EpollWait` function using the `epoll_wait` syscall instead of the
`epoll_pwait` syscall. bionic libc implements the `epoll_wait` C wrapper
function in terms of the `epoll_pwait` syscall, so this never affected C
code.
`golang.org/x/sys` switched to the `epoll_pwait` syscall in 2016, but
only for arm64. As of v0.47.0, it now uses `epoll_pwait` for all
architectures.
Upstream bug: https://github.com/golang/go/issues/80080
Upstream fix: https://go-review.googlesource.com/c/sys/+/792700
Upstream arm64 fix from 2016:
https://go-review.googlesource.com/c/sys/+/21971
---
With this change, Syncthing no longer crashes when inotify is allowed
and enabled in the Android emulator when run inside an app context. (The
seccomp policies do not affect execution under `adb shell`.)
This is the crash that occurs if inotify is enabled without the v0.47.0
update:
```
2026-07-08 10:59:36.711202 -0400 F/DEBUG (16538): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
2026-07-08 10:59:36.711219 -0400 F/DEBUG (16538): Build fingerprint: 'google/sdk_gphone16k_x86_64/emu64xa16k:17/CE2A.260420.019/15611780:userdebug/dev-keys'
2026-07-08 10:59:36.711224 -0400 F/DEBUG (16538): Kernel Release: '6.12.58-android16-6-gccafb60de224-ab14828483'
2026-07-08 10:59:36.711226 -0400 F/DEBUG (16538): Revision: '0'
2026-07-08 10:59:36.711228 -0400 F/DEBUG (16538): ABI: 'x86_64'
2026-07-08 10:59:36.711230 -0400 F/DEBUG (16538): Timestamp: 2026-07-08 10:59:36.617348693-0400
2026-07-08 10:59:36.711232 -0400 F/DEBUG (16538): Process uptime: 2s
2026-07-08 10:59:36.711234 -0400 F/DEBUG (16538): Page size: 16384 bytes
2026-07-08 10:59:36.711236 -0400 F/DEBUG (16538): Executable: /system/bin/app_process64
2026-07-08 10:59:36.711239 -0400 F/DEBUG (16538): Cmdline: com.chiller3.basicsync.debug
2026-07-08 10:59:36.711241 -0400 F/DEBUG (16538): pid: 16502, ppid: 436, tid: 16531, name: Thread-6 >>> com.chiller3.basicsync.debug <<<
2026-07-08 10:59:36.711243 -0400 F/DEBUG (16538): uid: 10231
2026-07-08 10:59:36.711886 -0400 F/DEBUG (16538): signal 31 (SIGSYS), code 1 (SYS_SECCOMP), fault addr --------
2026-07-08 10:59:36.711899 -0400 F/DEBUG (16538): Cause: seccomp prevented call to disallowed x86_64 system call 232
2026-07-08 10:59:36.711908 -0400 F/DEBUG (16538): rax 00000000000000e8 rbx 0000000000000078 rcx 00007372d956826e rdx 0000000000000001
2026-07-08 10:59:36.711912 -0400 F/DEBUG (16538): r8 0000000000000000 r9 0000000000000000 r10 ffffffffffffffff r11 0000000000000206
2026-07-08 10:59:36.712123 -0400 F/DEBUG (16538): r12 0000737291cc5d00 r13 000025897adcad20 r14 000025897abc7c20 r15 ffffffffffffffff
2026-07-08 10:59:36.712134 -0400 F/DEBUG (16538): rdi 0000000000000078 rsi 000025897af9ef7c
2026-07-08 10:59:36.712137 -0400 F/DEBUG (16538): rbp 000025897af9ee28 rsp 000025897af9ede8 rip 00007372d956826e err 0000000000000000
2026-07-08 10:59:36.712139 -0400 F/DEBUG (16538): 1 total frames
2026-07-08 10:59:36.712141 -0400 F/DEBUG (16538): backtrace:
2026-07-08 10:59:36.712145 -0400 F/DEBUG (16538): #00 pc 0000000000d2826e /data/app/~~s99umF1bl81-VDLSDwy30g==/com.chiller3.basicsync.debug-5Lq8YsTwbMz_SXt-F_uHaQ==/base.apk (offset 0x2e4c000)
2026-07-08 10:59:36.712431 -0400 F/DEBUG (16538): Note: To display stack pointer information, use the pbtombstone tool:
2026-07-08 10:59:36.712443 -0400 F/DEBUG (16538): pbtombstone --display-sp tombstone_XX.pb
```
Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>
132 lines
3.4 KiB
Go
132 lines
3.4 KiB
Go
// Copyright (C) 2016 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
//go:build !(solaris && !cgo) && !(darwin && !cgo) && !(darwin && kqueue)
|
|
// +build !solaris cgo
|
|
// +build !darwin cgo
|
|
// +build !darwin !kqueue
|
|
|
|
package fs
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"unicode/utf8"
|
|
|
|
"github.com/syncthing/notify"
|
|
)
|
|
|
|
// Notify does not block on sending to channel, so the channel must be buffered.
|
|
// The actual number is magic.
|
|
// Not meant to be changed, but must be changeable for tests
|
|
var backendBuffer = 500
|
|
|
|
func (f *BasicFilesystem) Watch(name string, ignore Matcher, ctx context.Context, ignorePerms bool) (<-chan Event, <-chan error, error) {
|
|
watchPath, roots, err := f.watchPaths(name)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
outChan := make(chan Event)
|
|
backendChan := make(chan notify.EventInfo, backendBuffer)
|
|
|
|
eventMask := subEventMask
|
|
if !ignorePerms {
|
|
eventMask |= permEventMask
|
|
}
|
|
|
|
absShouldIgnore := func(absPath string) bool {
|
|
if !utf8.ValidString(absPath) {
|
|
return true
|
|
}
|
|
|
|
rel, err := f.unrootedChecked(absPath, roots)
|
|
if err != nil {
|
|
return true
|
|
}
|
|
return ignore.Match(rel).CanSkipDir()
|
|
}
|
|
err = notify.WatchWithFilter(watchPath, backendChan, absShouldIgnore, eventMask)
|
|
if err != nil {
|
|
notify.Stop(backendChan)
|
|
if reachedMaxUserWatches(err) {
|
|
err = errors.New("failed to set up inotify handler. Please increase inotify limits, see https://docs.syncthing.net/users/faq.html#inotify-limits")
|
|
}
|
|
return nil, nil, err
|
|
}
|
|
|
|
errChan := make(chan error)
|
|
go f.watchLoop(ctx, name, roots, backendChan, outChan, errChan, ignore)
|
|
|
|
return outChan, errChan, nil
|
|
}
|
|
|
|
func (f *BasicFilesystem) watchLoop(ctx context.Context, name string, roots []string, backendChan chan notify.EventInfo, outChan chan<- Event, errChan chan<- error, ignore Matcher) {
|
|
for {
|
|
// Detect channel overflow
|
|
if len(backendChan) == backendBuffer {
|
|
outer:
|
|
for {
|
|
select {
|
|
case <-backendChan:
|
|
default:
|
|
break outer
|
|
}
|
|
}
|
|
// When next scheduling a scan, do it on the entire folder as events have been lost.
|
|
outChan <- Event{Name: name, Type: NonRemove}
|
|
l.Debugln(f.Type(), f.URI(), "Watch: Event overflow, send \".\"")
|
|
}
|
|
|
|
select {
|
|
case ev := <-backendChan:
|
|
evPath := ev.Path()
|
|
|
|
if !utf8.ValidString(evPath) {
|
|
l.Debugln(f.Type(), f.URI(), "Watch: Ignoring invalid UTF-8")
|
|
continue
|
|
}
|
|
|
|
relPath, err := f.unrootedChecked(evPath, roots)
|
|
if err != nil {
|
|
select {
|
|
case errChan <- err:
|
|
l.Debugln(f.Type(), f.URI(), "Watch: Sending error", err)
|
|
case <-ctx.Done():
|
|
}
|
|
notify.Stop(backendChan)
|
|
l.Debugln(f.Type(), f.URI(), "Watch: Stopped due to", err)
|
|
return
|
|
}
|
|
|
|
if ignore.Match(relPath).IsIgnored() {
|
|
l.Debugln(f.Type(), f.URI(), "Watch: Ignoring", relPath)
|
|
continue
|
|
}
|
|
evType := f.eventType(ev.Event())
|
|
select {
|
|
case outChan <- Event{Name: relPath, Type: evType}:
|
|
l.Debugln(f.Type(), f.URI(), "Watch: Sending", relPath, evType)
|
|
case <-ctx.Done():
|
|
notify.Stop(backendChan)
|
|
l.Debugln(f.Type(), f.URI(), "Watch: Stopped")
|
|
return
|
|
}
|
|
case <-ctx.Done():
|
|
notify.Stop(backendChan)
|
|
l.Debugln(f.Type(), f.URI(), "Watch: Stopped")
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
func (*BasicFilesystem) eventType(notifyType notify.Event) EventType {
|
|
if notifyType&rmEventMask != 0 {
|
|
return Remove
|
|
}
|
|
return NonRemove
|
|
}
|