From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id BE6AC5A0265 for ; Fri, 4 Nov 2022 04:10:44 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4N3QcG6R0Lz4xwl; Fri, 4 Nov 2022 14:10:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1667531438; bh=AbJ5qeWa7crs4V+1rVR+pX5KqkYm4pZbaqfivf/UjyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VOOGFclBsehG2DaS1FnwNTkB+TZBVZLszQtY4gIm4OA1jEkVfd3cf07uZkZ8GXJQG y1GSo6rbM7lXguMyE6dHGJytZJZPL8D+AwtBLlulptYbIHfpSsHZBxs73T3CLGNqyA Dfe81lPWwkLjpTTyy1mrGzf8xZiK7EZPBGfLlpzU= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 1/6] Correct some missing endian conversions of IPv4 addresses Date: Fri, 4 Nov 2022 14:10:32 +1100 Message-Id: <20221104031037.3866034-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221104031037.3866034-1-david@gibson.dropbear.id.au> References: <20221104031037.3866034-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: DKKVPALK6GKXLF4SNJCOYXDNV6YTHTX3 X-Message-ID-Hash: DKKVPALK6GKXLF4SNJCOYXDNV6YTHTX3 X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.3 Precedence: list List-Id: Development discussion and patches for passt Archived-At: <> Archived-At: List-Archive: <> List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The INADDR_LOOPBACK constant is in host endianness, and similarly the IN_MULTICAST macro expects a host endian address. However, there are some places in passt where we use those with network endian values. This means that passt will incorrectly allow you to set 127.0.0.1 or a multicast address as the guest address or DNS forwarding address. Add the necessary conversions to correct this. INADDR_ANY and INADDR_BROADCAST logically behave the same way, although because they're palindromes it doesn't have an effect in practice. Change them to be logically correct while we're there, though. Signed-off-by: David Gibson --- conf.c | 26 +++++++++++++------------- icmp.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/conf.c b/conf.c index 598c711..769df97 100644 --- a/conf.c +++ b/conf.c @@ -1164,11 +1164,11 @@ void conf(struct ctx *c, int argc, char **argv) !IN6_IS_ADDR_LOOPBACK(&c->ip6.dns_fwd)) break; - if (c->ip4.dns_fwd == INADDR_ANY && + if (c->ip4.dns_fwd == htonl(INADDR_ANY) && inet_pton(AF_INET, optarg, &c->ip4.dns_fwd) && - c->ip4.dns_fwd != INADDR_ANY && - c->ip4.dns_fwd != INADDR_BROADCAST && - c->ip4.dns_fwd != INADDR_LOOPBACK) + c->ip4.dns_fwd != htonl(INADDR_ANY) && + c->ip4.dns_fwd != htonl(INADDR_BROADCAST) && + c->ip4.dns_fwd != htonl(INADDR_LOOPBACK)) break; err("Invalid DNS forwarding address: %s", optarg); @@ -1363,12 +1363,12 @@ void conf(struct ctx *c, int argc, char **argv) !IN6_IS_ADDR_MULTICAST(&c->ip6.addr)) break; - if (c->ip4.addr == INADDR_ANY && + if (c->ip4.addr == htonl(INADDR_ANY) && inet_pton(AF_INET, optarg, &c->ip4.addr) && - c->ip4.addr != INADDR_ANY && - c->ip4.addr != INADDR_BROADCAST && - c->ip4.addr != INADDR_LOOPBACK && - !IN_MULTICAST(c->ip4.addr)) + c->ip4.addr != htonl(INADDR_ANY) && + c->ip4.addr != htonl(INADDR_BROADCAST) && + c->ip4.addr != htonl(INADDR_LOOPBACK) && + !IN_MULTICAST(ntohl(c->ip4.addr))) break; err("Invalid address: %s", optarg); @@ -1406,11 +1406,11 @@ void conf(struct ctx *c, int argc, char **argv) !IN6_IS_ADDR_LOOPBACK(&c->ip6.gw)) break; - if (c->ip4.gw == INADDR_ANY && + if (c->ip4.gw == htonl(INADDR_ANY) && inet_pton(AF_INET, optarg, &c->ip4.gw) && - c->ip4.gw != INADDR_ANY && - c->ip4.gw != INADDR_BROADCAST && - c->ip4.gw != INADDR_LOOPBACK) + c->ip4.gw != htonl(INADDR_ANY) && + c->ip4.gw != htonl(INADDR_BROADCAST) && + c->ip4.gw != htonl(INADDR_LOOPBACK)) break; err("Invalid gateway address: %s", optarg); diff --git a/icmp.c b/icmp.c index 233acf9..125f314 100644 --- a/icmp.c +++ b/icmp.c @@ -148,7 +148,7 @@ int icmp_tap_handler(const struct ctx *c, int af, const void *addr, union icmp_epoll_ref iref = { .icmp.v6 = 0 }; struct sockaddr_in sa = { .sin_family = AF_INET, - .sin_addr = { .s_addr = INADDR_ANY }, + .sin_addr = { .s_addr = htonl(INADDR_ANY) }, }; struct icmphdr *ih; int id, s; -- 2.38.1