mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
[NETFILTER]: xt_CONNMARK: add compat conversion functions
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f1eda05386
commit
7ce975b9da
1 changed files with 36 additions and 0 deletions
|
@ -108,6 +108,37 @@ checkentry(const char *tablename,
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPAT
|
||||||
|
struct compat_xt_connmark_target_info {
|
||||||
|
compat_ulong_t mark, mask;
|
||||||
|
u_int8_t mode;
|
||||||
|
u_int8_t __pad1;
|
||||||
|
u_int16_t __pad2;
|
||||||
|
};
|
||||||
|
|
||||||
|
static void compat_from_user(void *dst, void *src)
|
||||||
|
{
|
||||||
|
struct compat_xt_connmark_target_info *cm = src;
|
||||||
|
struct xt_connmark_target_info m = {
|
||||||
|
.mark = cm->mark,
|
||||||
|
.mask = cm->mask,
|
||||||
|
.mode = cm->mode,
|
||||||
|
};
|
||||||
|
memcpy(dst, &m, sizeof(m));
|
||||||
|
}
|
||||||
|
|
||||||
|
static int compat_to_user(void __user *dst, void *src)
|
||||||
|
{
|
||||||
|
struct xt_connmark_target_info *m = src;
|
||||||
|
struct compat_xt_connmark_target_info cm = {
|
||||||
|
.mark = m->mark,
|
||||||
|
.mask = m->mask,
|
||||||
|
.mode = m->mode,
|
||||||
|
};
|
||||||
|
return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_COMPAT */
|
||||||
|
|
||||||
static struct xt_target xt_connmark_target[] = {
|
static struct xt_target xt_connmark_target[] = {
|
||||||
{
|
{
|
||||||
.name = "CONNMARK",
|
.name = "CONNMARK",
|
||||||
|
@ -115,6 +146,11 @@ static struct xt_target xt_connmark_target[] = {
|
||||||
.checkentry = checkentry,
|
.checkentry = checkentry,
|
||||||
.target = target,
|
.target = target,
|
||||||
.targetsize = sizeof(struct xt_connmark_target_info),
|
.targetsize = sizeof(struct xt_connmark_target_info),
|
||||||
|
#ifdef CONFIG_COMPAT
|
||||||
|
.compatsize = sizeof(struct compat_xt_connmark_target_info),
|
||||||
|
.compat_from_user = compat_from_user,
|
||||||
|
.compat_to_user = compat_to_user,
|
||||||
|
#endif
|
||||||
.me = THIS_MODULE
|
.me = THIS_MODULE
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue