patch 'log: fix systemd journal socket open' has been queued to stable release 24.11.2

[Kevin Traynor]

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 <stephen at networkplumber.org>
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 <stephen at networkplumber.org>
---
 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 at dpdk.org