Skip to content

L
linux-davinci
Commit 1fe57237 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files
Options

[NETFILTER]: xt_MARK: add compat support for revision 0 

Old userspace doesn't support revision 1, especially for IPv6, which
is only available in the SVN snapshot.

Add compat support for revision 0.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 311af5cb
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 6 deletions
net/netfilter/xt_MARK.c
View file @ 1fe57237
...@@ -94,6 +94,28 @@ mark_tg_check(const char *tablename, const void *entry, ...@@ -94,6 +94,28 @@ mark_tg_check(const char *tablename, const void *entry,
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
struct compat_xt_mark_target_info {
compat_ulong_t mark;
};
static void mark_tg_compat_from_user(void *dst, void *src)
{
const struct compat_xt_mark_target_info *cm = src;
struct xt_mark_target_info m = {
.mark = cm->mark,
};
memcpy(dst, &m, sizeof(m));
}
static int mark_tg_compat_to_user(void __user *dst, void *src)
{
const struct xt_mark_target_info *m = src;
struct compat_xt_mark_target_info cm = {
.mark = m->mark,
};
return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
}
struct compat_xt_mark_target_info_v1 { struct compat_xt_mark_target_info_v1 {
compat_ulong_t mark; compat_ulong_t mark;
u_int8_t mode; u_int8_t mode;
...@@ -101,7 +123,7 @@ struct compat_xt_mark_target_info_v1 { ...@@ -101,7 +123,7 @@ struct compat_xt_mark_target_info_v1 {
u_int16_t __pad2; u_int16_t __pad2;
}; };
static void mark_tg_compat_from_user(void *dst, void *src) static void mark_tg_compat_from_user_v1(void *dst, void *src)
{ {
const struct compat_xt_mark_target_info_v1 *cm = src; const struct compat_xt_mark_target_info_v1 *cm = src;
struct xt_mark_target_info_v1 m = { struct xt_mark_target_info_v1 m = {
...@@ -111,7 +133,7 @@ static void mark_tg_compat_from_user(void *dst, void *src) ...@@ -111,7 +133,7 @@ static void mark_tg_compat_from_user(void *dst, void *src)
memcpy(dst, &m, sizeof(m)); memcpy(dst, &m, sizeof(m));
} }
static int mark_tg_compat_to_user(void __user *dst, void *src) static int mark_tg_compat_to_user_v1(void __user *dst, void *src)
{ {
const struct xt_mark_target_info_v1 *m = src; const struct xt_mark_target_info_v1 *m = src;
struct compat_xt_mark_target_info_v1 cm = { struct compat_xt_mark_target_info_v1 cm = {
...@@ -130,6 +152,11 @@ static struct xt_target mark_tg_reg[] __read_mostly = { ...@@ -130,6 +152,11 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
.checkentry = mark_tg_check_v0, .checkentry = mark_tg_check_v0,
.target = mark_tg_v0, .target = mark_tg_v0,
.targetsize = sizeof(struct xt_mark_target_info), .targetsize = sizeof(struct xt_mark_target_info),
#ifdef CONFIG_COMPAT
.compatsize = sizeof(struct compat_xt_mark_target_info),
.compat_from_user = mark_tg_compat_from_user,
.compat_to_user = mark_tg_compat_to_user,
#endif
.table = "mangle", .table = "mangle",
.me = THIS_MODULE, .me = THIS_MODULE,
}, },
...@@ -142,8 +169,8 @@ static struct xt_target mark_tg_reg[] __read_mostly = { ...@@ -142,8 +169,8 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
.targetsize = sizeof(struct xt_mark_target_info_v1), .targetsize = sizeof(struct xt_mark_target_info_v1),
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compatsize = sizeof(struct compat_xt_mark_target_info_v1), .compatsize = sizeof(struct compat_xt_mark_target_info_v1),
.compat_from_user = mark_tg_compat_from_user, .compat_from_user = mark_tg_compat_from_user_v1,
.compat_to_user = mark_tg_compat_to_user, .compat_to_user = mark_tg_compat_to_user_v1,
#endif #endif
.table = "mangle", .table = "mangle",
.me = THIS_MODULE, .me = THIS_MODULE,
...@@ -155,6 +182,11 @@ static struct xt_target mark_tg_reg[] __read_mostly = { ...@@ -155,6 +182,11 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
.checkentry = mark_tg_check_v0, .checkentry = mark_tg_check_v0,
.target = mark_tg_v0, .target = mark_tg_v0,
.targetsize = sizeof(struct xt_mark_target_info), .targetsize = sizeof(struct xt_mark_target_info),
#ifdef CONFIG_COMPAT
.compatsize = sizeof(struct compat_xt_mark_target_info),
.compat_from_user = mark_tg_compat_from_user,
.compat_to_user = mark_tg_compat_to_user,
#endif
.table = "mangle", .table = "mangle",
.me = THIS_MODULE, .me = THIS_MODULE,
}, },
...@@ -167,8 +199,8 @@ static struct xt_target mark_tg_reg[] __read_mostly = { ...@@ -167,8 +199,8 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
.targetsize = sizeof(struct xt_mark_target_info_v1), .targetsize = sizeof(struct xt_mark_target_info_v1),
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compatsize = sizeof(struct compat_xt_mark_target_info_v1), .compatsize = sizeof(struct compat_xt_mark_target_info_v1),
.compat_from_user = mark_tg_compat_from_user, .compat_from_user = mark_tg_compat_from_user_v1,
.compat_to_user = mark_tg_compat_to_user, .compat_to_user = mark_tg_compat_to_user_v1,
#endif #endif
.table = "mangle", .table = "mangle",
.me = THIS_MODULE, .me = THIS_MODULE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment