From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Pl8YMj2c; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id ED2425A027E for ; Mon, 12 May 2025 18:47:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747068426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPCahx2txlKvq8nz5caOYCvl8gYe8Qu6IH/vhvj9drs=; b=Pl8YMj2cAO5RSipe99hMNrTVcVJk2pSxH5iKjS6yDUdt1bM9AsA0qYQJI7GgVi6NhZQr42 929yD8DwpX/EMm2eQBYGtrjRXLz3/36qzT6jWTNgT0NrV8/t9R8TpbRoBmox9jpjGgvbk7 SPRB/IPH6youFfmcnwn8qh/AU1baCxw= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-BbaubGvtOz2sr3BIFX3M5Q-1; Mon, 12 May 2025 12:47:03 -0400 X-MC-Unique: BbaubGvtOz2sr3BIFX3M5Q-1 X-Mimecast-MFC-AGG-ID: BbaubGvtOz2sr3BIFX3M5Q_1747068422 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A9251955D7E for ; Mon, 12 May 2025 16:47:02 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.34.42]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7505730002DB; Mon, 12 May 2025 16:47:01 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH] flow: close socket fd on error Date: Mon, 12 May 2025 18:47:00 +0200 Message-ID: <20250512164700.1309894-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xevNUWzg-oaJEMXOCBqVwRu3pfAWufba5riFxW7y-90_1747068422 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: ARINQ7WJMN2A5X4NOOGQTELAEDDYBEOU X-Message-ID-Hash: ARINQ7WJMN2A5X4NOOGQTELAEDDYBEOU X-MailFrom: lvivier@redhat.com 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: Laurent Vivier 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: In eea8a76caf85 ("flow: fix podman issue #26073"), we unregister the fd from epoll_ctl() in case of error, but we also need to close it. As flowside_sock_l4() also calls sock_l4_sa() via flowside_sock_splice() we can do it unconditionally. Fixes: eea8a76caf85 ("flow: fix podman issue #26073") Signed-off-by: Laurent Vivier --- udp_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/udp_flow.c b/udp_flow.c index b3a13b7993d5..4c6b3c2ca8da 100644 --- a/udp_flow.c +++ b/udp_flow.c @@ -88,8 +88,8 @@ static int udp_flow_sock(const struct ctx *c, if (flowside_connect(c, s, pif, side) < 0) { int rc = -errno; - if (pif == PIF_HOST) - epoll_del(c, s); + epoll_del(c, s); + close(s); flow_dbg_perror(uflow, "Couldn't connect flow socket"); return rc; -- 2.49.0