leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: ISO: Fix memory corruption

Browse Source 
The following memory corruption can happen since iso_pinfo.base size
did not account for its headers (4 bytes):

net/bluetooth/eir.c
    76          memcpy(&eir[eir_len], data, data_len);
                            ^^^^^^^         ^^^^^^^^
    77          eir_len += data_len;
    78
    79          return eir_len;
    80  }

The "eir" buffer has 252 bytes and data_len is 252 but we do a memcpy()
to &eir[4] so this can corrupt 4 bytes beyond the end of the buffer.

Fixes: f764a6c2c1 ("Bluetooth: ISO: Add broadcast support")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
This commit is contained in:
Luiz Augusto von Dentz 2022-07-29 11:03:27 -07:00
parent ce78e557ff
commit b444342327
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/bluetooth/iso.c
View File

@ -44,6 +44,9 @@ static void iso_sock_kill(struct sock *sk);
/* ----- ISO socket info ----- */ /* ----- ISO socket info ----- */
#define iso_pi(sk) ((struct iso_pinfo *)sk) #define iso_pi(sk) ((struct iso_pinfo *)sk)
#define EIR_SERVICE_DATA_LENGTH 4
#define BASE_MAX_LENGTH (HCI_MAX_PER_AD_LENGTH - EIR_SERVICE_DATA_LENGTH)
struct iso_pinfo { struct iso_pinfo {
struct bt_sock bt; struct bt_sock bt;
bdaddr_t src; bdaddr_t src;
@ -57,7 +60,7 @@ struct iso_pinfo {
__u32 flags; __u32 flags;
struct bt_iso_qos qos; struct bt_iso_qos qos;
__u8 base_len; __u8 base_len;
__u8 base[HCI_MAX_PER_AD_LENGTH]; __u8 base[BASE_MAX_LENGTH];
struct iso_conn *conn; struct iso_conn *conn;
}; };