github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 10:09:10 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

netfilter pull request nf-25-08-27

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJBBAABCAArFiEEgKkgxbID4Gn1hq6fcJGo2a1f9gAFAmivB2INHGZ3QHN0cmxl
 bi5kZQAKCRBwkajZrV/2ADYvD/wIJCCCfOBA+jmE/XPPtOZvdyYy4D+TWZoLujFk
 Z/lFBa87Lu3TxNZXZmp+MVKUV5MwvjYbEaf3Zs1hVLxbF49HMMh8bL/VQE8BGOji
 SHxgzDpWV+QClf5c0kqPPvb/0kCJ61gJ9RDCF+4CrmqGuUMbKe+PG8BG6wfXf2Zr
 0zNysn+/3UYRrexlAbIAa31XoFu6sVqxtaa8cH+4J2j7CDVBMRhmVzyaMeuvNaHg
 DZ8U7YvFqj7T2lhpPysCtwPPvIwnRHwRISMXLTEjM+EPZxeh4gRgLNwJa0Oc4l5R
 bv4sKWsuP4MNr5yKiMKiQ4U0j9shpeQFQ48LEhNJp1IFM1FTHqvlptNNciMbjeHM
 iSPi7Zvp7+HThyyQqOycuknWIm+f+wn6gBRjVOdTXXE+QS2CiK0jQQ9lx2IFCZa2
 rpe5Uu4D5/9qoinqBPJd5Ec2Sc0hQErF4lBdUT+nLBMguBA4lHOTi90BV2crZmuK
 KaoL7rITAy0YmWflqniuA7HPZn1zIK4XIGIZV0kWfM+mZdHHwk1cK2eTfHKLV96E
 aKy7MlDFkiMwFftoQifXK+cs7MRAWJA9HquWnlZ2bPYrGBwuI3wV/aV70E2lP+tW
 hzOkQ/Z98/cOet5IdnGlTlHTaeNidczWAcN+chaBEArKJQpHRr3+TSuoL4+tgQnc
 Mm1z8w==
 =fFAY
 -----END PGP SIGNATURE-----

Merge tag 'nf-25-08-27' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf

Florian Westphal says:

====================
netfilter updates for net

1) Remove bogus WARN_ON in br_netfilter that came in 6.8.
   This is now more prominent due to
   commit 2d72afb340 ("netfilter: nf_conntrack: fix crash due to
   removal of uninitialised entry"). From Wang Liang.

2) Better error reporting when a helper module clashes with
   an existing helper name: -EEXIST makes modprobe believe that
   the module is already loaded, so error message is elided.
   From Phil Sutter.

* tag 'nf-25-08-27' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: conntrack: helper: Replace -EEXIST by -EBUSY
  netfilter: br_netfilter: do not check confirmed bit in br_nf_local_in() after confirm
====================

Link: https://patch.msgid.link/20250827133900.16552-1-fw@strlen.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2025-08-29 18:57:22 -07:00
commit c407beb5b8
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/bridge/br_netfilter_hooks.c
View File

@ -626,9 +626,6 @@ static unsigned int br_nf_local_in(void *priv,
break;
}
ct = container_of(nfct, struct nf_conn, ct_general);
WARN_ON_ONCE(!nf_ct_is_confirmed(ct));
return ret;
}
#endif

4
net/netfilter/nf_conntrack_helper.c
View File

@ -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;
}
}