From nobody Wed Apr 06 03:26:07 2022 X-Original-To: dev-commits-src-branches@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 2809B1A8C209; Wed, 6 Apr 2022 03:26:08 +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 4KY8zz70W2z4nSP; Wed, 6 Apr 2022 03:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649215568; 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=SucXCE5RE206f7zz4fknLb+25bnLyaDfvMftChjtu8k=; b=ePtwNQrx1anqNt6c/vYcoGYva2+8BnBkaQQ2MFDCiLSj+9PHWGOo7Dab7HYjsGTXZnvKxQ b9oLnoOGExsj6TkXEfnddvH/JZYqxKqQQg/5+kY76d3Ck+53xYzRxvhIgYXxGiZznAkSMp wF4RKFYtB9kveV6LXwAuc/rTTVyIDi3AMfS/fsgnV2M4wfd4CuWs2X9IK03TQlurIzpcSd rSr9Q1Pa0p6GHq3roD5NtCFt6EV2vJ+AoRmelUq+35SugDmMmk1Ce2473QTBDt6fUCEf9Z bIugNYTDsYBf0Ew6I9+jDoftwl+2pfVI1uae72CWOqlrJlIRPanYmjEIH1qoNg== 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 C9D5A13632; Wed, 6 Apr 2022 03:26:07 +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 2363Q7hW062351; Wed, 6 Apr 2022 03:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2363Q72l062350; Wed, 6 Apr 2022 03:26:07 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:26:07 GMT Message-Id: <202204060326.2363Q72l062350@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: 7c55c52696d2 - releng/13.1 - netmap: Fix TOCTOU vulnerability in nmreq_copyin List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13.1 X-Git-Reftype: branch X-Git-Commit: 7c55c52696d2aec39441802d687badc8b012432e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649215568; 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=SucXCE5RE206f7zz4fknLb+25bnLyaDfvMftChjtu8k=; b=Bq07xSB7tzJkFbWeGLAwFy/I3X7mx0EPXO1GsFBKFUrWecKXR/nmSEnC6Z7J3Nn7RmLfgp GQUHcFBr9CBpw4iP+VuxGnj9T5M4TIhLh84hlovLRlCl1Dh2ibYOFEfB5NXroCML3NaP49 eV1t87NM9qtBs2jrsQdN+YbAA/pIeCIS/pPklY9uSGZNgHlDN7wpT5iHhr6RwZYpblWGLh 4kKC70sfY9MgORMfGN119JmXEx0xic3vR4UGGIJEwQn/g7pQWbwiaVBE/7hu3Fp+uzL+DM eW/uoGSe9hw1OUBKSg9cbhQUaXvdG21fZy3fWztZ8z2hhVf4cEo2laehnMdgLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649215568; a=rsa-sha256; cv=none; b=Ms7ZPnqF3KC2rZZq95CrTAYt4XLjrmDCgCqpKAa0Kmqxfyii0Y0itzGc/H8TZGe98QEYgE Npr3Vx5gvhWG+lNerMxQeWMEzmbREYqxUr6SLd05MajsR0JXIKWPNQewfIz5HzUKWF3OTb OrgoKfxiBZ4Rdsv7TwgAlhNDKGLjDq1/yXudmfWkWnPQIHzG+ADaQB97klP6ot3bDx2C45 R7m0lezQ1U6DXBTNRJ9INWcf0UbUr24QgyDg9Pi6U0bx/a12MHcKrYW73scpWOE6xkbTt6 YVXSdcNxkF6Uo25RV7xhkz2dDrA6jsfTGt1yrLZAx1vgf+3muC+5EwaYeKj9aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7c55c52696d2aec39441802d687badc8b012432e commit 7c55c52696d2aec39441802d687badc8b012432e Author: Vincenzo Maffione AuthorDate: 2022-03-16 06:58:50 +0000 Commit: Ed Maste CommitDate: 2022-04-06 03:24:05 +0000 netmap: Fix TOCTOU vulnerability in nmreq_copyin The total size of the user-provided nmreq was first computed and then trusted during the copyin. This might lead to kernel memory corruption and escape from jails/containers. Reported by: Lucas Leong (@_wmliang_) of Trend Micro Zero Day Initiative Security: CVE-2022-23084 MFC after: 3 days (cherry picked from commit 393729916564ed13f966e09129a24e6931898d12) (cherry picked from commit 9f600a260a738d87015b2e9722b7b4f228cbd47d) Approved by: so, re (implicit) --- sys/dev/netmap/netmap.c | 51 +++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c index 0c04098bb401..5baadc3e8014 100644 --- a/sys/dev/netmap/netmap.c +++ b/sys/dev/netmap/netmap.c @@ -3096,11 +3096,10 @@ 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, optbodysz; + size_t rqsz, optsz, bufsz; int error = 0; char *ker = NULL, *p; struct nmreq_option **next, *src, **opt_tab; - struct nmreq_option buf; uint64_t *ptrs; if (hdr->nr_reserved) { @@ -3130,39 +3129,14 @@ nmreq_copyin(struct nmreq_header *hdr, int nr_body_is_user) goto out_err; } - bufsz = 2 * sizeof(void *) + rqsz + - NETMAP_REQ_OPT_MAX * sizeof(opt_tab); - /* compute the size of the buf below the option table. - * It must contain a copy of every received option structure. - * For every option we also need to store a copy of the user - * list pointer. + /* + * The buffer size must be large enough to store the request body, + * all the possible options and the additional user pointers + * (2+NETMAP_REQ_OPT_MAX). Note that the maximum size of body plus + * options can not exceed NETMAP_REQ_MAXSIZE; */ - optsz = 0; - for (src = (struct nmreq_option *)(uintptr_t)hdr->nr_options; src; - src = (struct nmreq_option *)(uintptr_t)buf.nro_next) - { - 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); - 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; - } - bufsz += sizeof(void *); - } - bufsz += optsz; + bufsz = (2 + NETMAP_REQ_OPT_MAX) * sizeof(void *) + NETMAP_REQ_MAXSIZE + + NETMAP_REQ_OPT_MAX * sizeof(opt_tab); ker = nm_os_malloc(bufsz); if (ker == NULL) { @@ -3200,6 +3174,7 @@ nmreq_copyin(struct nmreq_header *hdr, int nr_body_is_user) error = copyin(src, opt, sizeof(*src)); if (error) goto out_restore; + rqsz += sizeof(*src); /* make a copy of the user next pointer */ *ptrs = opt->nro_next; /* overwrite the user pointer with the in-kernel one */ @@ -3243,6 +3218,14 @@ nmreq_copyin(struct nmreq_header *hdr, int nr_body_is_user) /* copy the option body */ optsz = nmreq_opt_size_by_type(opt->nro_reqtype, opt->nro_size); + /* check optsz and nro_size to avoid for possible integer overflows of rqsz */ + if ((optsz > NETMAP_REQ_MAXSIZE) || (opt->nro_size > NETMAP_REQ_MAXSIZE) + || (rqsz + optsz > NETMAP_REQ_MAXSIZE) + || (optsz > 0 && rqsz + optsz <= rqsz)) { + error = EMSGSIZE; + goto out_restore; + } + rqsz += optsz; if (optsz) { /* the option body follows the option header */ error = copyin(src + 1, p, optsz);