From nobody Mon Mar 7 16:12:32 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 D659919FB16F; Mon, 7 Mar 2022 16:12:32 +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 4KC3Q85kqyz4XMX; Mon, 7 Mar 2022 16:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646669552; 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=C1w0PHZcNKo2Z7qU5XFQlfId2tdXq1TP5D77Y/tVihc=; b=OrzmgN1gVWpune5BwkQOKyU7ZfY/URPCuJvRQMVOruMBeXTd4JvKwzjSvnyBzDIK3OdYf+ Y/3j77Z4uTD08LYzwZTZOjqJA5OfrQazzRfHfXk6CY8ifOX1R4CfHt2gF1+j6WhnuE6UI3 yJGc9KPWrIdQT+CljFDDtHK2u8x5FzxgOAspSSgTgCOwuJly3r5Bs/ny9wdYRUtvhegNMe x48y+8UDDFf/b/xmqZ2PDzNKAmRe6TbcDYa0TAxfjw14XxcOfZUj/AERTgeNCZz9lo8tQQ N1OhPK2Y0q2Bf/2QVTC/jszDpPU6/KDJ5NVtabtUe/cRmcMOweYs0ZaOWPIrww== 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 A534936BD; Mon, 7 Mar 2022 16:12:32 +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 227GCW5a090194; Mon, 7 Mar 2022 16:12:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227GCWuA090193; Mon, 7 Mar 2022 16:12:32 GMT (envelope-from git) Date: Mon, 7 Mar 2022 16:12:32 GMT Message-Id: <202203071612.227GCWuA090193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 01b9c48b5dec - main - GEOM: Skip copyin() for GCTL_PARAM_WR parameters. 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01b9c48b5dec8d4a1161e0592f04b3301c81a1f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646669552; 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=C1w0PHZcNKo2Z7qU5XFQlfId2tdXq1TP5D77Y/tVihc=; b=wdXAdfFa0IkWVijr5GNLRmc+7n9gRGizEE5LeNxywrEzBWrwbOHictapi4WDuIzmGMVzax NSwT8AOPCgtVq9qNBVhMWSneEbKs7GRAGFBHRtTK5ZiLIJF+49GlS0tMwXmsah0HNoTc7U GzdcNrVYEAXwGozrNbPDqLnHzZDvqdhl5y2qcKIiko8/1uDrT3C1/HjzDMp4lWHTg+kkb2 a18TTiWF38+rrP2TLGl8jEOUMvy9oLRnZ6gjJ/D0xxbr8Qn0BDH8oeKgwID9avnt7TmA4T 49X6gcLn3IRfwC5fSl8Qm05+qy12+ai7CHX68GbdnZsDPVBb6SUDpTE+szlL3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646669552; a=rsa-sha256; cv=none; b=nYVEuRtPmTHAa1CuwvPMpEKuA9TpmxxB5EaO9oQWKYfLTAprEyKXnEQydkK9Y92/3loRKL QSHVHQMCAIz4/VHh3HeRJcf8uHu0Z6+rRbXK70pnJASZS53rMkwVeNvEscleBX5ITcTUfr EYUjNZT5EpCqoNyDxzNXv4t29k7EM++dSTLk1QyjgCUldDIISuEFjXxALwLkxQenkBCziC odH5nJ760psMx5UYsQUHUWL3jdDR1XrGFrxwcLiBVUQUQMKKDC3Kje1DCmilMQBdrnauJW jUEGIbik2jaR40X4KOguQ7cDknVOE3jxATAKhITA0AE9u8iO3VW+pqHEX6TQOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=01b9c48b5dec8d4a1161e0592f04b3301c81a1f8 commit 01b9c48b5dec8d4a1161e0592f04b3301c81a1f8 Author: Alexander Motin AuthorDate: 2022-03-07 15:57:56 +0000 Commit: Alexander Motin CommitDate: 2022-03-07 16:12:25 +0000 GEOM: Skip copyin() for GCTL_PARAM_WR parameters. Kernel does not read those parameters, so copyin is pointless. While there, replace some KASSERT()s with CTASSERT()s. MFC after: 1 month --- sys/geom/geom_ctl.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index c387b9e5102c..ce308d236dc1 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -63,16 +63,15 @@ static struct cdevsw g_ctl_cdevsw = { .d_name = "g_ctl", }; +CTASSERT(GCTL_PARAM_RD == VM_PROT_READ); +CTASSERT(GCTL_PARAM_WR == VM_PROT_WRITE); + void g_ctl_init(void) { make_dev_credf(MAKEDEV_ETERNAL, &g_ctl_cdevsw, 0, NULL, UID_ROOT, GID_OPERATOR, 0640, PATH_GEOM_CTL); - KASSERT(GCTL_PARAM_RD == VM_PROT_READ, - ("GCTL_PARAM_RD != VM_PROT_READ")); - KASSERT(GCTL_PARAM_WR == VM_PROT_WRITE, - ("GCTL_PARAM_WR != VM_PROT_WRITE")); } /* @@ -222,14 +221,18 @@ gctl_copyin(struct gctl_req *req) gctl_error(req, "negative param length"); break; } - p = geom_alloc_copyin(req, ap[i].value, ap[i].len); - if (p == NULL) - break; - if ((ap[i].flag & GCTL_PARAM_ASCII) && - p[ap[i].len - 1] != '\0') { - gctl_error(req, "unterminated param value"); - g_free(p); - break; + if (ap[i].flag & GCTL_PARAM_RD) { + p = geom_alloc_copyin(req, ap[i].value, ap[i].len); + if (p == NULL) + break; + if ((ap[i].flag & GCTL_PARAM_ASCII) && + p[ap[i].len - 1] != '\0') { + gctl_error(req, "unterminated param value"); + g_free(p); + break; + } + } else { + p = g_malloc(ap[i].len, M_WAITOK | M_ZERO); } ap[i].kvalue = p; ap[i].flag |= GCTL_PARAM_VALUEKERNEL;