inotify: fix panic on Remove() #650
Merged
+43
−14
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It would do:
events := read_events_from_kernel()
for _, e := range events {
watch := read_our_state(e)
do_stuff_with(watch)
}
However, between read_events_from_kernel() and read_our_state() the
internal state could have been removed with Watcher.Remove() in another
goroutine, so it would return nil.
In many cases it already did "if watch != nil && [..]" to deal with
this, but not everywhere. Do an "early continue" instead.
Fixes #616
---
Ideally what it should do is block any Remove() for all of the above
code, so it always operates on a consistent state. But that's not so
easy to do in a quick fix, and I don't really have the time to spend on
this at the moment (and it seems no one else has either).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It would do:
However, between read_events_from_kernel() and read_our_state() the internal state could have been removed with Watcher.Remove() in another goroutine, so it would return nil.
In many cases it already did "if watch != nil && [..]" to deal with this, but not everywhere. Do an "early continue" instead.
Fixes #616
Ideally what it should do is block any Remove() for all of the above code, so it always operates on a consistent state. But that's not so easy to do in a quick fix, and I don't really have the time to spend on this at the moment (and it seems no one else has either).