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=202502 header.b=fN+7mL4O; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 830865A0623 for ; Mon, 10 Feb 2025 10:18:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1739179087; bh=FR2v2ajDhnYz1Jq4dg7mnENLkAvXg7Gwd9xxFCVW+04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fN+7mL4OIiPIqnAIJsE8J6AqAqKncSe5LnABnMaIbZtKcpCX4vFM3sBj2dZaRvuo4 RVz/v1YbMdCVNa4ajo4qVdRtmSqIo2j4T7UEoKdFEU/20wVx+WFp/nYi+GAKiy902/ AS/q8smV+ZHkOSJNMguCj25h10OM5Z/+dNfD2Z1h1gyQMRuO4gwoY2n5Fcn/H7+dJ3 ORBXXoBfn//JX7dnjUOJhNuxpPDnVA5um6yh4JS8iumJzlKMmsLosfqmYAhcASLacD RnfpYB03RR8DYKOQ74fHMZGYgYFqIlrfuYQjQqU3qUZm+Edmd09X4zbQPT7P7z9QH5 FEibLK9BpKAfA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4YrzWg58qTz4wyl; Mon, 10 Feb 2025 20:18:07 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v14 07/14] fixup: Sanity check passt-repair reply message Date: Mon, 10 Feb 2025 20:17:58 +1100 Message-ID: <20250210091805.2261228-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210091805.2261228-1-david@gibson.dropbear.id.au> References: <20250210091805.2261228-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: CNSIHWFOIDGEMWRTMVDL2V5R6IMFMJSJ X-Message-ID-Hash: CNSIHWFOIDGEMWRTMVDL2V5R6IMFMJSJ 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: At the moment we discard the reply message; the fact that it exists is the only thing we check. Check it has the expected value to be a bit more thorough. Signed-off-by: David Gibson --- repair.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/repair.c b/repair.c index f473e1f4..d2886173 100644 --- a/repair.c +++ b/repair.c @@ -150,6 +150,7 @@ int repair_flush(struct ctx *c) __attribute__ ((aligned(__alignof__(struct cmsghdr)))); struct cmsghdr *cmsg; struct msghdr msg; + int8_t reply; if (!repair_nfds) return 0; @@ -172,13 +173,19 @@ int repair_flush(struct ctx *c) return ret; } - if (recv(c->fd_repair, &((int8_t){ 0 }), 1, 0) < 0) { + if (recv(c->fd_repair, &reply, sizeof(reply), 0) < 0) { int ret = -errno; err_perror("Failed to receive reply from TCP_REPAIR helper"); repair_close(c); return ret; } + if (reply != repair_cmd) { + err("Unexpected reply from TCP_REPAIR helper: %d", reply); + repair_close(c); + return -ENXIO; + } + return 0; } -- 2.48.1