Bluetooth: hidp: NUL terminate a string in the compat ioctl
Subsystems (4)
PATCH 1/1 Bluetooth: hidp: NUL terminate a string in the compat ioctl
This change is similar to commit a1616a5ac99e ("Bluetooth: hidp: fix buffer overflow") but for the compat ioctl. We take a string from the user and forgot to ensure that it's NUL terminated.
I have also changed the strncpy() in to strscpy() in hidp_setup_hid(). The difference is the strncpy() doesn't necessarily NUL terminate the destination string. Either change would fix the problem but it's nice to take a belt and suspenders approach and do both.
--- net/bluetooth/hidp/core.c | 2 +- net/bluetooth/hidp/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
net/bluetooth/hidp/core.c +1 -1
@@ -775,7 +775,7 @@ static int hidp_setup_hid(struct hidp_session *session, hid->version = req->version; hid->country = req->country; -strncpy (hid->name, req->name,sizeof (hid->name)); +strscpy (hid->name, req->name,sizeof (hid->name));snprintf (hid->phys,sizeof (hid->phys),"%pMR" , &l2cap_pi (session->ctrl_sock->sk)->chan->src);
net/bluetooth/hidp/sock.c +1 -0
@@ -192,6 +192,7 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne ca.version = ca32.version; ca.flags = ca32.flags; ca.idle_to = ca32.idle_to; + ca32.name[sizeof (ca32.name) -1 ] ='\0' ;memcpy (ca.name, ca32.name,128 ); csock =sockfd_lookup (ca.ctrl_sock, &err);
Signature · 1 line
2.20.1
Marcel Holtmann
maintainerHi Dan,
Quoted 9 lines
This change is similar to commit
a1616a5ac99e("Bluetooth: hidp: fix buffer overflow") but for the compat ioctl. We take a string from the user and forgot to ensure that it's NUL terminated.I have also changed the
strncpy()in tostrscpy()inhidp_setup_hid(). The difference is thestrncpy()doesn't necessarily NUL terminate the destination string. Either change would fix the problem but it's nice to take a belt and suspenders approach and do both.
Quoted 5 lines
Signed-off-by Dan Carpenter <[email protected]>---
net/bluetooth/hidp/core.c| 2 +-net/bluetooth/hidp/sock.c| 1 +2 files changed, 2 insertions(+), 1 deletion(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel