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

Commit 3e597c60 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] fix iptables __user misannotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1db2ea39

include/linux/netfilter/x_tables.h

+2 −2
Original line number Diff line number Diff line
@@ -390,13 +390,13 @@ extern int xt_compat_match_offset(struct xt_match *match); 
extern void xt_compat_match_from_user(struct xt_entry_match *m,

				      void **dstptr, int *size);

extern int xt_compat_match_to_user(struct xt_entry_match *m,

				   void * __user *dstptr, int *size);

				   void __user **dstptr, int *size);



extern int xt_compat_target_offset(struct xt_target *target);

extern void xt_compat_target_from_user(struct xt_entry_target *t,

				       void **dstptr, int *size);

extern int xt_compat_target_to_user(struct xt_entry_target *t,

				    void * __user *dstptr, int *size);

				    void __user **dstptr, int *size);



#endif /* CONFIG_COMPAT */

#endif /* __KERNEL__ */

net/ipv4/netfilter/ip_tables.c

+3 −3
Original line number Diff line number Diff line
@@ -1364,15 +1364,15 @@ struct compat_ipt_replace { 
};



static inline int compat_copy_match_to_user(struct ipt_entry_match *m,

		void * __user *dstptr, compat_uint_t *size)

		void __user **dstptr, compat_uint_t *size)

{

	return xt_compat_match_to_user(m, dstptr, size);

}



static int compat_copy_entry_to_user(struct ipt_entry *e,

		void * __user *dstptr, compat_uint_t *size)

		void __user **dstptr, compat_uint_t *size)

{

	struct ipt_entry_target __user *t;

	struct ipt_entry_target *t;

	struct compat_ipt_entry __user *ce;

	u_int16_t target_offset, next_offset;

	compat_uint_t origsize;