wrong type for 'magic' argument in simple_fill_super()

[mirror_ubuntu-hirsute-kernel.git] / net / netfilter / xt_multiport.c

diff --git a/net/netfilter/xt_multiport.c b/net/netfilter/xt_multiport.c
index d06bb2dd39002171c5aa8f99f8500cd1f15b7eca..ac1d3c3d09e72dbbfbf49f4dcdad6fc7600dcded 100644 (file)
--- a/net/netfilter/xt_multiport.c
+++ b/net/netfilter/xt_multiport.c
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/udp.h>
@@ -26,29 +26,6 @@ MODULE_DESCRIPTION("Xtables: multiple port matching for TCP, UDP, UDP-Lite, SCTP
 MODULE_ALIAS("ipt_multiport");
 MODULE_ALIAS("ip6t_multiport");
 
-#if 0
-#define duprintf(format, args...) printk(format , ## args)
-#else
-#define duprintf(format, args...)
-#endif
-
-/* Returns 1 if the port is matched by the test, 0 otherwise. */
-static inline bool
-ports_match_v0(const u_int16_t *portlist, enum xt_multiport_flags flags,
-              u_int8_t count, u_int16_t src, u_int16_t dst)
-{
-       unsigned int i;
-       for (i = 0; i < count; i++) {
-               if (flags != XT_MULTIPORT_DESTINATION && portlist[i] == src)
-                       return true;
-
-               if (flags != XT_MULTIPORT_SOURCE && portlist[i] == dst)
-                       return true;
-       }
-
-       return false;
-}
-
 /* Returns 1 if the port is matched by the test, 0 otherwise. */
 static inline bool
 ports_match_v1(const struct xt_multiport_v1 *minfo,
@@ -63,7 +40,7 @@ ports_match_v1(const struct xt_multiport_v1 *minfo,
                if (minfo->pflags[i]) {
                        /* range port matching */
                        e = minfo->ports[++i];
-                       duprintf("src or dst matches with %d-%d?\n", s, e);
+                       pr_debug("src or dst matches with %d-%d?\n", s, e);
 
                        if (minfo->flags == XT_MULTIPORT_SOURCE
                            && src >= s && src <= e)
@@ -77,7 +54,7 @@ ports_match_v1(const struct xt_multiport_v1 *minfo,
                                return true ^ minfo->invert;
                } else {
                        /* exact port matching */
-                       duprintf("src or dst matches with %d?\n", s);
+                       pr_debug("src or dst matches with %d?\n", s);
 
                        if (minfo->flags == XT_MULTIPORT_SOURCE
                            && src == s)
@@ -95,31 +72,7 @@ ports_match_v1(const struct xt_multiport_v1 *minfo,
 }
 
 static bool
-multiport_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
-{
-       const __be16 *pptr;
-       __be16 _ports[2];
-       const struct xt_multiport *multiinfo = par->matchinfo;
-
-       if (par->fragoff != 0)
-               return false;
-
-       pptr = skb_header_pointer(skb, par->thoff, sizeof(_ports), _ports);
-       if (pptr == NULL) {
-               /* We've been asked to examine this packet, and we
-                * can't.  Hence, no choice but to drop.
-                */
-               duprintf("xt_multiport: Dropping evil offset=0 tinygram.\n");
-               *par->hotdrop = true;
-               return false;
-       }
-
-       return ports_match_v0(multiinfo->ports, multiinfo->flags,
-              multiinfo->count, ntohs(pptr[0]), ntohs(pptr[1]));
-}
-
-static bool
-multiport_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+multiport_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
        const __be16 *pptr;
        __be16 _ports[2];
@@ -133,8 +86,8 @@ multiport_mt(const struct sk_buff *skb, const struct xt_match_param *par)
                /* We've been asked to examine this packet, and we
                 * can't.  Hence, no choice but to drop.
                 */
-               duprintf("xt_multiport: Dropping evil offset=0 tinygram.\n");
-               *par->hotdrop = true;
+               pr_debug("Dropping evil offset=0 tinygram.\n");
+               par->hotdrop = true;
                return false;
        }
 
@@ -158,52 +111,25 @@ check(u_int16_t proto,
                && count <= XT_MULTI_PORTS;
 }
 
-static bool multiport_mt_check_v0(const struct xt_mtchk_param *par)
-{
-       const struct ipt_ip *ip = par->entryinfo;
-       const struct xt_multiport *multiinfo = par->matchinfo;
-
-       return check(ip->proto, ip->invflags, multiinfo->flags,
-                    multiinfo->count);
-}
-
-static bool multiport_mt_check(const struct xt_mtchk_param *par)
+static int multiport_mt_check(const struct xt_mtchk_param *par)
 {
        const struct ipt_ip *ip = par->entryinfo;
        const struct xt_multiport_v1 *multiinfo = par->matchinfo;
 
        return check(ip->proto, ip->invflags, multiinfo->flags,
-                    multiinfo->count);
+                    multiinfo->count) ? 0 : -EINVAL;
 }
 
-static bool multiport_mt6_check_v0(const struct xt_mtchk_param *par)
-{
-       const struct ip6t_ip6 *ip = par->entryinfo;
-       const struct xt_multiport *multiinfo = par->matchinfo;
-
-       return check(ip->proto, ip->invflags, multiinfo->flags,
-                    multiinfo->count);
-}
-
-static bool multiport_mt6_check(const struct xt_mtchk_param *par)
+static int multiport_mt6_check(const struct xt_mtchk_param *par)
 {
        const struct ip6t_ip6 *ip = par->entryinfo;
        const struct xt_multiport_v1 *multiinfo = par->matchinfo;
 
        return check(ip->proto, ip->invflags, multiinfo->flags,
-                    multiinfo->count);
+                    multiinfo->count) ? 0 : -EINVAL;
 }
 
 static struct xt_match multiport_mt_reg[] __read_mostly = {
-       {
-               .name           = "multiport",
-               .family         = NFPROTO_IPV4,
-               .revision       = 0,
-               .checkentry     = multiport_mt_check_v0,
-               .match          = multiport_mt_v0,
-               .matchsize      = sizeof(struct xt_multiport),
-               .me             = THIS_MODULE,
-       },
        {
                .name           = "multiport",
                .family         = NFPROTO_IPV4,
@@ -213,15 +139,6 @@ static struct xt_match multiport_mt_reg[] __read_mostly = {
                .matchsize      = sizeof(struct xt_multiport_v1),
                .me             = THIS_MODULE,
        },
-       {
-               .name           = "multiport",
-               .family         = NFPROTO_IPV6,
-               .revision       = 0,
-               .checkentry     = multiport_mt6_check_v0,
-               .match          = multiport_mt_v0,
-               .matchsize      = sizeof(struct xt_multiport),
-               .me             = THIS_MODULE,
-       },
        {
                .name           = "multiport",
                .family         = NFPROTO_IPV6,