ping On Mon, Aug 30, 2010 at 2:18 PM, steven.miao <realmz6@xxxxxxxxx> wrote: > From: realmz <realmz6@xxxxxxxxx> > > In function l2cap_get_conf_opt() and l2cap_add_conf_opt() the address of > opt->val sometimes is not at the edge of 2-bytes/4-bytes, so 2-bytes/4 bytes > access will cause data misalignment exeception. Use get_unaligned_le16/32 > and put_unaligned_le16/32 function to avoid data misalignment execption. > --- > net/bluetooth/l2cap.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c > index fadf26b..a07dad8 100644 > --- a/net/bluetooth/l2cap.c > +++ b/net/bluetooth/l2cap.c > @@ -2406,11 +2406,11 @@ static inline int l2cap_get_conf_opt(void **ptr, int *type, int *olen, unsigned > break; > > case 2: > - *val = __le16_to_cpu(*((__le16 *) opt->val)); > + *val = get_unaligned_le16(opt->val); > break; > > case 4: > - *val = __le32_to_cpu(*((__le32 *) opt->val)); > + *val = get_unaligned_le32(opt->val); > break; > > default: > @@ -2437,11 +2437,11 @@ static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val) > break; > > case 2: > - *((__le16 *) opt->val) = cpu_to_le16(val); > + put_unaligned_le16(cpu_to_le16(val), opt->val); > break; > > case 4: > - *((__le32 *) opt->val) = cpu_to_le32(val); > + put_unaligned_le32(cpu_to_le32(val), opt->val); > break; > > default: > -- > 1.5.6.5 > > -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
