NFS: Kill the obsolete NFS_PARANOIA

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

diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index e8059cd..39911dd 100644 (file)
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -31,15 +31,15 @@ match(const struct sk_buff *skb,
 {
        const struct xt_mark_info *info = matchinfo;
 
-       return ((skb->nfmark & info->mask) == info->mark) ^ info->invert;
+       return ((skb->mark & info->mask) == info->mark) ^ info->invert;
 }
 
 static int
 checkentry(const char *tablename,
-           const void *entry,
+          const void *entry,
           const struct xt_match *match,
-           void *matchinfo,
-           unsigned int hook_mask)
+          void *matchinfo,
+          unsigned int hook_mask)
 {
        const struct xt_mark_info *minfo = matchinfo;
 
@@ -50,6 +50,37 @@ checkentry(const char *tablename,
        return 1;
 }
 
+#ifdef CONFIG_COMPAT
+struct compat_xt_mark_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_mark_info *cm = src;
+       struct xt_mark_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_mark_info *m = src;
+       struct compat_xt_mark_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_mark_match[] = {
        {
                .name           = "mark",
@@ -57,6 +88,11 @@ static struct xt_match xt_mark_match[] = {
                .checkentry     = checkentry,
                .match          = match,
                .matchsize      = sizeof(struct xt_mark_info),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_mark_info),
+               .compat_from_user = compat_from_user,
+               .compat_to_user = compat_to_user,
+#endif
                .me             = THIS_MODULE,
        },
        {