From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9AB5246211 for ; Thu, 13 Feb 2025 11:01:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 963B440287; Thu, 13 Feb 2025 11:01:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C35C642EE4 for ; Thu, 13 Feb 2025 11:01:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440895; 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=fkkMYt5C/ZWIGasuZh50taYmO0XphLJnQzjtRYPewZg=; b=aNMrP91EC+5SJOpNpdXLnvv9ksBoE7/tl61C59U35spgoo7mtf5vzjUBoot2YKdhNG5DAb 4MLFGjL+npqBcSOI36SO87+y42V5z4LjxZ+4jipS2ab7d+7xDzxPzLyeP+d3X7skZxn5jR uIfeVBPYOZZu84h2XwIXPzsbtfZRSGw= Received: from mx-prod-mc-08.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-491-cpaHw8vAOW-hePsb6s-qpQ-1; Thu, 13 Feb 2025 05:01:32 -0500 X-MC-Unique: cpaHw8vAOW-hePsb6s-qpQ-1 X-Mimecast-MFC-AGG-ID: cpaHw8vAOW-hePsb6s-qpQ Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 937BA1800879; Thu, 13 Feb 2025 10:01:31 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7029F1800365; Thu, 13 Feb 2025 10:01:30 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'log: fix systemd journal socket open' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:14 +0000 Message-ID: <20250213095933.362078-47-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: XRhBUk6VU4a4qKv0VOcQaQmp-sB2NLeWENXNYniexA4_1739440891 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2ac9abd53d661b2f099b84bc2b644ecef1db3766 Thanks. Kevin --- >From 2ac9abd53d661b2f099b84bc2b644ecef1db3766 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:15:18 -0800 Subject: [PATCH] log: fix systemd journal socket open [ upstream commit d0dbcae33d86514159b56e8d03c7f59536cbea9d ] On error path, the journal socket code would call close with -1 which caused Coverity warning. Coverity issue: 448872 Fixes: 9da0dc6c0331 ("log: support systemd journal") Signed-off-by: Stephen Hemminger --- lib/log/log_journal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/log/log_journal.c b/lib/log/log_journal.c index e9b3aa5640..43099649ed 100644 --- a/lib/log/log_journal.c +++ b/lib/log/log_journal.c @@ -117,5 +117,5 @@ log_journal_open(const char *id) .sun_path = "/run/systemd/journal/socket", }; - int jfd = -1; + int jfd; len = snprintf(syslog_id, sizeof(syslog_id), @@ -129,5 +129,5 @@ log_journal_open(const char *id) if (jfd < 0) { perror("socket"); - goto error; + return NULL; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:39.591630469 +0000 +++ 0047-log-fix-systemd-journal-socket-open.patch 2025-02-12 17:29:34.339945864 +0000 @@ -1 +1 @@ -From d0dbcae33d86514159b56e8d03c7f59536cbea9d Mon Sep 17 00:00:00 2001 +From 2ac9abd53d661b2f099b84bc2b644ecef1db3766 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d0dbcae33d86514159b56e8d03c7f59536cbea9d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org