[NETFILTER]: xt_connmark: add compat conversion functions

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

1 files changed, 36 insertions, 0 deletions

diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index c9104d05a19c..92a5726ef237 100644
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -81,6 +81,37 @@ destroy(const struct xt_match *match, void *matchinfo)
 #endif
 }
 
+#ifdef CONFIG_COMPAT
+struct compat_xt_connmark_info {
+        compat_ulong_t  mark, mask;
+        u_int8_t        invert;
+        u_int8_t        __pad1;
+        u_int16_t       __pad2;
+};
+
+static void compat_from_user(void *dst, void *src)
+{
+        struct compat_xt_connmark_info *cm = src;
+        struct xt_connmark_info m = {
+                .mark   = cm->mark,
+                .mask   = cm->mask,
+                .invert = cm->invert,
+        };
+        memcpy(dst, &m, sizeof(m));
+}
+
+static int compat_to_user(void __user *dst, void *src)
+{
+        struct xt_connmark_info *m = src;
+        struct compat_xt_connmark_info cm = {
+                .mark   = m->mark,
+                .mask   = m->mask,
+                .invert = m->invert,
+        };
+        return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
+}
+#endif /* CONFIG_COMPAT */
+
 static struct xt_match xt_connmark_match[] = {
         {
                 .name           = "connmark",
@@ -89,6 +120,11 @@ static struct xt_match xt_connmark_match[] = {
                 .match          = match,
                 .destroy        = destroy,
                 .matchsize      = sizeof(struct xt_connmark_info),
+#ifdef CONFIG_COMPAT
+                .compatsize     = sizeof(struct compat_xt_connmark_info),
+                .compat_from_user = compat_from_user,
+                .compat_to_user = compat_to_user,
+#endif
                 .me             = THIS_MODULE
         },
         {