aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-09-20 12:05:54 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 15:20:02 -0700
commitbc80b656657251fc936d2d93fc70d5566c1c7d29 (patch)
tree3b781d832a742a57beda451e4c05a73b31b5d055 /net
parent9fa492cdc160cd27ce1046cb36f47d3b2b1efa21 (diff)
downloadkernel_samsung_aries-bc80b656657251fc936d2d93fc70d5566c1c7d29.zip
kernel_samsung_aries-bc80b656657251fc936d2d93fc70d5566c1c7d29.tar.gz
kernel_samsung_aries-bc80b656657251fc936d2d93fc70d5566c1c7d29.tar.bz2
[NETFILTER]: xt_mark: add compat conversion functions
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/xt_mark.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index e8059cd..934dddf 100644
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -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,
},
{