Skip to content
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

[23.05] dnsmasq: version 2.90 #14853

Merged
3 commits merged into from Mar 18, 2024
Merged

Commits on Mar 18, 2024

  1. dnsmasq: mark global ubus context as closed after fork

    If the dnsmasq process forks to handle TCP connections, it closes the ubus
    context. But instead of changing the daemon wide pointer to NULL, only the
    local variable was adjusted - and this portion of the code was even dropped
    (dead store) by some optimizing compilers.
    
    It makes more sense to change the daemon->ubus pointer because various
    functions are already checking it for NULL. It is also the behavior which
    ubus_destroy() implements.
    
    Fixes: d8b33da ("dnsmasq: add support for monitoring and modifying dns lookup results via ubus")
    Signed-off-by: Sven Eckelmann <sven@narfation.org>
    (cherry picked from commit 711dcb7)
    ecsv authored and hauke committed Mar 18, 2024
    Copy the full SHA
    af22a16 View commit details
    Browse the repository at this point in the history
  2. dnsmasq: version 2.90

    Bump to 2.90 to get upstream's fix for DNSSEC KeyTrap (CVE-2023-50387,
    CVE-2023-50868) among many other goodies and fixes (notably, upstream
    568fb024... fixes a UAF in cache_remove_uid that was routinely crashing
    dnsmasq in my deployment).
    
    Catch up our 200-ubus_dns.patch, too.
    
    Signed-off-by: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
    (cherry picked from commit 838a27f)
    nwf authored and hauke committed Mar 18, 2024
    Copy the full SHA
    875822f View commit details
    Browse the repository at this point in the history
  3. dnsmasq: reset PKG_RELEASE

    dnsmasq was recently updated to 2.90, but PKG_RELEASE was not reset to 1.
    
    Fixes: 838a27f ("dnsmasq: version 2.90")
    Signed-off-by: Robert Marko <robimarko@gmail.com>
    (cherry picked from commit 694e647)
    robimarko authored and hauke committed Mar 18, 2024
    Copy the full SHA
    853b638 View commit details
    Browse the repository at this point in the history