[NETFILTER]: xt_mark: 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
9fa492cdc1
commit
bc80b65665
1 changed files with 36 additions and 0 deletions
|
@ -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,
|
||||
},
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue