Bluetooth: bnep: Fix out-of-bound access
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 28 Feb 2024 17:11:08 +0000 (12:11 -0500)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 6 Mar 2024 22:26:24 +0000 (17:26 -0500)
This fixes attempting to access past ethhdr.h_source, although it seems
intentional to copy also the contents of h_proto this triggers
out-of-bound access problems with the likes of static analyzer, so this
instead just copy ETH_ALEN and then proceed to use put_unaligned to copy
h_proto separetely.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
net/bluetooth/bnep/core.c

index 8c3f8d0..ec45f77 100644 (file)
@@ -385,7 +385,8 @@ static int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 
        case BNEP_COMPRESSED_DST_ONLY:
                __skb_put_data(nskb, skb_mac_header(skb), ETH_ALEN);
-               __skb_put_data(nskb, s->eh.h_source, ETH_ALEN + 2);
+               __skb_put_data(nskb, s->eh.h_source, ETH_ALEN);
+               put_unaligned(s->eh.h_proto, (__be16 *)__skb_put(nskb, 2));
                break;
 
        case BNEP_GENERAL: