Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache

2023-11-22 09:49:32 +02:00
parent 23392d08b1 0f5e8ca56f
commit e7ca515630
2 changed files with 6 additions and 0 deletions
--- a/internal/ipset/ipset_linux.go
+++ b/internal/ipset/ipset_linux.go
@@ -296,6 +296,10 @@ func (m *manager) ipsets(names []string) (sets []props, err error) {
 			return nil, fmt.Errorf("unknown ipset %q", n)
 		}

+		if p.family != netfilter.ProtoIPv4 && p.family != netfilter.ProtoIPv6 {
+			return nil, fmt.Errorf("%q unexpected ipset family %q", p.name, p.family)
+		}
+
 		sets = append(sets, p)
 	}