[PATCH RESEND] Bluetooth: btintel: Drop dead !skb check in btintel_read_version()

[PATCH RESEND] Bluetooth: btintel: Drop dead !skb check in btintel_read_version()

[Ingyu Jang]

__hci_cmd_sync() returns either an ERR_PTR or a valid non-NULL skb;
its internal NULL cases are converted to ERR_PTR(-ENODATA) before
return (net/bluetooth/hci_sync.c). After the preceding IS_ERR(skb)
filter, skb is guaranteed to be a valid non-NULL pointer, so the
!skb disjunct in the subsequent length check never triggers.

Drop the dead !skb subexpression; the skb->len size mismatch check
remains the real guard.

Signed-off-by: Ingyu Jang <ingyujang25@korea.ac.kr>
---
Resending, as there has been no response since 2026-07-11.
Rebased onto current mainline; no other changes.

 drivers/bluetooth/btintel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index 0709fb3212f96..4aff00e41d43e 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -471,7 +471,7 @@ int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver)
 		return PTR_ERR(skb);
 	}
 
-	if (!skb || skb->len != sizeof(*ver)) {
+	if (skb->len != sizeof(*ver)) {
 		bt_dev_err(hdev, "Intel version event size mismatch");
 		kfree_skb(skb);
 		return -EILSEQ;
-- 
2.34.1

RE: [RESEND] Bluetooth: btintel: Drop dead !skb check in btintel_read_version()

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/series/1198111/

---Test result---

Test Summary:
CheckPatch                    PASS      0.63 seconds
VerifyFixes                   PASS      0.09 seconds
VerifySignedoff               PASS      0.09 seconds
GitLint                       PASS      0.26 seconds
SubjectPrefix                 PASS      0.08 seconds
BuildKernel                   PASS      30.95 seconds
CheckAllWarning               PASS      35.33 seconds
CheckSparse                   PASS      38.44 seconds
BuildKernel32                 PASS      31.77 seconds
CheckKernelLLVM               PASS      33.42 seconds
TestRunnerSetup               PASS      736.54 seconds
IncrementalBuild              PASS      29.20 seconds



https://github.com/bluez/bluetooth-next/pull/1036

---
Regards,
Linux Bluetooth