diff --git a/0014-nfct-helper-Extend-error-message-for-EBUSY.patch b/0014-nfct-helper-Extend-error-message-for-EBUSY.patch new file mode 100644 index 0000000..cd829bc --- /dev/null +++ b/0014-nfct-helper-Extend-error-message-for-EBUSY.patch @@ -0,0 +1,30 @@ +From 96f12bbb5f3bf88eadc1e0599c75b8d49ea54568 Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Fri, 15 Aug 2025 17:52:32 +0200 +Subject: [PATCH] nfct: helper: Extend error message for EBUSY + +Users may be not aware the user space helpers conflict with kernel space +ones, so add a hint about the possible cause of the EBUSY code returned +by the kernel. + +Cc: Yi Chen +Signed-off-by: Phil Sutter +(cherry picked from commit 766122f0a4cb966d85c13ad8cfabd636c9bcf043) +--- + src/nfct-extensions/helper.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/nfct-extensions/helper.c b/src/nfct-extensions/helper.c +index 894bf269ad2bb..3d32703d13903 100644 +--- a/src/nfct-extensions/helper.c ++++ b/src/nfct-extensions/helper.c +@@ -229,6 +229,9 @@ static int nfct_cmd_helper_add(struct mnl_socket *nl, int argc, char *argv[]) + portid = mnl_socket_get_portid(nl); + if (nfct_mnl_talk(nl, nlh, seq, portid, NULL, NULL) < 0) { + nfct_perror("netlink error"); ++ if (errno == EBUSY) ++ fprintf(stderr, ++ "Maybe unload nf_conntrack_%s.ko first?\n", argv[3]); + return -1; + } + diff --git a/conntrack-tools.spec b/conntrack-tools.spec index 154b55f..8a1025a 100644 --- a/conntrack-tools.spec +++ b/conntrack-tools.spec @@ -1,6 +1,6 @@ Name: conntrack-tools Version: 1.4.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manipulate netfilter connection tracking table and run High Availability License: GPL-2.0-only URL: http://conntrack-tools.netfilter.org/ @@ -23,6 +23,7 @@ Patch0010: 0010-conntrack-improve-secmark-id-zone-parser.patch Patch0011: 0011-conntrack-improve-mark-parser.patch Patch0012: 0012-conntrack-Fix-for-ENOENT-in-mnl_nfct_delete_cb.patch Patch0013: 0013-src-Eliminate-warnings-with-Wcalloc-transposed-args.patch +Patch0014: 0014-nfct-helper-Extend-error-message-for-EBUSY.patch BuildRequires: autoconf BuildRequires: automake @@ -104,6 +105,9 @@ install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/conntrackd/ %systemd_postun conntrackd.service %changelog +* Tue Sep 09 2025 Phil Sutter - 1.4.8-4 +- nfct: helper: Extend error message for EBUSY + * Fri Nov 15 2024 Phil Sutter - 1.4.8-3 - Backport fixes from upstream