diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-09-24 18:42:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 18:55:03 -0400 |
commit | 3e597c6045502dd0fa98a61aa95ba178f8a2cc03 (patch) | |
tree | 61d8994ed00550ae641e2a5743e072a1c02654fb /net | |
parent | 1db2ea398ffbfd9ea46d509ff0e4a85bb4b8c0ea (diff) |
[PATCH] fix iptables __user misannotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 800067d69a9a..78a44b01c035 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
@@ -1364,15 +1364,15 @@ struct compat_ipt_replace { | |||
1364 | }; | 1364 | }; |
1365 | 1365 | ||
1366 | static inline int compat_copy_match_to_user(struct ipt_entry_match *m, | 1366 | static inline int compat_copy_match_to_user(struct ipt_entry_match *m, |
1367 | void * __user *dstptr, compat_uint_t *size) | 1367 | void __user **dstptr, compat_uint_t *size) |
1368 | { | 1368 | { |
1369 | return xt_compat_match_to_user(m, dstptr, size); | 1369 | return xt_compat_match_to_user(m, dstptr, size); |
1370 | } | 1370 | } |
1371 | 1371 | ||
1372 | static int compat_copy_entry_to_user(struct ipt_entry *e, | 1372 | static int compat_copy_entry_to_user(struct ipt_entry *e, |
1373 | void * __user *dstptr, compat_uint_t *size) | 1373 | void __user **dstptr, compat_uint_t *size) |
1374 | { | 1374 | { |
1375 | struct ipt_entry_target __user *t; | 1375 | struct ipt_entry_target *t; |
1376 | struct compat_ipt_entry __user *ce; | 1376 | struct compat_ipt_entry __user *ce; |
1377 | u_int16_t target_offset, next_offset; | 1377 | u_int16_t target_offset, next_offset; |
1378 | compat_uint_t origsize; | 1378 | compat_uint_t origsize; |