From nobody Sat Mar 19 17:54:29 2022 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 A514A1A295B7; Sat, 19 Mar 2022 17:54:29 +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 4KLT6F3dmyz4dXF; Sat, 19 Mar 2022 17:54:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647712469; 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=P5AolUiu0VflR399f12t649NWD+CkdZ1jIOi8DRq/DY=; b=xyPJxFwUKFE1ErTrqOaXZwHd41oCzThIXMO7HQ1RKLWJHsDOXWZ3lxFLzAbfkSOfeICKeL JBMUGZ58I1w9CJpskjgh4/biOkXN8dPA/IX7Z4tl0SIwR9On42TjwF+tzh5YZ/0YXLn5GY Gr2oSxdJi017KR5gy5+CZXA7AF0H8xoUn24OTUmNUt65QQt5E6p1++GCt3FRvSZc1oDof0 VhdSO4syssA1Y2P8Y8lRLXw7sgw8eEJDcnwrcOBVODmn77K66Z/eadIuoqVvaNDprZxPaA 9gBTB1uhT/QnMQcZNQtXOojbNYixDg1ffJyui2ReNLyGveHEEvfTAOGt/DdJig== 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 4DBD017A74; Sat, 19 Mar 2022 17:54:29 +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 22JHsTI3004180; Sat, 19 Mar 2022 17:54:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JHsTj7004179; Sat, 19 Mar 2022 17:54:29 GMT (envelope-from git) Date: Sat, 19 Mar 2022 17:54:29 GMT Message-Id: <202203191754.22JHsTj7004179@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: 95602165e33a - stable/12 - netmap: Fix integer overflow in nmreq_copyin 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 95602165e33a3045a27245cc1e61e67bf4feeed1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647712469; 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=P5AolUiu0VflR399f12t649NWD+CkdZ1jIOi8DRq/DY=; b=F3l2xa5p5VGLqfT2TOrjSSz70eEjpC+4Z9myRqqDZEz2/FW0arEbdK9aA/YNdtWAFOMRUO 8y0n6sJqg0Y/55bXdYN+I0EJE1vakPrNo+hecFnFoPgq0bceNXJeR++y+XFotXFL8Mx322 vh4iZx9rHGkJXypIIFIsodJyVSpc31kAGWvvaMf/TTIPiMMqdskxU3YavMFCFTcFfI2kD6 HjtwX437WGVofM4NsT6uQVn9Ldsmv2pkFDcVSs0cD2e5kgO7uF35EuNzYZZqKfI31iOhZi 6PCPhuNhBzNjCkFoe25lr/2hudE1g9VxnOwnydcVHUJGfM2AAHKr8qXPfVuX5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647712469; a=rsa-sha256; cv=none; b=u76bNc7kX5PemUQyleLvQEUY5nEfMRcTZqcu6IB1tj8n/Y3pOqGDPk+Q7RcwG2gTMvgu+W b6LybTJmzG11iixnbLT9PH+K3mbkp5C9+7mYdue2tKYGindjOCPMSNTEpVQ8VC1GdksKgf 2qNVc8W4RFzeyu1PPHiJwWukRqlpgwz03t4LJBclgtwzJdf9L0QPqs7tx42E/ytjNKi2T+ bmmO3Bky75KW7XX3/8YJ3MIsJlqifsR2kWh8ppuQTaGqFA73+866mN/2VxH9Uqxvt88v+t B9j6Txek6Q3qcRAhKb/PHJUiY4YD8WFSGtz6PeqEQFEgBgK702Ph/9acbRQmHg== 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=95602165e33a3045a27245cc1e61e67bf4feeed1 commit 95602165e33a3045a27245cc1e61e67bf4feeed1 Author: Vincenzo Maffione AuthorDate: 2022-03-16 06:57:54 +0000 Commit: Vincenzo Maffione CommitDate: 2022-03-19 17:37:13 +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 (cherry picked from commit 694ea59c7021c25417e6d516362d2f59b4e2c343) --- 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 6532856b21a1..cefc72c60817 100644 --- a/sys/dev/netmap/netmap.c +++ b/sys/dev/netmap/netmap.c @@ -3086,7 +3086,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; @@ -3134,8 +3134,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;