From nobody Mon Apr 29 14:12:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSldw39wHz5JQLm; Mon, 29 Apr 2024 14:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSldw1hxVz4DlQ; Mon, 29 Apr 2024 14:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714399956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gr6s5ohI/Qv67Cf7c52cVgbi4U1rHjKHCsoIZebSWM8=; b=JQe//tcGKjdyMM4qAl2JYXc+QRZmCe0vELeSCFKfoMtd41TLU7hOLEam+z5fMUq4w8ur4W uru2h5psFAOkF2NKfZRhJ/TIOGDDjXw63sLkpTIuUDDqUt5oWWhHStFsuFEC0mMdInd/tv xs30cZvl7+xhVvBoeRD3CUR2I+wjO0MwXtkxnJ1LroMQRW2rvcnOrZmjgvxHLGZL5jB0j5 7GR7ymusxeOMrz8arfp8+uIsyDloedfXTuau7tYa0OwZNtVEgnkXqcKC/yLQGK5st9NKyA PJgOfb7n2oDlZHfpJVmTbxRPtaXzoVGdZg2Gf4A/Ms2VWcgMWmHrFLGkSFSWYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714399956; a=rsa-sha256; cv=none; b=KKYXnC5rQIdJB5mlahoBAA9HlQbv8YzqDDzIDi4SIwYtSki2XfwEUMda0x5KvJUYp/1l1B AqMa/+HSngb4veSNqcoBKkIf4yFjseZ9DDoWhvw3SpW+Kz7IibHvaxK9W8cRXa+ShqvRvu 4qVINIHXEp3wZaXPVLqK//KduJ01m+2TofTtOggl6Z7VrFYM+7yL0V6sLb4EwhPqHzwcOe xh4x/iO0lefstdddDI3WmWyd5FslD17r5WNEfZX3HsLpKxOW5o+j1Kzc9K39lXWMMqHEFY HQKL2yuFNuz1bVSOxrVZwNr3TLEsMqaVXqNyAPbUgOUKUgEMAXsAN7s1OZxiIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714399956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gr6s5ohI/Qv67Cf7c52cVgbi4U1rHjKHCsoIZebSWM8=; b=ESPnL9ZH6NLAfEpamEgDwFCbU58SFrF79Mh1gwgF/exuOjqOoajl13Ic0bWx28h2ZylMyr NroNa8DLcXjPOoaBuL4SeF5Hx5tLl0uewICYTsSDhUiczAVrduUOmABcIKoR0g2Ys4/Upj DhPEbWcdRbs9rk1YFAYa0eFcpQU9p2KM8bNe94CZlWN7DFTQk73lRz+gJl9rHMHRSTLoJ8 KVrKGK+ZqYbROgUrfOo4K9/uxjvbLDELuKIhnMCvf+H3gz0X+gttcyd41FtzQ3gzVVQSlw DNxde6Yyo4qaY09eWRPsAMnVYQYstGnJQBbbLGSp7f6Y+OHk1ylFrRYCzZLiuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSldw1JT1z1Bfb; Mon, 29 Apr 2024 14:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43TECa8a045869; Mon, 29 Apr 2024 14:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TECaCS045866; Mon, 29 Apr 2024 14:12:36 GMT (envelope-from git) Date: Mon, 29 Apr 2024 14:12:36 GMT Message-Id: <202404291412.43TECaCS045866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 28fcfebdaf0f - stable/14 - ng_hci: Add sockaddr validation to sendto() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 28fcfebdaf0f43f2c006453c778494567fc0a6c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=28fcfebdaf0f43f2c006453c778494567fc0a6c4 commit 28fcfebdaf0f43f2c006453c778494567fc0a6c4 Author: Mark Johnston AuthorDate: 2024-04-22 15:48:00 +0000 Commit: Mark Johnston CommitDate: 2024-04-29 14:11:07 +0000 ng_hci: Add sockaddr validation to sendto() ng_btsocket_hci_raw_send() wasn't verifying that the destination address specified by sendto() is large enough to fill a struct sockaddr_hci. Thus, when copying the socket address into an mbuf, ng_btsocket_hci_raw_send() may read past the end of the input sockaddr while copying. In practice this is effectively harmless since ng_btsocket_hci_raw_output() only uses the address to identify a netgraph node. Reported by: Oliver Sieber MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 7f7b4926a779845116913c85ecbb10527daeab02) --- sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c index 935991696929..755e26f1f534 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c @@ -1608,6 +1608,17 @@ ng_btsocket_hci_raw_send(struct socket *so, int flags, struct mbuf *m, goto drop; } + if (sa != NULL) { + if (sa->sa_family != AF_BLUETOOTH) { + error = EAFNOSUPPORT; + goto drop; + } + if (sa->sa_len != sizeof(struct sockaddr_hci)) { + error = EINVAL; + goto drop; + } + } + mtx_lock(&pcb->pcb_mtx); error = ng_btsocket_hci_raw_filter(pcb, m, 0);