diff options
| author | Graf Yang <graf.yang@analog.com> | 2008-05-14 08:25:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-14 08:25:57 +0200 |
| commit | 332223831e86b2e17b48b4afafad07d8e3b73861 (patch) | |
| tree | a3bd42005c91888c3cb20ec0ca6880e3181e7acb /net/irda/discovery.c | |
| parent | sctp: Fix use of uninitialized pointer (diff) | |
| download | linux-332223831e86b2e17b48b4afafad07d8e3b73861.tar.xz linux-332223831e86b2e17b48b4afafad07d8e3b73861.zip | |
irda: Fix a misalign access issue. (v2)
Replace u16ho with put/get_unaligned functions
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/discovery.c')
| -rw-r--r-- | net/irda/discovery.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/irda/discovery.c b/net/irda/discovery.c index bfacef8b76f4..a6f99b5a1499 100644 --- a/net/irda/discovery.c +++ b/net/irda/discovery.c @@ -40,6 +40,8 @@ #include <net/irda/discovery.h> +#include <asm/unaligned.h> + /* * Function irlmp_add_discovery (cachelog, discovery) * @@ -87,7 +89,7 @@ void irlmp_add_discovery(hashbin_t *cachelog, discovery_t *new) */ hashbin_remove_this(cachelog, (irda_queue_t *) node); /* Check if hints bits are unchanged */ - if(u16ho(node->data.hints) == u16ho(new->data.hints)) + if (get_unaligned((__u16 *)node->data.hints) == get_unaligned((__u16 *)new->data.hints)) /* Set time of first discovery for this node */ new->firststamp = node->firststamp; kfree(node); @@ -281,9 +283,9 @@ struct irda_device_info *irlmp_copy_discoveries(hashbin_t *log, int *pn, /* Mask out the ones we don't want : * We want to match the discovery mask, and to get only * the most recent one (unless we want old ones) */ - if ((u16ho(discovery->data.hints) & mask) && + if ((get_unaligned((__u16 *)discovery->data.hints) & mask) && ((old_entries) || - ((jiffies - discovery->firststamp) < j_timeout)) ) { + ((jiffies - discovery->firststamp) < j_timeout))) { /* Create buffer as needed. * As this function get called a lot and most time * we don't have anything to put in the log (we are |