[NETFILTER]: H.323 helper: fix possible NULL-ptr dereference

[linux-2.6] / net / netfilter / xt_mark.c

diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index ce0badfeef9a77e910fe2bdf78c4c41207647ec0..876bc57977381bc62ffd6c11c077cd3570428e1f 100644 (file)
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -42,7 +42,7 @@ checkentry(const char *tablename,
            unsigned int matchsize,
            unsigned int hook_mask)
 {
-       struct xt_mark_info *minfo = (struct xt_mark_info *) matchinfo;
+       const struct xt_mark_info *minfo = matchinfo;
 
        if (minfo->mark > 0xffffffff || minfo->mask > 0xffffffff) {
                printk(KERN_WARNING "mark: only supports 32bit mark\n");
@@ -69,7 +69,7 @@ static struct xt_match mark6_match = {
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init xt_mark_init(void)
 {
        int ret;
        ret = xt_register_match(&mark_match);
@@ -83,11 +83,11 @@ static int __init init(void)
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_mark_fini(void)
 {
        xt_unregister_match(&mark_match);
        xt_unregister_match(&mark6_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_mark_init);
+module_exit(xt_mark_fini);