Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-13525 sec: better struct sepol_downcall_data
[fs/lustre-release.git] / lustre / ptlrpc / sec_lproc.c
diff --git a/lustre/ptlrpc/sec_lproc.c b/lustre/ptlrpc/sec_lproc.c
index 2f06143..41ef7e0 100644 (file)
--- a/lustre/ptlrpc/sec_lproc.c
+++ b/lustre/ptlrpc/sec_lproc.c
@@ -136,6 +136,87 @@ out:
 
 LPROC_SEQ_FOPS_RO(sptlrpc_ctxs_lprocfs);
 
 
 LPROC_SEQ_FOPS_RO(sptlrpc_ctxs_lprocfs);
 
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0)
+static ssize_t sepol_seq_write_old(struct obd_device *obd,
+                                  const char __user *buffer,
+                                  size_t count)
+{
+       struct client_obd *cli = &obd->u.cli;
+       struct obd_import *imp = cli->cl_import;
+       struct sepol_downcall_data_old *param;
+       int size = sizeof(*param);
+       __u16 len;
+       int rc = 0;
+
+       if (count < size) {
+               rc = -EINVAL;
+               CERROR("%s: invalid data count = %lu, size = %d: rc = %d\n",
+                      obd->obd_name, (unsigned long) count, size, rc);
+               return rc;
+       }
+
+       OBD_ALLOC(param, size);
+       if (param == NULL)
+               return -ENOMEM;
+
+       if (copy_from_user(param, buffer, size)) {
+               rc = -EFAULT;
+               CERROR("%s: bad sepol data: rc = %d\n", obd->obd_name, rc);
+               GOTO(out, rc);
+       }
+
+       if (param->sdd_magic != SEPOL_DOWNCALL_MAGIC_OLD) {
+               rc = -EINVAL;
+               CERROR("%s: sepol downcall bad params: rc = %d\n",
+                      obd->obd_name, rc);
+               GOTO(out, rc);
+       }
+
+       if (param->sdd_sepol_len == 0 ||
+           param->sdd_sepol_len >= sizeof(imp->imp_sec->ps_sepol)) {
+               rc = -EINVAL;
+               CERROR("%s: invalid sepol data returned: rc = %d\n",
+                      obd->obd_name, rc);
+               GOTO(out, rc);
+       }
+       len = param->sdd_sepol_len; /* save sdd_sepol_len */
+       OBD_FREE(param, size);
+       size = offsetof(struct sepol_downcall_data_old,
+                       sdd_sepol[len]);
+
+       if (count < size) {
+               rc = -EINVAL;
+               CERROR("%s: invalid sepol count = %lu, size = %d: rc = %d\n",
+                      obd->obd_name, (unsigned long) count, size, rc);
+               return rc;
+       }
+
+       /* alloc again with real size */
+       OBD_ALLOC(param, size);
+       if (param == NULL)
+               return -ENOMEM;
+
+       if (copy_from_user(param, buffer, size)) {
+               rc = -EFAULT;
+               CERROR("%s: cannot copy sepol data: rc = %d\n",
+                      obd->obd_name, rc);
+               GOTO(out, rc);
+       }
+
+       spin_lock(&imp->imp_sec->ps_lock);
+       snprintf(imp->imp_sec->ps_sepol, param->sdd_sepol_len + 1, "%s",
+                param->sdd_sepol);
+       imp->imp_sec->ps_sepol_mtime = ktime_set(param->sdd_sepol_mtime, 0);
+       spin_unlock(&imp->imp_sec->ps_lock);
+
+out:
+       if (param != NULL)
+               OBD_FREE(param, size);
+
+       return rc ? rc : count;
+}
+#endif
+
 static ssize_t
 lprocfs_sptlrpc_sepol_seq_write(struct file *file, const char __user *buffer,
                                size_t count, void *data)
 static ssize_t
 lprocfs_sptlrpc_sepol_seq_write(struct file *file, const char __user *buffer,
                                size_t count, void *data)
