Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-3394-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <0000000000007558ae061553f41b@google.com> <tencent_EDCC88A7DB46D3D2F7C64449976EC56EE006@qq.com>
In-Reply-To: <tencent_EDCC88A7DB46D3D2F7C64449976EC56EE006@qq.com>
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date: Tue, 9 Apr 2024 10:13:06 -0400
Message-ID: <CABBYNZLA_AjSXTooBTqLccJschR4gUJ717hM_m1rcKv3fhye8w@mail.gmail.com>
Subject: Re: [PATCH] Bluetooth: fix oob in hci_sock_setsockopt
To: Edward Adam Davis <eadavis@qq.com>
Cc: syzbot+837ba09d9db969068367@syzkaller.appspotmail.com, 
	johan.hedberg@gmail.com, linux-bluetooth@vger.kernel.org, 
	linux-kernel@vger.kernel.org, marcel@holtmann.org, 
	syzkaller-bugs@googlegroups.com, netdev@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Edward,

On Tue, Apr 9, 2024 at 9:42=E2=80=AFAM Edward Adam Davis <eadavis@qq.com> w=
rote:
>
> 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 *s=
ock, 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 =3D -EFAULT;
>                         break;
>                 }
> --
> 2.43.0

https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.gi=
t/commit/?id=3D35d2c39b23fffa3d5a216142cc51d86354024363


--=20
Luiz Augusto von Dentz