From: Florian Westphal <fw@strlen.de>
To: netfilter-devel@vger.kernel.org
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH 6/7] netfilter: ebt_limit: add CONFIG_COMPAT support
Date: Mon, 15 Feb 2010 22:05:38 +0100 [thread overview]
Message-ID: <1266267939-7736-7-git-send-email-fw@strlen.de> (raw)
In-Reply-To: <1266267939-7736-1-git-send-email-fw@strlen.de>
ebt_limit structure is larger on 64 bit systems due
to "long" type used in the (kernel-only) data section.
Setting .compatsize is enough in this case, these values
have no meaning in userspace.
Signed-off-by: Florian Westphal <fwestphal@astaro.com>
---
net/bridge/netfilter/ebt_limit.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/net/bridge/netfilter/ebt_limit.c b/net/bridge/netfilter/ebt_limit.c
index 9dd16e6..7a81827 100644
--- a/net/bridge/netfilter/ebt_limit.c
+++ b/net/bridge/netfilter/ebt_limit.c
@@ -84,6 +84,19 @@ static bool ebt_limit_mt_check(const struct xt_mtchk_param *par)
return true;
}
+
+#ifdef CONFIG_COMPAT
+/*
+ * no conversion function needed --
+ * only avg/burst have meaningful values in userspace.
+ */
+struct ebt_compat_limit_info {
+ compat_uint_t avg, burst;
+ compat_ulong_t prev;
+ compat_uint_t credit, credit_cap, cost;
+};
+#endif
+
static struct xt_match ebt_limit_mt_reg __read_mostly = {
.name = "limit",
.revision = 0,
@@ -91,6 +104,9 @@ static struct xt_match ebt_limit_mt_reg __read_mostly = {
.match = ebt_limit_mt,
.checkentry = ebt_limit_mt_check,
.matchsize = sizeof(struct ebt_limit_info),
+#ifdef CONFIG_COMPAT
+ .compatsize = sizeof(struct ebt_compat_limit_info),
+#endif
.me = THIS_MODULE,
};
--
1.6.4.4
next prev parent reply other threads:[~2010-02-15 21:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-15 21:05 [Patch v3] netfilter: ebtables: CONFIG_COMPAT support Florian Westphal
2010-02-15 21:05 ` [PATCH 1/7] netfilter: ebtables: split do_replace into two functions Florian Westphal
2010-02-15 21:05 ` [PATCH 2/7] netfilter: ebtables: split copy_everything_to_user " Florian Westphal
2010-02-15 21:05 ` [PATCH 3/7] netfilter: ebtables: split update_counters " Florian Westphal
2010-02-15 21:05 ` [PATCH 4/7] netfilter: ebtables: add CONFIG_COMPAT support Florian Westphal
2010-02-15 21:05 ` [PATCH 5/7] netfilter: ebtables: try native set/getsockopt handlers, too Florian Westphal
2010-02-15 21:05 ` Florian Westphal [this message]
2010-02-15 21:05 ` [PATCH 7/7] netfilter: ebtables: mark: add CONFIG_COMPAT support Florian Westphal
2010-02-16 14:39 ` [Patch v3] netfilter: ebtables: " Patrick McHardy
2010-02-16 14:41 ` Florian Westphal
-- strict thread matches above, loose matches on Subject: below --
2010-02-16 16:39 [PATCH v4] " Florian Westphal
2010-02-16 16:39 ` [PATCH 6/7] netfilter: ebt_limit: add " Florian Westphal
2010-02-05 1:43 [PATCH 0/7] netfilter: ebtables: " Florian Westphal
2010-02-05 1:43 ` [PATCH 6/7] netfilter: ebt_limit: add " Florian Westphal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1266267939-7736-7-git-send-email-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.