From nobody Sat Mar 19 17:54:30 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 6E1551A29570; Sat, 19 Mar 2022 17:54:31 +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 4KLT6G60XGz4dQ4; Sat, 19 Mar 2022 17:54:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647712471; 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=5fGhvuhhIkepXCIzIeFrfoG2+HzX1QASfduvA4707O0=; b=irptN+Rp6vauRhMrLnxrvr1Eg79Bal5d4xOPYol3ZmKVP92dKBIPk8nKJnbTFBl4lgER9a wW0gTmQeZPOlY5q73AhudNBf/KjlYIwgDTJAKy19g+cS8WH8uGvx4I+zHemSvJjn7GfYGm BX6QM0bKaDR1oG/rGd8q7K2ZIYvZuFJs5iGnSgWFCuijYhmfQc7VRX63AoSdhiQopgaWJF HT0GtRnldk5j0/e6n+ovcOAAKtP/sJ0wiWaO4vrjiqcTLUspLtzTmpXm1tR0l9a0RkoAhX avbj7bfODz0ddlZTJz2EpzCjRWgaFiOcXhLPONiOoiX/xamu/bueLZPxUEr0Xw== 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 70ABA17DA3; Sat, 19 Mar 2022 17:54:30 +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 22JHsUW7004204; Sat, 19 Mar 2022 17:54:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JHsUhe004203; Sat, 19 Mar 2022 17:54:30 GMT (envelope-from git) Date: Sat, 19 Mar 2022 17:54:30 GMT Message-Id: <202203191754.22JHsUhe004203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: 6fa8af618475 - stable/12 - 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: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6fa8af618475024262fc99b0f0e6c2aa0e1340fe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647712471; 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=5fGhvuhhIkepXCIzIeFrfoG2+HzX1QASfduvA4707O0=; b=ETTrVLfd0BNRArHXADNunsH7E6Qi+1FFcDYcR+Kd95DK800FL51o/1dokiTXOKGcMqXIpN aM5v3OXBwf3Fj1WvCK6e7fY4u/EpD5c1AWJtEXgZYqf42V/zZ2zOVlNb5nE4rGC6J7QRGf trr61ZESMrk/UT3/bZeMqa1iN70x1HyHrIKB5Q7ezlRrwZDk2JOYQH05n/QCLOE86tq8iz 7PYi6ghxZuSbnU3toLB7OaQcx6pUSHEDiGTtsqHC0OgB0feeRC/lqoaIXty9wKngHSGGWi Cx9lkcdAJNTW6GSt7+7ETiSEGCt8WphVjpNVzRoto1r4Fi9BZfKcryjewFJc8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647712471; a=rsa-sha256; cv=none; b=GtePOOHL5ztSAH2W/qB1CXrQTveGzbGLZeMkL4oZGqfJRV197kUXyB4/WO/WnRdp7kZN18 zOEmIfHod8yQTrP5cNp6m1x1tkwtUxKpQ+ZJkc7hWjEB8aDzQXzdtt8rMC41UnLQo6W2zn pVWaIWMQpDIecVrU2RKVO22wYTe9R8VKgI4+ktsz8oUocPJ5qbGG8hKFnxlXEjsdQbIvDP YJ7BhMxMxbGYB9u8ls/wtV2kWtL6RtU77+B3OkIJxnw713+4FzkwyBFN2qlDf1PTuV7u8m XDuJPC6GhDT4GE6/+11G57koeZhi16/IXXKmZ1sG2eWrrOzzCFgexslERGKjaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=6fa8af618475024262fc99b0f0e6c2aa0e1340fe commit 6fa8af618475024262fc99b0f0e6c2aa0e1340fe Author: Vincenzo Maffione AuthorDate: 2022-03-16 06:58:50 +0000 Commit: Vincenzo Maffione CommitDate: 2022-03-19 17:37:31 +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) --- 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 cefc72c60817..52c7987f32fe 100644 --- a/sys/dev/netmap/netmap.c +++ b/sys/dev/netmap/netmap.c @@ -3086,11 +3086,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) { @@ -3120,39 +3119,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) { @@ -3190,6 +3164,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 */ @@ -3233,6 +3208,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);