Bluetooth: bnep: fix out-of-bounds reads on short RX/TX frames and control fallthrough
Subsystems (2)
PATCH 1/1 Bluetooth: bnep: fix out-of-bounds reads on short RX/TX frames and control fallthrough
Fix multiple out-of-bounds reads in Bluetooth BNEP frame processing:
1. In bnep_rx_frame() and bnep_ctrl_frame() (net/bluetooth/bnep/core.c), use pskb_may_pull() to verify the BNEP header, control type byte, filter count, and extension headers exist before reading them, and return 0 after handling BNEP_CONTROL instead of falling through to Ethernet frame submission when no extension headers follow.
2. In bnep_net_xmit() (net/bluetooth/bnep/netdev.c), verify skb->len >= ETH_HLEN with pskb_may_pull() before reading the 14-byte Ethernet header to prevent an out-of-bounds heap read and infoleak on short AF_PACKET TX frames.
---
net/bluetooth/bnep/core.c +16 -1
@@ -270,9 +270,14 @@ static int bnep_rx_extension(struct bnep_session *s, struct sk_buff *skb)BT_DBG ("type 0x%x len %u" , h->type, h->len); +if (skb->len < h->len) { + err = -EILSEQ ; +break ; + } +switch (h->type &BNEP_TYPE_MASK ) {case BNEP_EXT_CONTROL : -bnep_rx_control (s, skb->data, skb->len); +bnep_rx_control (s, skb->data, h->len);break ;default :
@@ -373,6 +378,11 @@ static int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb) goto badframe; } +if ((type &BNEP_TYPE_MASK ) ==BNEP_CONTROL ) { +kfree_skb (skb); +return 0 ; + } +/* Strip 802.1p header */ if (ntohs (s->eh.h_proto) ==ETH_P_8021Q ) {if (!skb_pull (skb,4 ))
@@ -451,6 +461,11 @@ static int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb) goto send; } +if (skb->len <ETH_HLEN ) { +kfree_skb (skb); +return 0 ; + } + iv[il++] = (struct kvec ) { &type,1 }; len++;
net/bluetooth/bnep/netdev.c +7 -1
@@ -166,6 +166,12 @@ static netdev_tx_t bnep_net_xmit(struct sk_buff *skb,BT_DBG ("skb %p, dev %p" , skb, dev); +if (!pskb_may_pull (skb,ETH_HLEN )) { + dev->stats.tx_dropped++; +kfree_skb (skb); +return NETDEV_TX_OK ; + } +#ifdef CONFIG_BT_BNEP_MC_FILTER if (bnep_net_mc_filter (skb, s)) {kfree_skb (skb);
@@ -218,7 +224,7 @@ void bnep_net_setup(struct net_device *dev) dev->addr_len =ETH_ALEN ;ether_setup (dev); - dev->min_mtu =0 ; + dev->min_mtu =ETH_MIN_MTU ; dev->max_mtu =ETH_MAX_MTU ; dev->priv_flags &= ~IFF_TX_SKB_SHARING ; dev->netdev_ops = &bnep_netdev_ops;
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/1169457/
---Test result---
Test Summary:
CheckPatch PASS 0.88 seconds VerifyFixes PASS 0.09 seconds VerifySignedoff PASS 0.09 seconds GitLint FAIL 0.26 seconds SubjectPrefix PASS 0.09 seconds BuildKernel PASS 29.26 seconds CheckAllWarning PASS 33.50 seconds CheckSparse PASS 35.64 seconds BuildKernel32 PASS 28.73 seconds CheckKernelLLVM PASS 35.74 seconds TestRunnerSetup PASS 792.48 seconds TestRunner_bnep-tester PASS 4.48 seconds IncrementalBuild PASS 27.85 seconds
Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
Bluetooth: bnep: fix out-of-bounds reads on short RX/TX frames and control fallthrough
1: T1 Title exceeds max length (86>80): "Bluetooth: bnep: fix out-of-bounds reads on short RX/TX frames and control fallthrough"
https://github.com/bluez/bluetooth-next/pull/800
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 12 lines · On Sat, 19 Sep 2026 22:17:38 +0000 you wrote:
Fix multiple out-of-bounds reads in Bluetooth BNEP frame processing:
1. In
bnep_rx_frame()andbnep_ctrl_frame()(net/bluetooth/bnep/core.c), usepskb_may_pull()to verify the BNEP header, control type byte, filter count, and extension headers exist before reading them, and return 0 after handlingBNEP_CONTROLinstead of falling through to Ethernet frame submission when no extension headers follow.
2. Inbnep_net_xmit()(net/bluetooth/bnep/netdev.c), verifyskb->len>=ETH_HLENwithpskb_may_pull()before reading the 14-byte Ethernet header to prevent an out-of-bounds heap read and infoleak on shortAF_PACKETTX frames.
Quoted 1 line
[...]
Here is the summary with links:
- Bluetooth: bnep: fix out-of-bounds reads on short RX/TX frames and control fallthrough
https://git.kernel.org/bluetooth/bluetooth-next/c/f0ca020cbb9b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html