Skip to content

Commit

Permalink
Bluetooth: fix unaligned access to l2cap conf data
Browse files Browse the repository at this point in the history
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.

Signed-off-by: steven miao <realmz6@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
  • Loading branch information
steven miao authored and Gustavo F. Padovan committed Nov 9, 2010
1 parent 556ea92 commit bfaaeb3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions net/bluetooth/l2cap.c
Original file line number Diff line number Diff line change
Expand Up @@ -2421,11 +2421,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:
Expand All @@ -2452,11 +2452,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:
Expand Down

0 comments on commit bfaaeb3

Please sign in to comment.