linux-kernel - Re: [PATCH] Bluetooth: bfusb: Updated code to follow style guide

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date: Fri, 08 Mar 2024 10:08:46 -0800
From: Joe Perches <joe@...ches.com>
To: Ayaan Mirza Baig <ayaanmirza.788@...il.com>, marcel@...tmann.org, 
	luiz.dentz@...il.com
Cc: linux-bluetooth@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Bluetooth: bfusb: Updated code to follow style guide

On Fri, 2024-03-08 at 21:50 +0530, Ayaan Mirza Baig wrote:
> Added indendations, removed trailing spaces, added empty lines after declaration.

indendations/indentations.

Do please try to not just mollify checkpatch message bleats
but try to make the code more intelligible.

I think the tests are backwards would better be written
with fewer block indentations and direct returns without
creating used-once temporaries like:

---
 drivers/bluetooth/bfusb.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index cab93935cc7f1..68587424187e6 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -273,33 +273,27 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch
 
 		switch (pkt_type) {
 		case HCI_EVENT_PKT:
-			if (len >= HCI_EVENT_HDR_SIZE) {
-				struct hci_event_hdr *hdr = (struct hci_event_hdr *) buf;
-				pkt_len = HCI_EVENT_HDR_SIZE + hdr->plen;
-			} else {
+			if (len < HCI_EVENT_HDR_SIZE) {
 				bt_dev_err(data->hdev, "event block is too short");
 				return -EILSEQ;
 			}
+			pkt_len = HCI_EVENT_HDR_SIZE + ((struct hci_event_hdr *)buf)->plen;
 			break;
 
 		case HCI_ACLDATA_PKT:
-			if (len >= HCI_ACL_HDR_SIZE) {
-				struct hci_acl_hdr *hdr = (struct hci_acl_hdr *) buf;
-				pkt_len = HCI_ACL_HDR_SIZE + __le16_to_cpu(hdr->dlen);
-			} else {
+			if (len < HCI_ACL_HDR_SIZE) {
 				bt_dev_err(data->hdev, "data block is too short");
 				return -EILSEQ;
 			}
+			pkt_len = HCI_ACL_HDR_SIZE + __le16_to_cpu(((struct hci_acl_hdr *)buf)->dlen);
 			break;
 
 		case HCI_SCODATA_PKT:
-			if (len >= HCI_SCO_HDR_SIZE) {
-				struct hci_sco_hdr *hdr = (struct hci_sco_hdr *) buf;
-				pkt_len = HCI_SCO_HDR_SIZE + hdr->dlen;
-			} else {
+			if (len < HCI_SCO_HDR_SIZE) {
 				bt_dev_err(data->hdev, "audio block is too short");
 				return -EILSEQ;
 			}
+			pkt_len = HCI_SCO_HDR_SIZE + ((struct hci_sco_hdr *)buf)->dlen;
 			break;
 		}
 
@@ -365,9 +359,8 @@ static void bfusb_rx_complete(struct urb *urb)
 			buf   += 3;
 		}
 
-		if (count < len) {
+		if (count < len)
 			bt_dev_err(data->hdev, "block extends over URB buffer ranges");
-		}
 
 		if ((hdr & 0xe1) == 0xc1)
 			bfusb_recv_block(data, hdr, buf, len);