summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorSean Wang <sean.wang@mediatek.com>2019-03-18 16:58:33 -0400
committerMarcel Holtmann <marcel@holtmann.org>2019-04-23 12:09:08 -0400
commit637c8e9013912f3161260bcaf74a184440aae363 (patch)
tree521ef661a9569b9a8879a8eb643eef8e4f7f7640 /drivers/bluetooth
parentafa8d3160add52e79c1d022ce22d20528d462910 (diff)
Bluetooth: btmtksdio: fix uninitialized symbol errors in btmtksdio_rx_packet
Fixed all the below warnings. They would probably cause the following error handling path would use the uninitialized value and then produce unexpected behavior. drivers/bluetooth/btmtksdio.c:470:2: warning: ‘old_len’ may be used uninitialized in this function [-Wmaybe-uninitialized] print_hex_dump(KERN_ERR, "err sdio rx: ", DUMP_PREFIX_NONE, 4, 1, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ old_data, old_len, true); ~~~~~~~~~~~~~~~~~~~~~~~~ drivers/bluetooth/btmtksdio.c:376:15: note: ‘old_len’ was declared here unsigned int old_len; ^~~~~~~ drivers/bluetooth/btmtksdio.c:470:2: warning: ‘old_data’ may be used uninitialized in this function [-Wmaybe-uninitialized] print_hex_dump(KERN_ERR, "err sdio rx: ", DUMP_PREFIX_NONE, 4, 1, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ old_data, old_len, true); ~~~~~~~~~~~~~~~~~~~~~~~~ drivers/bluetooth/btmtksdio.c:375:17: note: ‘old_data’ was declared here unsigned char *old_data; ^~~~~~~~ v2: Remove old_len and old_data because the error path for sdio_readsb also seems wrong. And change the prefix from "mediatek" to "btmtksdio". Fixes: d74eef2834b5 ("Bluetooth: mediatek: add support for MediaTek MT7663S and MT7668S SDIO devices") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Reported-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Sean Wang <sean.wang@mediatek.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btmtksdio.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index befe43f9a34a..7d0d1cb93b0e 100644
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -372,8 +372,6 @@ static int btmtksdio_rx_packet(struct btmtksdio_dev *bdev, u16 rx_size)
372 const struct h4_recv_pkt *pkts = mtk_recv_pkts; 372 const struct h4_recv_pkt *pkts = mtk_recv_pkts;
373 int pkts_count = ARRAY_SIZE(mtk_recv_pkts); 373 int pkts_count = ARRAY_SIZE(mtk_recv_pkts);
374 struct mtkbtsdio_hdr *sdio_hdr; 374 struct mtkbtsdio_hdr *sdio_hdr;
375 unsigned char *old_data;
376 unsigned int old_len;
377 int err, i, pad_size; 375 int err, i, pad_size;
378 struct sk_buff *skb; 376 struct sk_buff *skb;
379 u16 dlen; 377 u16 dlen;
@@ -392,12 +390,6 @@ static int btmtksdio_rx_packet(struct btmtksdio_dev *bdev, u16 rx_size)
392 if (err < 0) 390 if (err < 0)
393 goto err_kfree_skb; 391 goto err_kfree_skb;
394 392
395 /* Keep old data for dump the content in case of some error is
396 * caught in the following packet parsing.
397 */
398 old_data = skb->data;
399 old_len = skb->len;
400
401 bdev->hdev->stat.byte_rx += rx_size; 393 bdev->hdev->stat.byte_rx += rx_size;
402 394
403 sdio_hdr = (void *)skb->data; 395 sdio_hdr = (void *)skb->data;
@@ -467,8 +459,6 @@ static int btmtksdio_rx_packet(struct btmtksdio_dev *bdev, u16 rx_size)
467 return 0; 459 return 0;
468 460
469err_kfree_skb: 461err_kfree_skb:
470 print_hex_dump(KERN_ERR, "err sdio rx: ", DUMP_PREFIX_NONE, 4, 1,
471 old_data, old_len, true);
472 kfree_skb(skb); 462 kfree_skb(skb);
473 463
474 return err; 464 return err;