From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202410 header.b=EXcdh1m+; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 842A85A061D for ; Wed, 06 Nov 2024 07:54:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202410; t=1730876064; bh=UFg1Go8urr2tTbf3kuhWsxDA9aJ007Qc45QOZTOgxGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EXcdh1m+I9YJiXVF3qlGZrzN1ORHOOxUjjKL3A7qJw7RzmM4Pfx83DYIUfM1OKXtQ za1UIRCSwXpZAgE3N5SOzjL38iLDtAbW/P2IDi0MUuzLOomAiwOQnDJOFAgOPk3KJU gGa8VuAyLswTrE8r+IySzMGS417ji2V1QoVacbkUUAvReHRR2qk4ZeXZxY1Jixasm9 awTuSF2YPpCbzSq+aJQrp0o4rSpNQk0ym/VBsepRq/8F2QCOG63F2cs7kwrXZpr5U2 4AGVUQeJfWdqJpGI9/dGPdGvjf9xDm2XkJZBwWHnwcslGKAht9IGBZnNFq4H0pXM95 IpLh8v1MIRHiQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Xjwt813hRz4xFt; Wed, 6 Nov 2024 17:54:24 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH 6/8] udp: Don't dereference uflow before NULL check in udp_reply_sock_handler() Date: Wed, 6 Nov 2024 17:54:19 +1100 Message-ID: <20241106065421.2568179-7-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106065421.2568179-1-david@gibson.dropbear.id.au> References: <20241106065421.2568179-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: RJRRYRETNMFSSAABJ3K24GEBUHFCXORN X-Message-ID-Hash: RJRRYRETNMFSSAABJ3K24GEBUHFCXORN 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.8 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: We have an ASSERT() verifying that we're able to look up the flow in udp_reply_sock_handler(). However, we dereference uflow before that in an initializer, rather defeating the point. Rearrange to avoid that. Signed-off-by: David Gibson --- udp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/udp.c b/udp.c index 0c01067..4be165f 100644 --- a/udp.c +++ b/udp.c @@ -644,12 +644,13 @@ void udp_reply_sock_handler(const struct ctx *c, union epoll_ref ref, flow_sidx_t tosidx = flow_sidx_opposite(ref.flowside); const struct flowside *toside = flowside_at_sidx(tosidx); struct udp_flow *uflow = udp_at_sidx(ref.flowside); - int from_s = uflow->s[ref.flowside.sidei]; uint8_t topif = pif_at_sidx(tosidx); - int n, i; + int n, i, from_s; ASSERT(!c->no_udp && uflow); + from_s = uflow->s[ref.flowside.sidei]; + if (udp_sock_errs(c, from_s, events) < 0) { flow_err(uflow, "Unrecoverable error on reply socket"); flow_err_details(uflow); -- 2.47.0