From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 12 May 2022 14:37:10 +0000 (+0200)
Subject: resolved: use saturate_add()
X-Git-Tag: v251-rc3~8^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14b71de4e143500cf872ef1ca2e2653cc941302b;p=thirdparty%2Fsystemd.git

resolved: use saturate_add()
---

diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c
index 96ae9bc0057..0394c3ec84b 100644
--- a/src/resolve/resolved-dns-answer.c
+++ b/src/resolve/resolved-dns-answer.c
@@ -60,10 +60,7 @@ static int dns_answer_reserve_internal(DnsAnswer *a, size_t n) {
         m = ordered_set_size(a->items);
         assert(m <= UINT16_MAX); /* We can only place 64K RRs in an answer at max */
 
-        if (n > UINT16_MAX - m)
-                n = UINT16_MAX;
-        else
-                n += m;
+        n = saturate_add(m, n, UINT16_MAX);
 
         /* Higher multipliers give slightly higher efficiency through hash collisions, but the gains
          * quickly drop off after 2. */
@@ -707,10 +704,7 @@ int dns_answer_reserve_or_clone(DnsAnswer **a, size_t n_free) {
         ns = dns_answer_size(*a);
         assert(ns <= UINT16_MAX); /* Maximum number of RRs we can stick into a DNS packet section */
 
-        if (n_free > UINT16_MAX - ns) /* overflow check */
-                ns = UINT16_MAX;
-        else
-                ns += n_free;
+        ns = saturate_add(ns, n_free, UINT16_MAX);
 
         n = dns_answer_new(ns);
         if (!n)