netfilter: ebtables: mark: add CONFIG_COMPAT support

Add the required handlers to convert 32 bit
ebtables mark match and match target structs to 64bit layout.

Signed-off-by: Florian Westphal <fwestphal@astaro.com>

diff --git a/net/bridge/netfilter/ebt_mark.c b/net/bridge/netfilter/ebt_mark.c
index 153e167374a21fd2fef1e41b82a5a7d45534e204..2b5ce533d6b93c77b2bf7c5906cb29e70415df7a 100644 (file)
--- a/net/bridge/netfilter/ebt_mark.c
+++ b/net/bridge/netfilter/ebt_mark.c
@@ -52,6 +52,32 @@ static bool ebt_mark_tg_check(const struct xt_tgchk_param *par)
                return false;
        return true;
 }
+#ifdef CONFIG_COMPAT
+struct compat_ebt_mark_t_info {
+       compat_ulong_t mark;
+       compat_uint_t target;
+};
+
+static void mark_tg_compat_from_user(void *dst, const void *src)
+{
+       const struct compat_ebt_mark_t_info *user = src;
+       struct ebt_mark_t_info *kern = dst;
+
+       kern->mark = user->mark;
+       kern->target = user->target;
+}
+
+static int mark_tg_compat_to_user(void __user *dst, const void *src)
+{
+       struct compat_ebt_mark_t_info __user *user = dst;
+       const struct ebt_mark_t_info *kern = src;
+
+       if (put_user(kern->mark, &user->mark) ||
+           put_user(kern->target, &user->target))
+               return -EFAULT;
+       return 0;
+}
+#endif
 
 static struct xt_target ebt_mark_tg_reg __read_mostly = {
        .name           = "mark",
@@ -60,6 +86,11 @@ static struct xt_target ebt_mark_tg_reg __read_mostly = {
        .target         = ebt_mark_tg,
        .checkentry     = ebt_mark_tg_check,
        .targetsize     = sizeof(struct ebt_mark_t_info),
+#ifdef CONFIG_COMPAT
+       .compatsize     = sizeof(struct compat_ebt_mark_t_info),
+       .compat_from_user = mark_tg_compat_from_user,
+       .compat_to_user = mark_tg_compat_to_user,
+#endif
        .me             = THIS_MODULE,
 };
 

diff --git a/net/bridge/netfilter/ebt_mark_m.c b/net/bridge/netfilter/ebt_mark_m.c
index 89abf40303991c0efac2cb91666c9dbc3275ed00..8de8c396d913fc7852d9326edaf8742b4dedf11c 100644 (file)
--- a/net/bridge/netfilter/ebt_mark_m.c
+++ b/net/bridge/netfilter/ebt_mark_m.c
@@ -35,6 +35,38 @@ static bool ebt_mark_mt_check(const struct xt_mtchk_param *par)
        return true;
 }
 
+
+#ifdef CONFIG_COMPAT
+struct compat_ebt_mark_m_info {
+       compat_ulong_t mark, mask;
+       uint8_t invert, bitmask;
+};
+
+static void mark_mt_compat_from_user(void *dst, const void *src)
+{
+       const struct compat_ebt_mark_m_info *user = src;
+       struct ebt_mark_m_info *kern = dst;
+
+       kern->mark = user->mark;
+       kern->mask = user->mask;
+       kern->invert = user->invert;
+       kern->bitmask = user->bitmask;
+}
+
+static int mark_mt_compat_to_user(void __user *dst, const void *src)
+{
+       struct compat_ebt_mark_m_info __user *user = dst;
+       const struct ebt_mark_m_info *kern = src;
+
+       if (put_user(kern->mark, &user->mark) ||
+           put_user(kern->mask, &user->mask) ||
+           put_user(kern->invert, &user->invert) ||
+           put_user(kern->bitmask, &user->bitmask))
+               return -EFAULT;
+       return 0;
+}
+#endif
+
 static struct xt_match ebt_mark_mt_reg __read_mostly = {
        .name           = "mark_m",
        .revision       = 0,
@@ -42,6 +74,11 @@ static struct xt_match ebt_mark_mt_reg __read_mostly = {
        .match          = ebt_mark_mt,
        .checkentry     = ebt_mark_mt_check,
        .matchsize      = sizeof(struct ebt_mark_m_info),
+#ifdef CONFIG_COMPAT
+       .compatsize     = sizeof(struct compat_ebt_mark_m_info),
+       .compat_from_user = mark_mt_compat_from_user,
+       .compat_to_user = mark_mt_compat_to_user,
+#endif
        .me             = THIS_MODULE,
 };