-
-
Notifications
You must be signed in to change notification settings - Fork 196
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 possible crash with high client activity #1777
Conversation
Signed-off-by: DL6ER <dl6er@dl6er.de>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The race would be that counters->clients
could be increased while the counter for clientID
is still running?
We declare an object of size FTL/src/database/network-table.c Lines 1288 to 1291 in 1a11413
and later on use it in a loop that is running from |
Unfortunately, we never got feedback from the affected users. As they were target active before we suggested this bugfix, I can only assume it fixed the issue for them. Anyway, it's a meaningful change and we can use it to push a v5.x FTL patch release. |
Mhh...
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-ftl-v5-24-and-core-v5-17-3-released/67486/1 |
…c4 by renovate (#17027) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [pihole/pihole](https://github.com/pi-hole/docker-pi-hole) | major | `2023.11.0` -> `2024.01.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>pi-hole/docker-pi-hole (pihole/pihole)</summary> ### [`v2024.01.0`](https://github.com/pi-hole/docker-pi-hole/releases/tag/2024.01.0) [Compare Source](https://github.com/pi-hole/docker-pi-hole/compare/2023.11.0...2024.01.0) Nothing docker specific this time around. <!-- Release notes generated using configuration in .github/release.yml at development --> #### What's Changed (FTL v5.24) - Update dependabot.yml by [@​PromoFaux](https://github.com/PromoFaux) in [https://github.com/pi-hole/FTL/pull/1587](https://github.com/pi-hole/FTL/pull/1587) - Add pihole-FTL sqlite3 -ni by [@​DL6ER](https://github.com/DL6ER) in [https://github.com/pi-hole/FTL/pull/1820](https://github.com/pi-hole/FTL/pull/1820) - Fix possible crash with high client activity by [@​DL6ER](https://github.com/DL6ER) in [https://github.com/pi-hole/FTL/pull/1777](https://github.com/pi-hole/FTL/pull/1777) - Implement special domains whitelisting by [@​DL6ER](https://github.com/DL6ER) in [https://github.com/pi-hole/FTL/pull/1808](https://github.com/pi-hole/FTL/pull/1808) **Full Changelog**: pi-hole/FTL@v5.23...v5.24 <!-- Release notes generated using configuration in .github/release.yml at development --> #### What's Changed (Core v5.17.3) - Add "-ni" to all sqlite3 invocations (v5) by [@​DL6ER](https://github.com/DL6ER) in [https://github.com/pi-hole/pi-hole/pull/5519](https://github.com/pi-hole/pi-hole/pull/5519) **Full Changelog**: pi-hole/pi-hole@v5.17.2...v5.17.3 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone Europe/Amsterdam, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMjYuMiIsInVwZGF0ZWRJblZlciI6IjM3LjEyNi4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=--> Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl> Co-authored-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
…c4 by renovate (truecharts#17027) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [pihole/pihole](https://github.com/pi-hole/docker-pi-hole) | major | `2023.11.0` -> `2024.01.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>pi-hole/docker-pi-hole (pihole/pihole)</summary> ### [`v2024.01.0`](https://github.com/pi-hole/docker-pi-hole/releases/tag/2024.01.0) [Compare Source](https://github.com/pi-hole/docker-pi-hole/compare/2023.11.0...2024.01.0) Nothing docker specific this time around. <!-- Release notes generated using configuration in .github/release.yml at development --> #### What's Changed (FTL v5.24) - Update dependabot.yml by [@&truecharts#8203;PromoFaux](https://github.com/PromoFaux) in [https://github.com/pi-hole/FTL/pull/1587](https://github.com/pi-hole/FTL/pull/1587) - Add pihole-FTL sqlite3 -ni by [@&truecharts#8203;DL6ER](https://github.com/DL6ER) in [https://github.com/pi-hole/FTL/pull/1820](https://github.com/pi-hole/FTL/pull/1820) - Fix possible crash with high client activity by [@&truecharts#8203;DL6ER](https://github.com/DL6ER) in [https://github.com/pi-hole/FTL/pull/1777](https://github.com/pi-hole/FTL/pull/1777) - Implement special domains whitelisting by [@&truecharts#8203;DL6ER](https://github.com/DL6ER) in [https://github.com/pi-hole/FTL/pull/1808](https://github.com/pi-hole/FTL/pull/1808) **Full Changelog**: pi-hole/FTL@v5.23...v5.24 <!-- Release notes generated using configuration in .github/release.yml at development --> #### What's Changed (Core v5.17.3) - Add "-ni" to all sqlite3 invocations (v5) by [@&truecharts#8203;DL6ER](https://github.com/DL6ER) in [https://github.com/pi-hole/pi-hole/pull/5519](https://github.com/pi-hole/pi-hole/pull/5519) **Full Changelog**: pi-hole/pi-hole@v5.17.2...v5.17.3 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone Europe/Amsterdam, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMjYuMiIsInVwZGF0ZWRJblZlciI6IjM3LjEyNi4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=--> Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl> Co-authored-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
What does this implement/fix?
Fix possible race-collision leading to a theoretical out-of-bounds read
Related issue or feature (if applicable): N/A
Pull request in docs with documentation (if applicable): N/A
By submitting this pull request, I confirm the following:
git rebase
)Checklist:
developmental
branch.