Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 28337ff5438a640afa713d874d076e3a8a9150da

Authored by Eric Dumazet
Committed by Patrick McHardy
1 parent d060ffc184
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

netfilter: xt_hashlimit fix 

Commit 784544739a25c30637397ace5489eeb6e15d7d49
(netfilter: iptables: lock free counters) broke xt_hashlimit netfilter module :

This module was storing a pointer inside its xt_hashlimit_info, and this pointer
is not relocated when we temporarly switch tables (iptables -L).

This hack is not not needed at all (probably a leftover from
ancient time), as each cpu should and can access to its own copy.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

Showing 1 changed file with 1 additions and 4 deletions Side-by-side Diff

net/netfilter/xt_hashlimit.c
Diff comments   View file @ 28337ff
... ... @@ -565,8 +565,7 @@
565 565 static bool
566 566 hashlimit_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
567 567 {
568   - const struct xt_hashlimit_info *r =
569   - ((const struct xt_hashlimit_info *)par->matchinfo)->u.master;
  568 + const struct xt_hashlimit_info *r = par->matchinfo;
570 569 struct xt_hashlimit_htable *hinfo = r->hinfo;
571 570 unsigned long now = jiffies;
572 571 struct dsthash_ent *dh;
... ... @@ -702,8 +701,6 @@
702 701 }
703 702 mutex_unlock(&hlimit_mutex);
704 703  
705   - /* Ugly hack: For SMP, we only want to use one set */
706   - r->u.master = r;
707 704 return true;
708 705 }
709 706