git: 01b9c48b5dec - main - GEOM: Skip copyin() for GCTL_PARAM_WR parameters.

[Alexander Motin]

The branch main has been updated by mav:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=01b9c48b5dec8d4a1161e0592f04b3301c81a1f8

commit 01b9c48b5dec8d4a1161e0592f04b3301c81a1f8
Author:     Alexander Motin <m...@freebsd.org>
AuthorDate: 2022-03-07 15:57:56 +0000
Commit:     Alexander Motin <m...@freebsd.org>
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;