From: Tom Gundersen <teg@jklm.no>
Date: Sun, 19 Jul 2015 19:42:52 +0000 (+0200)
Subject: resolve: transaction - stop processing packet when found to be invalid
X-Git-Tag: v223~58^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F690%2Fhead;p=thirdparty%2Fsystemd.git

resolve: transaction - stop processing packet when found to be invalid

We were stopping the transaction, but we need to stop processing the packet alltogether.
---

diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
index e468f245f70..3d46c99df85 100644
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -417,8 +417,10 @@ void dns_transaction_process_reply(DnsTransaction *t, DnsPacket *p) {
 
         /* Only consider responses with equivalent query section to the request */
         if (!dns_question_is_superset(p->question, t->question) ||
-            !dns_question_is_superset(t->question, p->question))
+            !dns_question_is_superset(t->question, p->question)) {
                 dns_transaction_complete(t, DNS_TRANSACTION_INVALID_REPLY);
+                return;
+        }
 
         /* According to RFC 4795, section 2.9. only the RRs from the answer section shall be cached */
         dns_cache_put(&t->scope->cache, p->question, DNS_PACKET_RCODE(p), p->answer, DNS_PACKET_ANCOUNT(p), 0, p->family, &p->sender);