-
-
Notifications
You must be signed in to change notification settings - Fork 185
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix FTL crashes in ARP table parsing #723
Merged
Merged
Conversation
This file contains 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
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
…ents. Signed-off-by: DL6ER <dl6er@dl6er.de>
…en leakage of more than 110 bytes) Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
…Skip otherwise. Signed-off-by: DL6ER <dl6er@dl6er.de>
…t is not our job to care about them if they are not doing any DNS queries. Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
PromoFaux
approved these changes
Apr 2, 2020
3 tasks
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.
By submitting this pull request, I confirm the following:
How familiar are you with the codebase?:
10
This PR fixes a bug in
release/v5.0
reported in #718.The underlying heap memory access violation occurred only when there are both, multiple addresses for the same devices in the ARP table, and only some of these addresses are already known to FTL (i.e., they sent DNS queries to the Pi-hole before).
If either all addresses of a device (or likely none) were already known to FTL because they made requests in the past, this bug doesn’t show up.
This is likely because users with IPv6 are much more likely to see this bug as there is a high likelihood that an interface has at least one address that has never been used to ask Pi-hole any questions. Multiple addresses on the same interface are rather seldom in the IPv4-world.
As a side-effect of my code review, I also found two small memory leaks which are now fixed. There is a small remaining leak in the system-provided function
gethostbyaddr()
but we cannot do anything about it. The worst seems to be leaking 110 bytes once during the first name resolution. This sounds perfectly acceptable.