提交 bfaaeb3e 编写于 作者: S steven miao 提交者: Gustavo F. Padovan

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: Nsteven miao <realmz6@gmail.com>
Signed-off-by: NMike Frysinger <vapier@gentoo.org>
Acked-by: NMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: NGustavo F. Padovan <padovan@profusion.mobi>
上级 556ea928
......@@ -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:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册