From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A889A21FF3B; Sun, 7 Sep 2025 20:29:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757276950; cv=none; b=Z9gZHEGxGGlRlC07jaddvOr6+ddRg8w6txWSlL7eOe9PC+QJul43IxnFLwowoR5QDiMmObb5skNm2x+UxzOI0scC2qJ2Eiy95Pt+kQN+p4uzE5XYTBY+Q1FhRZwa2AjiLGgM5VBWqdaeVNQGxLnSi7DCOaEoMe9tScuxGWn+JJU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757276950; c=relaxed/simple; bh=74WOn0i3CldVmSv2c5qSrSrz5Xru3+6dqOW5dRY/8xs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b6+TG7MCMm/qCmwktPvaqfQfIPiJ5X7E7h8FYuMXXR/4eb/v5ko/ES7LmL0zT6fK0yXQBgBsW6B8YK/nXcpfiBOK8eol4L4kD6n0HmlaMkxEw02YLczjnV/QShBbyuRddcK9mffvDtIYNuKTnmQGhFOlNMmUIKtIMsRlYVDdcPE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cYMXMWuH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cYMXMWuH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4B0AC4CEF0; Sun, 7 Sep 2025 20:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1757276950; bh=74WOn0i3CldVmSv2c5qSrSrz5Xru3+6dqOW5dRY/8xs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cYMXMWuHJkTXoe1HuU05nyABVS2+RCBZSJ2CjO/lYYsZ8QnUTAc3Q5D6vOAJ6I3/z Gm7k5NFOUv+3kjcdVqFsg8DT0Q38AkfvbDjLtPk5adY68/ubC3oD5ZCDeCC/It6Y6r ezzEW9mLhbUo81I9r6rvasbpTOLTHXkav2zbLkY4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe Leroy , Phil Sutter , Florian Westphal , Sasha Levin Subject: [PATCH 6.12 040/175] netfilter: conntrack: helper: Replace -EEXIST by -EBUSY Date: Sun, 7 Sep 2025 21:57:15 +0200 Message-ID: <20250907195615.803773844@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250907195614.892725141@linuxfoundation.org> References: <20250907195614.892725141@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Phil Sutter [ Upstream commit 54416fd76770bd04fc3c501810e8d673550bab26 ] The helper registration return value is passed-through by module_init callbacks which modprobe confuses with the harmless -EEXIST returned when trying to load an already loaded module. Make sure modprobe fails so users notice their helper has not been registered and won't work. Suggested-by: Christophe Leroy Fixes: 12f7a505331e ("netfilter: add user-space connection tracking helper infrastructure") Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index 4ed5878cb25b1..ceb48c3ca0a43 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -368,7 +368,7 @@ int nf_conntrack_helper_register(struct nf_conntrack_helper *me) (cur->tuple.src.l3num == NFPROTO_UNSPEC || cur->tuple.src.l3num == me->tuple.src.l3num) && cur->tuple.dst.protonum == me->tuple.dst.protonum) { - ret = -EEXIST; + ret = -EBUSY; goto out; } } @@ -379,7 +379,7 @@ int nf_conntrack_helper_register(struct nf_conntrack_helper *me) hlist_for_each_entry(cur, &nf_ct_helper_hash[h], hnode) { if (nf_ct_tuple_src_mask_cmp(&cur->tuple, &me->tuple, &mask)) { - ret = -EEXIST; + ret = -EBUSY; goto out; } } -- 2.50.1