[NETFILTER]: xt_MARK: 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_MARK.c b/net/netfilter/xt_MARK.c
index 782f8d8c3edf3085bf8a3736a744333d19478b28..c6e860a7114f74dae300ab94857108d44dfd93e1 100644 (file)
--- a/net/netfilter/xt_MARK.c
+++ b/net/netfilter/xt_MARK.c
@@ -108,6 +108,35 @@ checkentry_v1(const char *tablename,
        return 1;
 }
 
+#ifdef CONFIG_COMPAT
+struct compat_xt_mark_target_info_v1 {
+       compat_ulong_t  mark;
+       u_int8_t        mode;
+       u_int8_t        __pad1;
+       u_int16_t       __pad2;
+};
+
+static void compat_from_user_v1(void *dst, void *src)
+{
+       struct compat_xt_mark_target_info_v1 *cm = src;
+       struct xt_mark_target_info_v1 m = {
+               .mark   = cm->mark,
+               .mode   = cm->mode,
+       };
+       memcpy(dst, &m, sizeof(m));
+}
+
+static int compat_to_user_v1(void __user *dst, void *src)
+{
+       struct xt_mark_target_info_v1 *m = src;
+       struct compat_xt_mark_target_info_v1 cm = {
+               .mark   = m->mark,
+               .mode   = m->mode,
+       };
+       return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
+}
+#endif /* CONFIG_COMPAT */
+
 static struct xt_target xt_mark_target[] = {
        {
                .name           = "MARK",
@@ -126,6 +155,11 @@ static struct xt_target xt_mark_target[] = {
                .checkentry     = checkentry_v1,
                .target         = target_v1,
                .targetsize     = sizeof(struct xt_mark_target_info_v1),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_mark_target_info_v1),
+               .compat_from_user = compat_from_user_v1,
+               .compat_to_user = compat_to_user_v1,
+#endif
                .table          = "mangle",
                .me             = THIS_MODULE,
        },