From nobody Wed Mar 16 07:08:46 2022 X-Original-To: dev-commits-src-main@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 B2C831A2E912; Wed, 16 Mar 2022 07:08:46 +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 4KJLwZ3WmFz4nWD; Wed, 16 Mar 2022 07:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647414526; 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=o60UkMztt20FVDBiHmgBCZTQJWzPKMSdT6eFA8DO0l8=; b=g85+QN2bLTkP134FsZ5cS3UvRwvwI3xE3wxlHBJD9L0isUK9nncYZfIh/qcGdlH38by2Gh wfqbGOYx0C19tPgCAZ68A6EGoL3gxzmXWr9Z7zGZ8uRWjU8lyHsjN7PIEXEjjSZnMTPhGb vq37bFKGOPSASq5H3FKY+0VGJHitxW14HZi/8PLpTNHCN1PCEWqXX81p3ci14mlTlp930b YhmkTLedYLWwcqd5WgacCOfBOURettS0UwQPTPQpuiWDiVWNixi38nqC4PRn3W2OWANcgK TvYa90UDB8lYzD8XjrNCQoBxGTqHyfkJmjpI1MbFp6TpFN7fz7Z3Yk7mZ5f9+Q== 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 597AA11CE2; Wed, 16 Mar 2022 07:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22G78kgY012236; Wed, 16 Mar 2022 07:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22G78kRF012235; Wed, 16 Mar 2022 07:08:46 GMT (envelope-from git) Date: Wed, 16 Mar 2022 07:08:46 GMT Message-Id: <202203160708.22G78kRF012235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vincenzo Maffione Subject: git: 694ea59c7021 - main - netmap: Fix integer overflow in nmreq_copyin List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 694ea59c7021c25417e6d516362d2f59b4e2c343 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647414526; 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=o60UkMztt20FVDBiHmgBCZTQJWzPKMSdT6eFA8DO0l8=; b=v9GK8RX98DXhAD44kISEnX0Gr8h8clK8GSiSVMJN8YplRKlWYf/ccYU1bqQzaon3LXImUV qUt6X0epKxM3BmpDWO0ssRUssuCCdqaRWyWZbmXcHln4P7VzvoWa76fyFgp98yKH64q8gR Nl4zgrk9jT+J6j66EVrC7sMYqXZvdihiugv98YvKjYits1p4hAzqkA4hjO2MIQ7vUbPLtW G6m05o6WWAZuZHf3IsyxYyhhtr5w6x6KTc1n9pZadm6tC7VkWh/dS6aW3aLx/S7zIYGTp/ ispJ1Lo+QdeqKEUTXQEeAaDC/RREVIC6CON56gxnBDTYqjNdWKa+/bqng4xiBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647414526; a=rsa-sha256; cv=none; b=eqO6nsAiTnqHExCDzg3wEQRoj1qe83HIBdjNBqLsBWXxkIxIiN9lIiDfDFJLC9Wzk70CGy MmeP2r0NuPF60X/TUyfaIrI6JX+dYwJpDsx/SDsXRmWOMVaA9a1II3C6SU9VRvf78F4HFO AO0rl2DFqiEnRBpGKpgk2AGeXq9RkBi8FDT5hcn5j1MNAClvyqbdtAJuHGKIx1sW07Fv/d Z59KWBpETHXWhHDVO39oyUmDycL/h7eamaTmbY6YBc8YV/mNupY3cgqJnCW8Y0NeEbEnYH 3swL1dhL3mQGDKfEFqOANA77jZibTKfsCp/IMyT/KOalJzUWHgQ1Yn+sZt7liw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=694ea59c7021c25417e6d516362d2f59b4e2c343 commit 694ea59c7021c25417e6d516362d2f59b4e2c343 Author: Vincenzo Maffione AuthorDate: 2022-03-16 06:57:54 +0000 Commit: Vincenzo Maffione CommitDate: 2022-03-16 06:57:54 +0000 netmap: Fix integer overflow in nmreq_copyin An unsanitized field in an option could be abused, causing an integer overflow followed by kernel memory corruption. This might be used to escape jails/containers. Reported by: Reno Robert and Lucas Leong (@_wmliang_) of Trend Micro Zero Day Initiative Security: CVE-2022-23085 --- sys/dev/netmap/netmap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c index 17b6eeaac085..b062b1ba7737 100644 --- a/sys/dev/netmap/netmap.c +++ b/sys/dev/netmap/netmap.c @@ -3362,7 +3362,7 @@ nmreq_opt_size_by_type(uint32_t nro_reqtype, uint64_t nro_size) int nmreq_copyin(struct nmreq_header *hdr, int nr_body_is_user) { - size_t rqsz, optsz, bufsz; + size_t rqsz, optsz, bufsz, optbodysz; int error = 0; char *ker = NULL, *p; struct nmreq_option **next, *src, **opt_tab; @@ -3410,8 +3410,18 @@ nmreq_copyin(struct nmreq_header *hdr, int nr_body_is_user) error = copyin(src, &buf, sizeof(*src)); if (error) goto out_err; + /* Validate nro_size to avoid integer overflow of optsz and bufsz. */ + if (buf.nro_size > NETMAP_REQ_MAXSIZE) { + error = EMSGSIZE; + goto out_err; + } optsz += sizeof(*src); - optsz += nmreq_opt_size_by_type(buf.nro_reqtype, buf.nro_size); + optbodysz = nmreq_opt_size_by_type(buf.nro_reqtype, buf.nro_size); + if (optbodysz > NETMAP_REQ_MAXSIZE) { + error = EMSGSIZE; + goto out_err; + } + optsz += optbodysz; if (rqsz + optsz > NETMAP_REQ_MAXSIZE) { error = EMSGSIZE; goto out_err;