Commit 33222383 authored by Graf Yang's avatar Graf Yang Committed by David S. Miller
Browse files

irda: Fix a misalign access issue. (v2)



Replace u16ho with put/get_unaligned functions
Signed-off-by: default avatarGraf Yang <graf.yang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1cc678a
...@@ -57,9 +57,6 @@ typedef union { ...@@ -57,9 +57,6 @@ typedef union {
__u8 byte[2]; __u8 byte[2];
} __u16_host_order; } __u16_host_order;
/* Same purpose, different application */
#define u16ho(array) (* ((__u16 *) array))
/* Types of discovery */ /* Types of discovery */
typedef enum { typedef enum {
DISCOVERY_LOG, /* What's in our discovery log */ DISCOVERY_LOG, /* What's in our discovery log */
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#include <net/irda/discovery.h> #include <net/irda/discovery.h>
#include <asm/unaligned.h>
/* /*
* Function irlmp_add_discovery (cachelog, discovery) * Function irlmp_add_discovery (cachelog, discovery)
* *
...@@ -87,7 +89,7 @@ void irlmp_add_discovery(hashbin_t *cachelog, discovery_t *new) ...@@ -87,7 +89,7 @@ void irlmp_add_discovery(hashbin_t *cachelog, discovery_t *new)
*/ */
hashbin_remove_this(cachelog, (irda_queue_t *) node); hashbin_remove_this(cachelog, (irda_queue_t *) node);
/* Check if hints bits are unchanged */ /* 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 */ /* Set time of first discovery for this node */
new->firststamp = node->firststamp; new->firststamp = node->firststamp;
kfree(node); kfree(node);
...@@ -281,9 +283,9 @@ struct irda_device_info *irlmp_copy_discoveries(hashbin_t *log, int *pn, ...@@ -281,9 +283,9 @@ struct irda_device_info *irlmp_copy_discoveries(hashbin_t *log, int *pn,
/* Mask out the ones we don't want : /* Mask out the ones we don't want :
* We want to match the discovery mask, and to get only * We want to match the discovery mask, and to get only
* the most recent one (unless we want old ones) */ * 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) || ((old_entries) ||
((jiffies - discovery->firststamp) < j_timeout)) ) { ((jiffies - discovery->firststamp) < j_timeout))) {
/* Create buffer as needed. /* Create buffer as needed.
* As this function get called a lot and most time * As this function get called a lot and most time
* we don't have anything to put in the log (we are * we don't have anything to put in the log (we are
......
...@@ -1062,7 +1062,8 @@ void irlmp_discovery_expiry(discinfo_t *expiries, int number) ...@@ -1062,7 +1062,8 @@ void irlmp_discovery_expiry(discinfo_t *expiries, int number)
for(i = 0; i < number; i++) { for(i = 0; i < number; i++) {
/* Check if we should notify client */ /* Check if we should notify client */
if ((client->expir_callback) && if ((client->expir_callback) &&
(client->hint_mask.word & u16ho(expiries[i].hints) (client->hint_mask.word &
get_unaligned((__u16 *)expiries[i].hints)
& 0x7f7f) ) & 0x7f7f) )
client->expir_callback(&(expiries[i]), client->expir_callback(&(expiries[i]),
EXPIRY_TIMEOUT, EXPIRY_TIMEOUT,
...@@ -1086,7 +1087,7 @@ discovery_t *irlmp_get_discovery_response(void) ...@@ -1086,7 +1087,7 @@ discovery_t *irlmp_get_discovery_response(void)
IRDA_ASSERT(irlmp != NULL, return NULL;); IRDA_ASSERT(irlmp != NULL, return NULL;);
u16ho(irlmp->discovery_rsp.data.hints) = irlmp->hints.word; put_unaligned(irlmp->hints.word, (__u16 *)irlmp->discovery_rsp.data.hints);
/* /*
* Set character set for device name (we use ASCII), and * Set character set for device name (we use ASCII), and
......
...@@ -1673,7 +1673,7 @@ irnet_discovery_indication(discinfo_t * discovery, ...@@ -1673,7 +1673,7 @@ irnet_discovery_indication(discinfo_t * discovery,
/* Notify the control channel */ /* Notify the control channel */
irnet_post_event(NULL, IRNET_DISCOVER, irnet_post_event(NULL, IRNET_DISCOVER,
discovery->saddr, discovery->daddr, discovery->info, discovery->saddr, discovery->daddr, discovery->info,
u16ho(discovery->hints)); get_unaligned((__u16 *)discovery->hints));
DEXIT(IRDA_OCB_TRACE, "\n"); DEXIT(IRDA_OCB_TRACE, "\n");
} }
...@@ -1704,7 +1704,7 @@ irnet_expiry_indication(discinfo_t * expiry, ...@@ -1704,7 +1704,7 @@ irnet_expiry_indication(discinfo_t * expiry,
/* Notify the control channel */ /* Notify the control channel */
irnet_post_event(NULL, IRNET_EXPIRE, irnet_post_event(NULL, IRNET_EXPIRE,
expiry->saddr, expiry->daddr, expiry->info, expiry->saddr, expiry->daddr, expiry->info,
u16ho(expiry->hints)); get_unaligned((__u16 *)expiry->hints));
DEXIT(IRDA_OCB_TRACE, "\n"); DEXIT(IRDA_OCB_TRACE, "\n");
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment