From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id B16FBC79FA0 for ; Tue, 8 Sep 2026 07:38:57 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08A1D40E1D; Tue, 8 Sep 2026 09:38:57 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 038AC4026A for ; Tue, 8 Sep 2026 09:38:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788853134; 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: in-reply-to:in-reply-to:references:references; bh=uA0h5nO4Pr38GhIlaVLvHD89pqYlI55prfKskfCPBMs=; b=hJ4T9IiD5Tj3+9V7ndLMk0UX+kLeak39ZZt3gHNt6eqhRRiMk3u6JPn8mAO50Jm9VrGADA ToOw+ve8AGtJ3W6djKZyLTzWDYPVaXwaJwn1DUzjTaXxY92s01MLZVGn8EzNW24/zg7M+f GTuw3MfWNzmUja/Rv6FSoJXRDTktjAs= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-434-reWX9w6MOPuI46SUvpAv9A-1; Tue, 08 Sep 2026 03:38:49 -0400 X-MC-Unique: reWX9w6MOPuI46SUvpAv9A-1 X-Mimecast-MFC-AGG-ID: reWX9w6MOPuI46SUvpAv9A_1788853128 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9EA101802141; Tue, 8 Sep 2026 07:38:47 +0000 (UTC) Received: from dmarchan.redhat.corp (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B96C01956049; Tue, 8 Sep 2026 07:38:45 +0000 (UTC) From: David Marchand To: dev@dpdk.org, hkalra@marvell.com Cc: stable@dpdk.org, Bruce Richardson , Anatoly Burakov Subject: [RFC v4 2/5] eal/freebsd: fix a FD leak in the alarm subsystem Date: Tue, 8 Sep 2026 09:38:31 +0200 Message-ID: <20260908073835.3422310-3-david.marchand@redhat.com> In-Reply-To: <20260908073835.3422310-1-david.marchand@redhat.com> References: <20260908073835.3422310-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pP-Cn1UZiW-ohUJBUf3CqkXZiQIpGQkcXgtqUWFcSQg_1788853128 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Caught by code review, while looking at rte_intr_instance_free() users. Even if the FD is not used, it must still be closed when uninitialising the alarm subsystem. Fixes: 26021a715067 ("eal/bsd: support alarm API") Cc: stable@dpdk.org Signed-off-by: David Marchand --- Changes since RFC v3: - fixed compilation, --- lib/eal/freebsd/eal_alarm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c index c03e281e67..8544fe8d03 100644 --- a/lib/eal/freebsd/eal_alarm.c +++ b/lib/eal/freebsd/eal_alarm.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -54,6 +55,8 @@ rte_eal_alarm_cleanup(void) int ret = rte_intr_callback_unregister_sync(intr_handle, eal_alarm_callback, (void *)-1); if (ret >= 0) { + close(rte_intr_fd_get(intr_handle)); + rte_intr_fd_set(intr_handle, -1); rte_intr_instance_free(intr_handle); intr_handle = NULL; } @@ -62,7 +65,7 @@ rte_eal_alarm_cleanup(void) int rte_eal_alarm_init(void) { - int fd; + int fd = -1; intr_handle = rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE); if (intr_handle == NULL) { @@ -88,6 +91,8 @@ rte_eal_alarm_init(void) return 0; error: + if (fd >= 0) + close(fd); rte_intr_instance_free(intr_handle); return -1; } -- 2.54.0