From a94149e404bc0a4ef02179e797b7209671ab82a8 Mon Sep 17 00:00:00 2001
From: David Sheets <sheets@alum.mit.edu>
Date: Mon, 12 Oct 2020 10:56:08 +0100
Subject: [PATCH] dnsforward/ipset: synchronize access to ipset cache

Resolves read/write and write/write races on the cache maps present since feature
introduction.
---
 dnsforward/ipset.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dnsforward/ipset.go b/dnsforward/ipset.go
index f0c49973..af3cfaba 100644
--- a/dnsforward/ipset.go
+++ b/dnsforward/ipset.go
@@ -3,6 +3,7 @@ package dnsforward
 import (
 	"net"
 	"strings"
+	"sync"
 
 	"github.com/AdguardTeam/AdGuardHome/util"
 	"github.com/AdguardTeam/golibs/log"
@@ -13,6 +14,8 @@ type ipsetCtx struct {
 	ipsetList   map[string][]string // domain -> []ipset_name
 	ipsetCache  map[[4]byte]bool    // cache for IP[] to prevent duplicate calls to ipset program
 	ipset6Cache map[[16]byte]bool   // cache for IP[] to prevent duplicate calls to ipset program
+	ipv4Mutex   *sync.RWMutex
+	ipv6Mutex   *sync.RWMutex
 }
 
 // Convert configuration settings to an internal map
@@ -21,6 +24,8 @@ func (c *ipsetCtx) init(ipsetConfig []string) {
 	c.ipsetList = make(map[string][]string)
 	c.ipsetCache = make(map[[4]byte]bool)
 	c.ipset6Cache = make(map[[16]byte]bool)
+	c.ipv4Mutex = &sync.RWMutex{}
+	c.ipv6Mutex = &sync.RWMutex{}
 
 	for _, it := range ipsetConfig {
 		it = strings.TrimSpace(it)
@@ -67,6 +72,8 @@ func (c *ipsetCtx) getIP(rr dns.RR) net.IP {
 	case *dns.A:
 		var ip4 [4]byte
 		copy(ip4[:], a.A.To4())
+		c.ipv4Mutex.Lock()
+		defer c.ipv4Mutex.Unlock()
 		_, found := c.ipsetCache[ip4]
 		if found {
 			return nil // this IP was added before
@@ -77,6 +84,8 @@ func (c *ipsetCtx) getIP(rr dns.RR) net.IP {
 	case *dns.AAAA:
 		var ip6 [16]byte
 		copy(ip6[:], a.AAAA)
+		c.ipv6Mutex.Lock()
+		defer c.ipv6Mutex.Unlock()
 		_, found := c.ipset6Cache[ip6]
 		if found {
 			return nil // this IP was added before