[NETFILTER]: xt_CONNMARK: add compat conversion functions

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c
index 6ccb45ee088026c4e74f9e2d35f79a14ebead18f..c01524f817f04caa8a42aa5ec16dc7130fed6baf 100644 (file)
--- a/net/netfilter/xt_CONNMARK.c
+++ b/net/netfilter/xt_CONNMARK.c
@@ -108,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",
@@ -115,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
        },
        {