diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-04-21 22:52:04 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:29:37 -0400 |
commit | 97fc8d0bc58cd09e62dc06ea5a64b58841738934 (patch) | |
tree | d8e5c32caefe07161dbcb00bebba4c72089364e3 /net/ipv6 | |
parent | 952a10be3272c4b5b7839b09cb0483dc72137101 (diff) |
[IPV6] SNMP: Use put_unaligned() instead of memcpy().
Hint from David Miller <davem@davemloft.net>.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/proc.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index aba94316b77..7a00bedb6b9 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/proc_fs.h> | 23 | #include <linux/proc_fs.h> |
24 | #include <linux/seq_file.h> | 24 | #include <linux/seq_file.h> |
25 | #include <linux/stddef.h> | 25 | #include <linux/stddef.h> |
26 | #include <asm/unaligned.h> | ||
26 | #include <net/sock.h> | 27 | #include <net/sock.h> |
27 | #include <net/tcp.h> | 28 | #include <net/tcp.h> |
28 | #include <net/transp_v6.h> | 29 | #include <net/transp_v6.h> |
@@ -210,30 +211,23 @@ static const struct file_operations snmp6_seq_fops = { | |||
210 | }; | 211 | }; |
211 | #endif /* CONFIG_PROC_FS */ | 212 | #endif /* CONFIG_PROC_FS */ |
212 | 213 | ||
213 | /* | ||
214 | * Stats may not be aligned for u64, so use memcpy to avoid | ||
215 | * unaligned accesses. | ||
216 | */ | ||
217 | static inline void __set_u64(void *p, u64 v) | ||
218 | { | ||
219 | memcpy(p, &v, sizeof(u64)); | ||
220 | } | ||
221 | |||
222 | static inline void | 214 | static inline void |
223 | __snmp6_fill_stats(void *stats, void **mib, int items, int bytes) | 215 | __snmp6_fill_stats(u64 *stats, void **mib, int items, int bytes) |
224 | { | 216 | { |
225 | int i; | 217 | int i; |
226 | u8 *p = stats; | ||
227 | int pad = bytes - sizeof(u64) * items; | 218 | int pad = bytes - sizeof(u64) * items; |
228 | BUG_ON(pad < 0); | 219 | BUG_ON(pad < 0); |
229 | __set_u64(p, items); | 220 | |
230 | for (i = 1, p += sizeof(u64); i < items; i++, p += sizeof(u64)) | 221 | /* Use put_unaligned() because stats may not be aligned for u64. */ |
231 | __set_u64(p, fold_field(mib, i)); | 222 | put_unaligned(items, &stats[0]); |
232 | memset(p, 0, pad); | 223 | for (i = 1; i < items; i++) |
224 | put_unaligned(fold_field(mib, i), &stats[i]); | ||
225 | |||
226 | memset(&stats[items], 0, pad); | ||
233 | } | 227 | } |
234 | 228 | ||
235 | void | 229 | void |
236 | snmp6_fill_stats(void *stats, struct inet6_dev *idev, int attrtype, int bytes) | 230 | snmp6_fill_stats(u64 *stats, struct inet6_dev *idev, int attrtype, int bytes) |
237 | { | 231 | { |
238 | switch(attrtype) { | 232 | switch(attrtype) { |
239 | case IFLA_INET6_STATS: | 233 | case IFLA_INET6_STATS: |