Commit 739674fb authored by Jan Engelhardt's avatar Jan Engelhardt

netfilter: xtables: constify args in compat copying functions

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent b402405d
...@@ -286,8 +286,8 @@ struct xt_match { ...@@ -286,8 +286,8 @@ struct xt_match {
void (*destroy)(const struct xt_mtdtor_param *); void (*destroy)(const struct xt_mtdtor_param *);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
/* Called when userspace align differs from kernel space one */ /* Called when userspace align differs from kernel space one */
void (*compat_from_user)(void *dst, void *src); void (*compat_from_user)(void *dst, const void *src);
int (*compat_to_user)(void __user *dst, void *src); int (*compat_to_user)(void __user *dst, const void *src);
#endif #endif
/* Set this to THIS_MODULE if you are a module, otherwise NULL */ /* Set this to THIS_MODULE if you are a module, otherwise NULL */
struct module *me; struct module *me;
...@@ -328,8 +328,8 @@ struct xt_target { ...@@ -328,8 +328,8 @@ struct xt_target {
void (*destroy)(const struct xt_tgdtor_param *); void (*destroy)(const struct xt_tgdtor_param *);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
/* Called when userspace align differs from kernel space one */ /* Called when userspace align differs from kernel space one */
void (*compat_from_user)(void *dst, void *src); void (*compat_from_user)(void *dst, const void *src);
int (*compat_to_user)(void __user *dst, void *src); int (*compat_to_user)(void __user *dst, const void *src);
#endif #endif
/* Set this to THIS_MODULE if you are a module, otherwise NULL */ /* Set this to THIS_MODULE if you are a module, otherwise NULL */
struct module *me; struct module *me;
...@@ -593,13 +593,13 @@ extern short xt_compat_calc_jump(u_int8_t af, unsigned int offset); ...@@ -593,13 +593,13 @@ extern short xt_compat_calc_jump(u_int8_t af, unsigned int offset);
extern int xt_compat_match_offset(const struct xt_match *match); extern int xt_compat_match_offset(const struct xt_match *match);
extern int xt_compat_match_from_user(struct xt_entry_match *m, extern int xt_compat_match_from_user(struct xt_entry_match *m,
void **dstptr, unsigned int *size); void **dstptr, unsigned int *size);
extern int xt_compat_match_to_user(struct xt_entry_match *m, extern int xt_compat_match_to_user(const struct xt_entry_match *m,
void __user **dstptr, unsigned int *size); void __user **dstptr, unsigned int *size);
extern int xt_compat_target_offset(const struct xt_target *target); extern int xt_compat_target_offset(const struct xt_target *target);
extern void xt_compat_target_from_user(struct xt_entry_target *t, extern void xt_compat_target_from_user(struct xt_entry_target *t,
void **dstptr, unsigned int *size); void **dstptr, unsigned int *size);
extern int xt_compat_target_to_user(struct xt_entry_target *t, extern int xt_compat_target_to_user(const struct xt_entry_target *t,
void __user **dstptr, unsigned int *size); void __user **dstptr, unsigned int *size);
#endif /* CONFIG_COMPAT */ #endif /* CONFIG_COMPAT */
......
...@@ -842,7 +842,7 @@ static int copy_entries_to_user(unsigned int total_size, ...@@ -842,7 +842,7 @@ static int copy_entries_to_user(unsigned int total_size,
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static void compat_standard_from_user(void *dst, void *src) static void compat_standard_from_user(void *dst, const void *src)
{ {
int v = *(compat_int_t *)src; int v = *(compat_int_t *)src;
...@@ -851,7 +851,7 @@ static void compat_standard_from_user(void *dst, void *src) ...@@ -851,7 +851,7 @@ static void compat_standard_from_user(void *dst, void *src)
memcpy(dst, &v, sizeof(v)); memcpy(dst, &v, sizeof(v));
} }
static int compat_standard_to_user(void __user *dst, void *src) static int compat_standard_to_user(void __user *dst, const void *src)
{ {
compat_int_t cv = *(int *)src; compat_int_t cv = *(int *)src;
......
...@@ -1047,7 +1047,7 @@ copy_entries_to_user(unsigned int total_size, ...@@ -1047,7 +1047,7 @@ copy_entries_to_user(unsigned int total_size,
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static void compat_standard_from_user(void *dst, void *src) static void compat_standard_from_user(void *dst, const void *src)
{ {
int v = *(compat_int_t *)src; int v = *(compat_int_t *)src;
...@@ -1056,7 +1056,7 @@ static void compat_standard_from_user(void *dst, void *src) ...@@ -1056,7 +1056,7 @@ static void compat_standard_from_user(void *dst, void *src)
memcpy(dst, &v, sizeof(v)); memcpy(dst, &v, sizeof(v));
} }
static int compat_standard_to_user(void __user *dst, void *src) static int compat_standard_to_user(void __user *dst, const void *src)
{ {
compat_int_t cv = *(int *)src; compat_int_t cv = *(int *)src;
......
...@@ -338,7 +338,7 @@ struct compat_ipt_ulog_info { ...@@ -338,7 +338,7 @@ struct compat_ipt_ulog_info {
char prefix[ULOG_PREFIX_LEN]; char prefix[ULOG_PREFIX_LEN];
}; };
static void ulog_tg_compat_from_user(void *dst, void *src) static void ulog_tg_compat_from_user(void *dst, const void *src)
{ {
const struct compat_ipt_ulog_info *cl = src; const struct compat_ipt_ulog_info *cl = src;
struct ipt_ulog_info l = { struct ipt_ulog_info l = {
...@@ -351,7 +351,7 @@ static void ulog_tg_compat_from_user(void *dst, void *src) ...@@ -351,7 +351,7 @@ static void ulog_tg_compat_from_user(void *dst, void *src)
memcpy(dst, &l, sizeof(l)); memcpy(dst, &l, sizeof(l));
} }
static int ulog_tg_compat_to_user(void __user *dst, void *src) static int ulog_tg_compat_to_user(void __user *dst, const void *src)
{ {
const struct ipt_ulog_info *l = src; const struct ipt_ulog_info *l = src;
struct compat_ipt_ulog_info cl = { struct compat_ipt_ulog_info cl = {
......
...@@ -1079,7 +1079,7 @@ copy_entries_to_user(unsigned int total_size, ...@@ -1079,7 +1079,7 @@ copy_entries_to_user(unsigned int total_size,
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static void compat_standard_from_user(void *dst, void *src) static void compat_standard_from_user(void *dst, const void *src)
{ {
int v = *(compat_int_t *)src; int v = *(compat_int_t *)src;
...@@ -1088,7 +1088,7 @@ static void compat_standard_from_user(void *dst, void *src) ...@@ -1088,7 +1088,7 @@ static void compat_standard_from_user(void *dst, void *src)
memcpy(dst, &v, sizeof(v)); memcpy(dst, &v, sizeof(v));
} }
static int compat_standard_to_user(void __user *dst, void *src) static int compat_standard_to_user(void __user *dst, const void *src)
{ {
compat_int_t cv = *(int *)src; compat_int_t cv = *(int *)src;
......
...@@ -485,8 +485,8 @@ int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr, ...@@ -485,8 +485,8 @@ int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
} }
EXPORT_SYMBOL_GPL(xt_compat_match_from_user); EXPORT_SYMBOL_GPL(xt_compat_match_from_user);
int xt_compat_match_to_user(struct xt_entry_match *m, void __user **dstptr, int xt_compat_match_to_user(const struct xt_entry_match *m,
unsigned int *size) void __user **dstptr, unsigned int *size)
{ {
const struct xt_match *match = m->u.kernel.match; const struct xt_match *match = m->u.kernel.match;
struct compat_xt_entry_match __user *cm = *dstptr; struct compat_xt_entry_match __user *cm = *dstptr;
...@@ -588,8 +588,8 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr, ...@@ -588,8 +588,8 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr,
} }
EXPORT_SYMBOL_GPL(xt_compat_target_from_user); EXPORT_SYMBOL_GPL(xt_compat_target_from_user);
int xt_compat_target_to_user(struct xt_entry_target *t, void __user **dstptr, int xt_compat_target_to_user(const struct xt_entry_target *t,
unsigned int *size) void __user **dstptr, unsigned int *size)
{ {
const struct xt_target *target = t->u.kernel.target; const struct xt_target *target = t->u.kernel.target;
struct compat_xt_entry_target __user *ct = *dstptr; struct compat_xt_entry_target __user *ct = *dstptr;
......
...@@ -775,7 +775,7 @@ struct compat_xt_hashlimit_info { ...@@ -775,7 +775,7 @@ struct compat_xt_hashlimit_info {
compat_uptr_t master; compat_uptr_t master;
}; };
static void hashlimit_mt_compat_from_user(void *dst, void *src) static void hashlimit_mt_compat_from_user(void *dst, const void *src)
{ {
int off = offsetof(struct compat_xt_hashlimit_info, hinfo); int off = offsetof(struct compat_xt_hashlimit_info, hinfo);
...@@ -783,7 +783,7 @@ static void hashlimit_mt_compat_from_user(void *dst, void *src) ...@@ -783,7 +783,7 @@ static void hashlimit_mt_compat_from_user(void *dst, void *src)
memset(dst + off, 0, sizeof(struct compat_xt_hashlimit_info) - off); memset(dst + off, 0, sizeof(struct compat_xt_hashlimit_info) - off);
} }
static int hashlimit_mt_compat_to_user(void __user *dst, void *src) static int hashlimit_mt_compat_to_user(void __user *dst, const void *src)
{ {
int off = offsetof(struct compat_xt_hashlimit_info, hinfo); int off = offsetof(struct compat_xt_hashlimit_info, hinfo);
......
...@@ -148,7 +148,7 @@ struct compat_xt_rateinfo { ...@@ -148,7 +148,7 @@ struct compat_xt_rateinfo {
/* To keep the full "prev" timestamp, the upper 32 bits are stored in the /* To keep the full "prev" timestamp, the upper 32 bits are stored in the
* master pointer, which does not need to be preserved. */ * master pointer, which does not need to be preserved. */
static void limit_mt_compat_from_user(void *dst, void *src) static void limit_mt_compat_from_user(void *dst, const void *src)
{ {
const struct compat_xt_rateinfo *cm = src; const struct compat_xt_rateinfo *cm = src;
struct xt_rateinfo m = { struct xt_rateinfo m = {
...@@ -162,7 +162,7 @@ static void limit_mt_compat_from_user(void *dst, void *src) ...@@ -162,7 +162,7 @@ static void limit_mt_compat_from_user(void *dst, void *src)
memcpy(dst, &m, sizeof(m)); memcpy(dst, &m, sizeof(m));
} }
static int limit_mt_compat_to_user(void __user *dst, void *src) static int limit_mt_compat_to_user(void __user *dst, const void *src)
{ {
const struct xt_rateinfo *m = src; const struct xt_rateinfo *m = src;
struct compat_xt_rateinfo cm = { struct compat_xt_rateinfo cm = {
......
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