aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteven miao <realmz6@gmail.com>2010-10-16 18:29:47 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2010-11-09 00:56:00 -0200
commitbfaaeb3ed5533a2dd38e3aa9ea43efd619690aed (patch)
tree8a7a46f99f20d8a637e1867b6309c3e6b88f47da
parent556ea928f78a390fe16ae584e6433dff304d3014 (diff)
downloadmrst-s0i3-test-bfaaeb3ed5533a2dd38e3aa9ea43efd619690aed.tar.gz
mrst-s0i3-test-bfaaeb3ed5533a2dd38e3aa9ea43efd619690aed.tar.xz
mrst-s0i3-test-bfaaeb3ed5533a2dd38e3aa9ea43efd619690aed.zip
Bluetooth: fix unaligned access to l2cap conf data
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>
-rw-r--r--net/bluetooth/l2cap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index daa7a988d9a..b3fb02ab229 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -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:
@@ -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: