Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[powerpc.git] / net / netfilter / xt_CONNMARK.c

diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c
index e577356..c01524f 100644 (file)
--- a/net/netfilter/xt_CONNMARK.c
+++ b/net/netfilter/xt_CONNMARK.c
@@ -38,8 +38,7 @@ target(struct sk_buff **pskb,
        const struct net_device *out,
        unsigned int hooknum,
        const struct xt_target *target,
-       const void *targinfo,
-       void *userinfo)
+       const void *targinfo)
 {
        const struct xt_connmark_target_info *markinfo = targinfo;
        u_int32_t diff;
@@ -54,7 +53,7 @@ target(struct sk_buff **pskb,
                        newmark = (*ctmark & ~markinfo->mask) | markinfo->mark;
                        if (newmark != *ctmark) {
                                *ctmark = newmark;
-#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
+#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
                                ip_conntrack_event_cache(IPCT_MARK, *pskb);
 #else
                                nf_conntrack_event_cache(IPCT_MARK, *pskb);
@@ -66,7 +65,7 @@ target(struct sk_buff **pskb,
                                  ((*pskb)->nfmark & markinfo->mask);
                        if (*ctmark != newmark) {
                                *ctmark = newmark;
-#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
+#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
                                ip_conntrack_event_cache(IPCT_MARK, *pskb);
 #else
                                nf_conntrack_event_cache(IPCT_MARK, *pskb);
@@ -90,7 +89,6 @@ checkentry(const char *tablename,
           const void *entry,
           const struct xt_target *target,
           void *targinfo,
-          unsigned int targinfosize,
           unsigned int hook_mask)
 {
        struct xt_connmark_target_info *matchinfo = targinfo;
@@ -110,6 +108,37 @@ checkentry(const char *tablename,
        return 1;
 }
 
+#ifdef CONFIG_COMPAT
+struct compat_xt_connmark_target_info {
+       compat_ulong_t  mark, mask;
+       u_int8_t        mode;
+       u_int8_t        __pad1;
+       u_int16_t       __pad2;
+};
+
+static void compat_from_user(void *dst, void *src)
+{
+       struct compat_xt_connmark_target_info *cm = src;
+       struct xt_connmark_target_info m = {
+               .mark   = cm->mark,
+               .mask   = cm->mask,
+               .mode   = cm->mode,
+       };
+       memcpy(dst, &m, sizeof(m));
+}
+
+static int compat_to_user(void __user *dst, void *src)
+{
+       struct xt_connmark_target_info *m = src;
+       struct compat_xt_connmark_target_info cm = {
+               .mark   = m->mark,
+               .mask   = m->mask,
+               .mode   = m->mode,
+       };
+       return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
+}
+#endif /* CONFIG_COMPAT */
+
 static struct xt_target xt_connmark_target[] = {
        {
                .name           = "CONNMARK",
@@ -117,6 +146,11 @@ static struct xt_target xt_connmark_target[] = {
                .checkentry     = checkentry,
                .target         = target,
                .targetsize     = sizeof(struct xt_connmark_target_info),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_connmark_target_info),
+               .compat_from_user = compat_from_user,
+               .compat_to_user = compat_to_user,
+#endif
                .me             = THIS_MODULE
        },
        {