Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

netfilter: xtables: constify args in compat copying functions 



Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent b402405d

include/linux/netfilter/x_tables.h

+6 −6
Original line number Diff line number Diff line
@@ -286,8 +286,8 @@ struct xt_match { 
	void (*destroy)(const struct xt_mtdtor_param *);

#ifdef CONFIG_COMPAT

	/* Called when userspace align differs from kernel space one */

	void (*compat_from_user)(void *dst, void *src);

	int (*compat_to_user)(void __user *dst, void *src);

	void (*compat_from_user)(void *dst, const void *src);

	int (*compat_to_user)(void __user *dst, const void *src);

#endif

	/* Set this to THIS_MODULE if you are a module, otherwise NULL */

	struct module *me;
@@ -328,8 +328,8 @@ struct xt_target { 
	void (*destroy)(const struct xt_tgdtor_param *);

#ifdef CONFIG_COMPAT

	/* Called when userspace align differs from kernel space one */

	void (*compat_from_user)(void *dst, void *src);

	int (*compat_to_user)(void __user *dst, void *src);

	void (*compat_from_user)(void *dst, const void *src);

	int (*compat_to_user)(void __user *dst, const void *src);

#endif

	/* Set this to THIS_MODULE if you are a module, otherwise NULL */

	struct module *me;
@@ -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_from_user(struct xt_entry_match *m,

				     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);



extern int xt_compat_target_offset(const struct xt_target *target);

extern void xt_compat_target_from_user(struct xt_entry_target *t,

				       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);



#endif /* CONFIG_COMPAT */

net/ipv4/netfilter/arp_tables.c

+2 −2
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static int copy_entries_to_user(unsigned int total_size, 
}



#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;
@@ -851,7 +851,7 @@ static void compat_standard_from_user(void *dst, void *src) 
	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;

net/ipv4/netfilter/ip_tables.c

+2 −2
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ copy_entries_to_user(unsigned int total_size, 
}



#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;
@@ -1056,7 +1056,7 @@ static void compat_standard_from_user(void *dst, void *src) 
	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;

net/ipv4/netfilter/ipt_ULOG.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ struct compat_ipt_ulog_info { 
	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;

	struct ipt_ulog_info l = {
@@ -351,7 +351,7 @@ static void ulog_tg_compat_from_user(void *dst, void *src) 
	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;

	struct compat_ipt_ulog_info cl = {

net/ipv6/netfilter/ip6_tables.c

+2 −2
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ copy_entries_to_user(unsigned int total_size, 
}



#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;
@@ -1088,7 +1088,7 @@ static void compat_standard_from_user(void *dst, void *src) 
	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;