OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: A2MP: Fix not initializing all members 

This fixes various places where a stack variable is used uninitialized.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Luiz Augusto von Dentz 2020-08-06 11:17:11 -07:00 committed by Marcel Holtmann
parent c0ee0644df
commit eddb773211
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/bluetooth/a2mp.c
View File

@ -226,6 +226,9 @@ static int a2mp_discover_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
struct a2mp_info_req req; struct a2mp_info_req req;
found = true; found = true;
memset(&req, 0, sizeof(req));
req.id = cl->id; req.id = cl->id;
a2mp_send(mgr, A2MP_GETINFO_REQ, __next_ident(mgr), a2mp_send(mgr, A2MP_GETINFO_REQ, __next_ident(mgr),
sizeof(req), &req); sizeof(req), &req);
@ -305,6 +308,8 @@ static int a2mp_getinfo_req(struct amp_mgr *mgr, struct sk_buff *skb,
if (!hdev || hdev->dev_type != HCI_AMP) { if (!hdev || hdev->dev_type != HCI_AMP) {
struct a2mp_info_rsp rsp; struct a2mp_info_rsp rsp;
memset(&rsp, 0, sizeof(rsp));
rsp.id = req->id; rsp.id = req->id;
rsp.status = A2MP_STATUS_INVALID_CTRL_ID; rsp.status = A2MP_STATUS_INVALID_CTRL_ID;
@ -348,6 +353,8 @@ static int a2mp_getinfo_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
if (!ctrl) if (!ctrl)
return -ENOMEM; return -ENOMEM;
memset(&req, 0, sizeof(req));
req.id = rsp->id; req.id = rsp->id;
a2mp_send(mgr, A2MP_GETAMPASSOC_REQ, __next_ident(mgr), sizeof(req), a2mp_send(mgr, A2MP_GETAMPASSOC_REQ, __next_ident(mgr), sizeof(req),
&req); &req);
@ -376,6 +383,8 @@ static int a2mp_getampassoc_req(struct amp_mgr *mgr, struct sk_buff *skb,
struct a2mp_amp_assoc_rsp rsp; struct a2mp_amp_assoc_rsp rsp;
rsp.id = req->id; rsp.id = req->id;
memset(&rsp, 0, sizeof(rsp));
if (tmp) { if (tmp) {
rsp.status = A2MP_STATUS_COLLISION_OCCURED; rsp.status = A2MP_STATUS_COLLISION_OCCURED;
amp_mgr_put(tmp); amp_mgr_put(tmp);
@ -464,7 +473,6 @@ static int a2mp_createphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
struct a2mp_cmd *hdr) struct a2mp_cmd *hdr)
{ {
struct a2mp_physlink_req *req = (void *) skb->data; struct a2mp_physlink_req *req = (void *) skb->data;
struct a2mp_physlink_rsp rsp; struct a2mp_physlink_rsp rsp;
struct hci_dev *hdev; struct hci_dev *hdev;
struct hci_conn *hcon; struct hci_conn *hcon;
@ -475,6 +483,8 @@ static int a2mp_createphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
BT_DBG("local_id %d, remote_id %d", req->local_id, req->remote_id); BT_DBG("local_id %d, remote_id %d", req->local_id, req->remote_id);
memset(&rsp, 0, sizeof(rsp));
rsp.local_id = req->remote_id; rsp.local_id = req->remote_id;
rsp.remote_id = req->local_id; rsp.remote_id = req->local_id;
@ -553,6 +563,8 @@ static int a2mp_discphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
BT_DBG("local_id %d remote_id %d", req->local_id, req->remote_id); BT_DBG("local_id %d remote_id %d", req->local_id, req->remote_id);
memset(&rsp, 0, sizeof(rsp));
rsp.local_id = req->remote_id; rsp.local_id = req->remote_id;
rsp.remote_id = req->local_id; rsp.remote_id = req->local_id;
rsp.status = A2MP_STATUS_SUCCESS; rsp.status = A2MP_STATUS_SUCCESS;
@ -675,6 +687,8 @@ static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)
if (err) { if (err) {
struct a2mp_cmd_rej rej; struct a2mp_cmd_rej rej;
memset(&rej, 0, sizeof(rej));
rej.reason = cpu_to_le16(0); rej.reason = cpu_to_le16(0);
hdr = (void *) skb->data; hdr = (void *) skb->data;
@ -898,6 +912,8 @@ void a2mp_send_getinfo_rsp(struct hci_dev *hdev)
BT_DBG("%s mgr %p", hdev->name, mgr); BT_DBG("%s mgr %p", hdev->name, mgr);
memset(&rsp, 0, sizeof(rsp));
rsp.id = hdev->id; rsp.id = hdev->id;
rsp.status = A2MP_STATUS_INVALID_CTRL_ID; rsp.status = A2MP_STATUS_INVALID_CTRL_ID;
@ -995,6 +1011,8 @@ void a2mp_send_create_phy_link_rsp(struct hci_dev *hdev, u8 status)
if (!mgr) if (!mgr)
return; return;
memset(&rsp, 0, sizeof(rsp));
hs_hcon = hci_conn_hash_lookup_state(hdev, AMP_LINK, BT_CONNECT); hs_hcon = hci_conn_hash_lookup_state(hdev, AMP_LINK, BT_CONNECT);
if (!hs_hcon) { if (!hs_hcon) {
rsp.status = A2MP_STATUS_UNABLE_START_LINK_CREATION; rsp.status = A2MP_STATUS_UNABLE_START_LINK_CREATION;
@ -1027,6 +1045,8 @@ void a2mp_discover_amp(struct l2cap_chan *chan)
mgr->bredr_chan = chan; mgr->bredr_chan = chan;
memset(&req, 0, sizeof(req));
req.mtu = cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU); req.mtu = cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);
req.ext_feat = 0; req.ext_feat = 0;
a2mp_send(mgr, A2MP_DISCOVER_REQ, 1, sizeof(req), &req); a2mp_send(mgr, A2MP_DISCOVER_REQ, 1, sizeof(req), &req);