| Message ID | tencent_EDCC88A7DB46D3D2F7C64449976EC56EE006@qq.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
| Series | Bluetooth: fix oob in hci_sock_setsockopt | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | fail | error: patch failed: net/bluetooth/hci_sock.c:1946 error: net/bluetooth/hci_sock.c: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch |
Hi Edward, On Tue, Apr 9, 2024 at 9:42 AM Edward Adam Davis <eadavis@qq.com> wrote: > > If len < sizeof(opt) it will trigger oob, so take the min of them. > > Reported-by: syzbot+837ba09d9db969068367@syzkaller.appspotmail.com > Signed-off-by: Edward Adam Davis <eadavis@qq.com> > --- > net/bluetooth/hci_sock.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c > index 4ee1b976678b..cee7ec1adbd2 100644 > --- a/net/bluetooth/hci_sock.c > +++ b/net/bluetooth/hci_sock.c > @@ -1946,7 +1946,7 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname, > > switch (optname) { > case HCI_DATA_DIR: > - if (copy_from_sockptr(&opt, optval, sizeof(opt))) { > + if (copy_from_sockptr(&opt, optval, min_t(int, sizeof(opt), len))) { > err = -EFAULT; > break; > } > -- > 2.43.0 https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=35d2c39b23fffa3d5a216142cc51d86354024363
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 4ee1b976678b..cee7ec1adbd2 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -1946,7 +1946,7 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname, switch (optname) { case HCI_DATA_DIR: - if (copy_from_sockptr(&opt, optval, sizeof(opt))) { + if (copy_from_sockptr(&opt, optval, min_t(int, sizeof(opt), len))) { err = -EFAULT; break; }
If len < sizeof(opt) it will trigger oob, so take the min of them. Reported-by: syzbot+837ba09d9db969068367@syzkaller.appspotmail.com Signed-off-by: Edward Adam Davis <eadavis@qq.com> --- net/bluetooth/hci_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)