[Dnsmasq-discuss] DNSpooq v2.80 backport patch

[Simon Kelley]

Good spot. I've just posted version 3, which addresses this, and also
includes the changes to the Makefile, stupidly omitted from v2.


https://www.thekelleys.org.uk/dnsmasq/dnspooq-patches/2.80-dnspooq.patch.v3

Cheers,

Simon.


On 01/02/2021 22:25, WU, CHRIS wrote:
>> The patch does address all seven CVEs. Note that there's a second version of the patch, at
>> which 1) fixes a regression seen in 2.83 and 2) was created with the correct flags to patch, so the new file src/hash_questions.c is included.
>>
>> Cheers,
>> Simon.
> 
> Hi Simon. 
> 
> FYI, this newest patch won't compile for some of your users.  Version 2.80 of dnsmasq was still one where you could compile it without IPv6 support using "-DNO_IPV6".
> 
> When I applied the patch I got these errors:
> 
> forward.c: In function ‘lookup_frec’:
> forward.c:2414:29: error: ‘struct frec’ has no member named ‘rfd6’
>   if (family == AF_INET6 && f->rfd6 && f->rfd6->fd == fd)
>                              ^
> forward.c:2414:40: error: ‘struct frec’ has no member named ‘rfd6’
>   if (family == AF_INET6 && f->rfd6 && f->rfd6->fd == fd)
> 
> The issue is inside of struct frec.  Since I have IPv6 turned off the “#ifdef HAVE_IPV6” means rfd6 isn’t included in the struct.
> 
> struct frec {
>   struct frec_src {
>     union mysockaddr source;
>     struct all_addr dest;
>     unsigned int iface, log_id;
>     unsigned short orig_id;
>     int fd;
>     struct frec_src *next;
>   } frec_src;
>   struct server *sentto; /* NULL means free */
>   struct randfd *rfd4;
> #ifdef HAVE_IPV6
>   struct randfd *rfd6;
> #endif
> 
> 
>  
>