From nobody Wed Sep 04 21:07:26 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 4WzZnV6j2sz5VNs3; Wed, 04 Sep 2024 21:07:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzZnV64zfz4Vbk; Wed, 4 Sep 2024 21:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725484046; 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=zyGJGuv9IUF74/GXje7DlCCAu7RD+L7YnGTcmxHI1TE=; b=B4DPny5mZ8p0vEScoMfYvqDD9p1vwAMid8w31/u2CC+Ks0ywbOuwMmYEkLyn81W3aBXaKY kyVWwvMVh+d0r0Dli7ceMifrIXhNJ4uanox/SyVvGOKSsuYx8I6ndgPviJf9GUc5xNQpls OWZaFYE3EupjDduSvcBXniltV/yrRwJWjF53+KKyFpCBJ8W3vIqdfHveqXrF+EYlr7Nqgs KxrtoGvg1QhoYEPJ/KqDgiM90r842KVgEJ4eLg7QjYd5Lp5yezdCgcu/378p9Ye6189lA4 haqqV1/kNl5spEBfNay6crBlE6eCDtf4ZTGgKzZXPTAwGp4i//nRJNziZQv3Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725484046; a=rsa-sha256; cv=none; b=FhA46vIg1kLmCFT8M371Vmsh3ICvz8lpHg7bA3rtypQhmV5OFgts7MwrNqdpUzCUzFgr1W YlIOD1n1thmP0twaaNjfnKVqpvTiOFkF8yft4dSdVXhPtFgvIDItG3QFEYWc7kt3dUPRJ9 3pHy5r4e1r93uY62/MQNLtXc0ukwKkAvObtjOCsH5530apoSIGWKGL7difFtv/z/Hm6O6/ G0oBlThm8+jqK91ucpOSpdsvvY7q3NER+ZfMNg/0qS1pjmKPGpcR2SaQI4epJSdclcKiuy 3RzgfvB9ov4v5nytCUQqJIzdXkNMwDzmalIcZesgTq6v2fFjB02Mlrk7+8hWdg== 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=1725484046; 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=zyGJGuv9IUF74/GXje7DlCCAu7RD+L7YnGTcmxHI1TE=; b=FBO61gGYdcLHGmWA41dh6GcOY+JheIPKBqPmxXzRQ+fhCsGJUx6Lr3Zr3rPd2ubNWsR3Wc zlgkxZLWEDCRl0A+eBwjp2TmWs2BPVSrqHCbvPbaPBNINZ8SmICiF/BZ76nbRHGir9Jwtv AJR0BScg/PxFtha1C1Tn6NwiJeimH7wYqBnASK/gnIqfpdE1aP5Z8pH8tdxRua4WocpwTZ vuyN2kKyiNKlyM+bLghOH/MhQpJq74osUQyUBmKBrmSU/EP+aHXGrjn9vmo/3S1KVw2Snk /m8A19WadVn0+hfm2lvjapyGOR2R+0vO27NRXOlvLMdrcMyBexMEBQgVtwpyKg== 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 4WzZnV5ZCFzgg2; Wed, 4 Sep 2024 21:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484L7QRe053043; Wed, 4 Sep 2024 21:07:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484L7QcK053040; Wed, 4 Sep 2024 21:07:26 GMT (envelope-from git) Date: Wed, 4 Sep 2024 21:07:26 GMT Message-Id: <202409042107.484L7QcK053040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5fd7301afa97 - releng/14.1 - libnv: allocate buffer in a safe way 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 5fd7301afa975f9ba20051d83b838d90f3aa792b Auto-Submitted: auto-generated The branch releng/14.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5fd7301afa975f9ba20051d83b838d90f3aa792b commit 5fd7301afa975f9ba20051d83b838d90f3aa792b Author: Mariusz Zaborski AuthorDate: 2024-08-26 18:10:25 +0000 Commit: Ed Maste CommitDate: 2024-09-04 20:46:06 +0000 libnv: allocate buffer in a safe way Ensure that the calculation of size of array doesn't overflow. Security: FreeBSD-24:09.libnv Security: CVE-2024-45287 Security: CAP-02 Reported by: Synacktiv Reported by: Taylor R Campbell (NetBSD) Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46131 (cherry picked from commit 36fa90dbde0060aacb5677d0b113ee168e839071) (cherry picked from commit 371af89975e3edd1e9f57aa5efba2598b63c0d2d) Approved by: so --- sys/contrib/libnv/bsd_nvpair.c | 18 +++++++++--------- sys/contrib/libnv/nvlist.c | 8 ++++++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index 0c76fefeebb6..9560ebc74f83 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -999,7 +999,7 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp, return (NULL); } - value = nv_malloc(sizeof(*value) * nvp->nvp_nitems); + value = nv_calloc(nvp->nvp_nitems, sizeof(*value)); if (value == NULL) return (NULL); @@ -1092,7 +1092,7 @@ nvpair_unpack_nvlist_array(bool isbe __unused, nvpair_t *nvp, return (NULL); } - value = nv_malloc(nvp->nvp_nitems * sizeof(*value)); + value = nv_calloc(nvp->nvp_nitems, sizeof(*value)); if (value == NULL) return (NULL); @@ -1330,10 +1330,10 @@ nvpair_create_bool_array(const char *name, const bool *value, size_t nitems) return (NULL); } - size = sizeof(value[0]) * nitems; - data = nv_malloc(size); + data = nv_calloc(nitems, sizeof(value[0])); if (data == NULL) return (NULL); + size = sizeof(value[0]) * nitems; memcpy(data, value, size); nvp = nvpair_allocv(name, NV_TYPE_BOOL_ARRAY, (uint64_t)(uintptr_t)data, @@ -1360,10 +1360,10 @@ nvpair_create_number_array(const char *name, const uint64_t *value, return (NULL); } - size = sizeof(value[0]) * nitems; - data = nv_malloc(size); + data = nv_calloc(nitems, sizeof(value[0])); if (data == NULL) return (NULL); + size = sizeof(value[0]) * nitems; memcpy(data, value, size); nvp = nvpair_allocv(name, NV_TYPE_NUMBER_ARRAY, @@ -1393,7 +1393,7 @@ nvpair_create_string_array(const char *name, const char * const *value, nvp = NULL; datasize = 0; - data = nv_malloc(sizeof(value[0]) * nitems); + data = nv_calloc(nitems, sizeof(value[0])); if (data == NULL) return (NULL); @@ -1440,7 +1440,7 @@ nvpair_create_nvlist_array(const char *name, const nvlist_t * const *value, return (NULL); } - nvls = nv_malloc(sizeof(value[0]) * nitems); + nvls = nv_calloc(nitems, sizeof(value[0])); if (nvls == NULL) return (NULL); @@ -1507,7 +1507,7 @@ nvpair_create_descriptor_array(const char *name, const int *value, nvp = NULL; - fds = nv_malloc(sizeof(value[0]) * nitems); + fds = nv_calloc(nitems, sizeof(value[0])); if (fds == NULL) return (NULL); for (ii = 0; ii < nitems; ii++) { diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c index 57343f953e94..64078b10973e 100644 --- a/sys/contrib/libnv/nvlist.c +++ b/sys/contrib/libnv/nvlist.c @@ -758,7 +758,7 @@ nvlist_descriptors(const nvlist_t *nvl, size_t *nitemsp) int *fds; nitems = nvlist_ndescriptors(nvl); - fds = nv_malloc(sizeof(fds[0]) * (nitems + 1)); + fds = nv_calloc(nitems + 1, sizeof(fds[0])); if (fds == NULL) return (NULL); if (nitems > 0) @@ -1029,6 +1029,10 @@ static bool nvlist_check_header(struct nvlist_header *nvlhdrp) { + if (nvlhdrp->nvlh_size > SIZE_MAX - sizeof(nvlhdrp)) { + ERRNO_SET(EINVAL); + return (false); + } if (nvlhdrp->nvlh_magic != NVLIST_HEADER_MAGIC) { ERRNO_SET(EINVAL); return (false); @@ -1313,7 +1317,7 @@ nvlist_recv(int sock, int flags) goto out; if (nfds > 0) { - fds = nv_malloc(nfds * sizeof(fds[0])); + fds = nv_calloc(nfds, sizeof(fds[0])); if (fds == NULL) goto out; if (fd_recv(sock, fds, nfds) == -1)