Bluetooth: hci_h4: Fix padding calculation error within h4_recv_buf()
Subsystems (2)
PATCH 1/1 Bluetooth: hci_h4: Fix padding calculation error within h4_recv_buf()
From: Zijun Hu <[email protected]>
it is erroneous to calculate padding by subtracting length of type indication from skb->len, it will cause data analysis error for alignment which is greater than 1, so fixed by adding length of type indication with skb->len.
Signed-off-by Zijun Hu <[email protected]>
--- drivers/bluetooth/hci_h4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bluetooth/hci_h4.c +2 -2
@@ -252,7 +252,7 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb, }if (!dlen) { - hu->padding = (skb->len -1 ) % alignment; + hu->padding = (skb->len +1 ) % alignment; hu->padding = (alignment - hu->padding) % alignment;/* No more data, complete frame */
@@ -260,7 +260,7 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb, skb =NULL ; } }else { - hu->padding = (skb->len -1 ) % alignment; + hu->padding = (skb->len +1 ) % alignment; hu->padding = (alignment - hu->padding) % alignment;/* Complete frame */
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
could you please code review for this patch?
Quoted 35 lines · Zijun Hu
From: Zijun Hu <[email protected]>
it is erroneous to calculate padding by subtracting length of type indication from
skb->len, it will cause data analysis error for alignment which is greater than 1, so fixed by adding length of type indication withskb->len.Signed-off-by Zijun Hu <[email protected]>--- drivers/bluetooth/hci_h4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/bluetooth/hci_h4.c +2
-2@@ -252,7 +252,7 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb, }if (!dlen) { - hu->padding = (skb->len -1 ) % alignment; + hu->padding = (skb->len +1 ) % alignment; hu->padding = (alignment - hu->padding) % alignment;/* No more data, complete frame */ @@ -260,7 +260,7 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb, skb =NULL ; } }else { - hu->padding = (skb->len -1 ) % alignment; + hu->padding = (skb->len +1 ) % alignment; hu->padding = (alignment - hu->padding) % alignment;/* Complete frame */