Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e84fb4b3666dabd3917952fb33588daa891a6ad3

Authored by Matteo Croce
Committed by Pablo Neira Ayuso
1 parent 8c0bb78738

netfilter: conntrack: use shared sysctl constants 

Use shared sysctl variables for zero and one constants, as in commit
eec4844fae7c ("proc/sysctl: add shared variables for range check")

Fixes: 8f14c99c7eda ("netfilter: conntrack: limit sysctl setting for boolean options")
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

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

net/netfilter/nf_conntrack_standalone.c
Diff comments   View file @ e84fb4b
... ... @@ -511,8 +511,6 @@
511 511 /* Log invalid packets of a given protocol */
512 512 static int log_invalid_proto_min __read_mostly;
513 513 static int log_invalid_proto_max __read_mostly = 255;
514   -static int zero;
515   -static int one = 1;
516 514  
517 515 /* size the user *wants to set */
518 516 static unsigned int nf_conntrack_htable_size_user __read_mostly;
... ... @@ -629,8 +627,8 @@
629 627 .maxlen = sizeof(int),
630 628 .mode = 0644,
631 629 .proc_handler = proc_dointvec_minmax,
632   - .extra1 = &zero,
633   - .extra2 = &one,
  630 + .extra1 = SYSCTL_ZERO,
  631 + .extra2 = SYSCTL_ONE,
634 632 },
635 633 [NF_SYSCTL_CT_LOG_INVALID] = {
636 634 .procname = "nf_conntrack_log_invalid",
... ... @@ -654,8 +652,8 @@
654 652 .maxlen = sizeof(int),
655 653 .mode = 0644,
656 654 .proc_handler = proc_dointvec_minmax,
657   - .extra1 = &zero,
658   - .extra2 = &one,
  655 + .extra1 = SYSCTL_ZERO,
  656 + .extra2 = SYSCTL_ONE,
659 657 },
660 658 [NF_SYSCTL_CT_HELPER] = {
661 659 .procname = "nf_conntrack_helper",
... ... @@ -663,8 +661,8 @@
663 661 .maxlen = sizeof(int),
664 662 .mode = 0644,
665 663 .proc_handler = proc_dointvec_minmax,
666   - .extra1 = &zero,
667   - .extra2 = &one,
  664 + .extra1 = SYSCTL_ZERO,
  665 + .extra2 = SYSCTL_ONE,
668 666 },
669 667 #ifdef CONFIG_NF_CONNTRACK_EVENTS
670 668 [NF_SYSCTL_CT_EVENTS] = {
... ... @@ -673,8 +671,8 @@
673 671 .maxlen = sizeof(int),
674 672 .mode = 0644,
675 673 .proc_handler = proc_dointvec_minmax,
676   - .extra1 = &zero,
677   - .extra2 = &one,
  674 + .extra1 = SYSCTL_ZERO,
  675 + .extra2 = SYSCTL_ONE,
678 676 },
679 677 #endif
680 678 #ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
... ... @@ -684,8 +682,8 @@
684 682 .maxlen = sizeof(int),
685 683 .mode = 0644,
686 684 .proc_handler = proc_dointvec_minmax,
687   - .extra1 = &zero,
688   - .extra2 = &one,
  685 + .extra1 = SYSCTL_ZERO,
  686 + .extra2 = SYSCTL_ONE,
689 687 },
690 688 #endif
691 689 [NF_SYSCTL_CT_PROTO_TIMEOUT_GENERIC] = {
692 690  
... ... @@ -759,16 +757,16 @@
759 757 .maxlen = sizeof(int),
760 758 .mode = 0644,
761 759 .proc_handler = proc_dointvec_minmax,
762   - .extra1 = &zero,
763   - .extra2 = &one,
  760 + .extra1 = SYSCTL_ZERO,
  761 + .extra2 = SYSCTL_ONE,
764 762 },
765 763 [NF_SYSCTL_CT_PROTO_TCP_LIBERAL] = {
766 764 .procname = "nf_conntrack_tcp_be_liberal",
767 765 .maxlen = sizeof(int),
768 766 .mode = 0644,
769 767 .proc_handler = proc_dointvec_minmax,
770   - .extra1 = &zero,
771   - .extra2 = &one,
  768 + .extra1 = SYSCTL_ZERO,
  769 + .extra2 = SYSCTL_ONE,
772 770 },
773 771 [NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS] = {
774 772 .procname = "nf_conntrack_tcp_max_retrans",
... ... @@ -904,8 +902,8 @@
904 902 .maxlen = sizeof(int),
905 903 .mode = 0644,
906 904 .proc_handler = proc_dointvec_minmax,
907   - .extra1 = &zero,
908   - .extra2 = &one,
  905 + .extra1 = SYSCTL_ZERO,
  906 + .extra2 = SYSCTL_ONE,
909 907 },
910 908 #endif
911 909 #ifdef CONFIG_NF_CT_PROTO_GRE