Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ce7663d84a87bb4e1743f62950bf7dceed723a13

Authored by Yasuyuki Kozakai
Committed by David S. Miller
1 parent 0d53778e81
Exists in master and in 40 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, emb_lf-6.6.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]: nfnetlink_queue: don't unregister handler of other subsystem 

The queue handlers registered by ip[6]_queue.ko at initialization should
not be unregistered according to requests from userland program
using nfnetlink_queue. If we allow that, there is no way to register
the handlers of built-in ip[6]_queue again.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 3 changed files with 9 additions and 5 deletions Side-by-side Diff

include/linux/netfilter.h
Diff comments   View file @ ce7663d
... ... @@ -275,7 +275,8 @@
275 275 };
276 276 extern int nf_register_queue_handler(int pf,
277 277 struct nf_queue_handler *qh);
278   -extern int nf_unregister_queue_handler(int pf);
  278 +extern int nf_unregister_queue_handler(int pf,
  279 + struct nf_queue_handler *qh);
279 280 extern void nf_unregister_queue_handlers(struct nf_queue_handler *qh);
280 281 extern void nf_reinject(struct sk_buff *skb,
281 282 struct nf_info *info,
net/netfilter/nf_queue.c
Diff comments   View file @ ce7663d
... ... @@ -44,12 +44,17 @@
44 44 EXPORT_SYMBOL(nf_register_queue_handler);
45 45  
46 46 /* The caller must flush their queue before this */
47   -int nf_unregister_queue_handler(int pf)
  47 +int nf_unregister_queue_handler(int pf, struct nf_queue_handler *qh)
48 48 {
49 49 if (pf >= NPROTO)
50 50 return -EINVAL;
51 51  
52 52 write_lock_bh(&queue_handler_lock);
  53 + if (queue_handler[pf] != qh) {
  54 + write_unlock_bh(&queue_handler_lock);
  55 + return -EINVAL;
  56 + }
  57 +
53 58 queue_handler[pf] = NULL;
54 59 write_unlock_bh(&queue_handler_lock);
55 60  
net/netfilter/nfnetlink_queue.c
Diff comments   View file @ ce7663d
... ... @@ -913,9 +913,7 @@
913 913 case NFQNL_CFG_CMD_PF_UNBIND:
914 914 QDEBUG("unregistering queue handler for pf=%u\n",
915 915 ntohs(cmd->pf));
916   - /* This is a bug and a feature. We can unregister
917   - * other handlers(!) */
918   - ret = nf_unregister_queue_handler(ntohs(cmd->pf));
  916 + ret = nf_unregister_queue_handler(ntohs(cmd->pf), &nfqh);
919 917 break;
920 918 default:
921 919 ret = -EINVAL;