@@ -145,13 +226,42 @@ lprocfs_sptlrpc_sepol_seq_write(struct file *file, const char __user *buffer,
        struct client_obd *cli = &obd->u.cli;
        struct obd_import *imp = cli->cl_import;
        struct sepol_downcall_data *param;
        struct client_obd *cli = &obd->u.cli;
        struct obd_import *imp = cli->cl_import;
        struct sepol_downcall_data *param;
-       int size = sizeof(*param);
+       __u32 magic;
+       int size = sizeof(magic);
+       __u16 len;
        int rc = 0;
 
        if (count < size) {
        int rc = 0;
 
        if (count < size) {
-               CERROR("%s: invalid data count = %lu, size = %d\n",
-                      obd->obd_name, (unsigned long) count, size);
-               return -EINVAL;
+               rc = -EINVAL;
+               CERROR("%s: invalid buffer count = %lu, size = %d: rc = %d\n",
+                      obd->obd_name, (unsigned long) count, size, rc);
+               return rc;
+       }
+
+       if (copy_from_user(&magic, buffer, size)) {
+               rc = -EFAULT;
+               CERROR("%s: bad sepol magic: rc = %d\n", obd->obd_name, rc);
+               return rc;
+       }
+
+       if (magic != SEPOL_DOWNCALL_MAGIC) {
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0)
+               if (magic == SEPOL_DOWNCALL_MAGIC_OLD) {
+                       return sepol_seq_write_old(obd, buffer, count);
+               }
+#endif
+               rc = -EINVAL;
+               CERROR("%s: sepol downcall bad magic '%#08x': rc = %d\n",
+                      obd->obd_name, magic, rc);
+               return rc;
+       }
+
+       size = sizeof(*param);
+       if (count < size) {
+               rc = -EINVAL;
+               CERROR("%s: invalid data count = %lu, size = %d: rc = %d\n",
+                      obd->obd_name, (unsigned long) count, size, rc);
+               return rc;
        }
 
        OBD_ALLOC(param, size);
        }
 
        OBD_ALLOC(param, size);
@@ -159,36 +269,33 @@ lprocfs_sptlrpc_sepol_seq_write(struct file *file, const char __user *buffer,
                return -ENOMEM;
 
        if (copy_from_user(param, buffer, size)) {
                return -ENOMEM;
 
        if (copy_from_user(param, buffer, size)) {
-               CERROR("%s: bad sepol data\n", obd->obd_name);
-               GOTO(out, rc = -EFAULT);
-       }
-
-       if (param->sdd_magic != SEPOL_DOWNCALL_MAGIC) {
-               CERROR("%s: sepol downcall bad params\n",
-                      obd->obd_name);
-               GOTO(out, rc = -EINVAL);
+               rc = -EFAULT;
+               CERROR("%s: bad sepol data: rc = %d\n", obd->obd_name, rc);
+               GOTO(out, rc);
        }
 
        if (param->sdd_sepol_len == 0 ||
            param->sdd_sepol_len >= sizeof(imp->imp_sec->ps_sepol)) {
        }
 
        if (param->sdd_sepol_len == 0 ||
            param->sdd_sepol_len >= sizeof(imp->imp_sec->ps_sepol)) {
-               CERROR("%s: invalid sepol data returned\n",
-                      obd->obd_name);
-               GOTO(out, rc = -EINVAL);
+               rc = -EINVAL;
+               CERROR("%s: invalid sepol data returned: rc = %d\n",
+                      obd->obd_name, rc);
+               GOTO(out, rc);
        }
        }
-       rc = param->sdd_sepol_len; /* save sdd_sepol_len */
+       len = param->sdd_sepol_len; /* save sdd_sepol_len */
        OBD_FREE(param, size);
        size = offsetof(struct sepol_downcall_data,
        OBD_FREE(param, size);
        size = offsetof(struct sepol_downcall_data,
-                       sdd_sepol[rc]);
+                       sdd_sepol[len]);
 
        /* alloc again with real size */
 
        /* alloc again with real size */
-       rc = 0;
        OBD_ALLOC(param, size);
        if (param == NULL)
                return -ENOMEM;
 
        if (copy_from_user(param, buffer, size)) {
        OBD_ALLOC(param, size);
        if (param == NULL)
                return -ENOMEM;
 
        if (copy_from_user(param, buffer, size)) {
-               CERROR("%s: bad sepol data\n", obd->obd_name);
-               GOTO(out, rc = -EFAULT);
+               rc = -EFAULT;
+               CERROR("%s: cannot copy sepol data: rc = %d\n",
+                      obd->obd_name, rc);
+               GOTO(out, rc);
        }
 
        spin_lock(&imp->imp_sec->ps_lock);
        }
 
        spin_lock(&imp->imp_sec->ps_lock);
Lustre primary development and releases