From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Correct assoc_len and fix warning for x86-64 by using %zu specifier
reported by Fengguang Wu <fengguang.wu@xxxxxxxxx>.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
---
v2: make assoc_len type of size_t
net/bluetooth/a2mp.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index a55449e..d4946b5 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -381,12 +381,15 @@ static int a2mp_getampassoc_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
struct hci_dev *hdev;
struct amp_ctrl *ctrl;
struct hci_conn *hcon;
+ size_t assoc_len;
if (len < sizeof(*rsp))
return -EINVAL;
- BT_DBG("id %d status 0x%2.2x assoc len %lu", rsp->id, rsp->status,
- len - sizeof(*rsp));
+ assoc_len = len - sizeof(*rsp);
+
+ BT_DBG("id %d status 0x%2.2x assoc len %zu", rsp->id, rsp->status,
+ assoc_len);
if (rsp->status)
return -EINVAL;
@@ -394,7 +397,7 @@ static int a2mp_getampassoc_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
/* Save remote ASSOC data */
ctrl = amp_ctrl_lookup(mgr, rsp->id);
if (ctrl) {
- u8 *assoc, assoc_len = len - sizeof(*rsp);
+ u8 *assoc;
assoc = kzalloc(assoc_len, GFP_KERNEL);
if (!assoc) {
@@ -468,7 +471,8 @@ static int a2mp_createphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
}
if (ctrl) {
- u8 *assoc, assoc_len = le16_to_cpu(hdr->len) - sizeof(*req);
+ size_t assoc_len = le16_to_cpu(hdr->len) - sizeof(*req);
+ u8 *assoc;
ctrl->id = rsp.remote_id;
--
1.7.9.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
