[Midnightbsd-cvs] src [10004] trunk/sys/geom/geom_ctl.c: sync with freebsd 10 stable
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun May 27 17:15:34 EDT 2018
Revision: 10004
http://svnweb.midnightbsd.org/src/?rev=10004
Author: laffer1
Date: 2018-05-27 17:15:33 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync with freebsd 10 stable
Modified Paths:
--------------
trunk/sys/geom/geom_ctl.c
Modified: trunk/sys/geom/geom_ctl.c
===================================================================
--- trunk/sys/geom/geom_ctl.c 2018-05-27 21:09:46 UTC (rev 10003)
+++ trunk/sys/geom/geom_ctl.c 2018-05-27 21:15:33 UTC (rev 10004)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/geom_ctl.c,v 1.4 2011/12/10 22:55:34 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/geom/geom_ctl.c,v 1.39.2.1 2009/01/11 21:45:23 sam Exp $");
+__FBSDID("$FreeBSD: stable/10/sys/geom/geom_ctl.c 299397 2016-05-11 00:36:31Z pfg $");
#include "opt_geom.h"
@@ -85,8 +85,8 @@
}
/*
- * Report an error back to the user in ascii format. Return whatever copyout
- * returned, or EINVAL if it succeeded.
+ * Report an error back to the user in ascii format. Return nerror
+ * or EINVAL if nerror isn't specified.
*/
int
gctl_error(struct gctl_req *req, const char *fmt, ...)
@@ -100,9 +100,10 @@
if (sbuf_done(req->serror)) {
if (!req->nerror)
req->nerror = EEXIST;
+ return (req->nerror);
}
- if (req->nerror)
- return (req->nerror);
+ if (!req->nerror)
+ req->nerror = EINVAL;
va_start(ap, fmt);
sbuf_vprintf(req->serror, fmt, ap);
@@ -110,7 +111,7 @@
sbuf_finish(req->serror);
if (g_debugflags & G_F_CTLDUMP)
printf("gctl %p error \"%s\"\n", req, sbuf_data(req->serror));
- return (0);
+ return (req->nerror);
}
/*
@@ -123,14 +124,10 @@
void *ptr;
ptr = g_malloc(len, M_WAITOK);
- if (ptr == NULL)
- req->nerror = ENOMEM;
- else
- req->nerror = copyin(uaddr, ptr, len);
+ req->nerror = copyin(uaddr, ptr, len);
if (!req->nerror)
return (ptr);
- if (ptr != NULL)
- g_free(ptr);
+ g_free(ptr);
return (NULL);
}
@@ -137,13 +134,13 @@
static void
gctl_copyin(struct gctl_req *req)
{
- int error, i;
struct gctl_req_arg *ap;
char *p;
+ u_int i;
ap = geom_alloc_copyin(req, req->arg, req->narg * sizeof(*ap));
if (ap == NULL) {
- req->nerror = ENOMEM;
+ gctl_error(req, "bad control request");
req->arg = NULL;
return;
}
@@ -155,10 +152,9 @@
ap[i].kvalue = NULL;
}
- error = 0;
for (i = 0; i < req->narg; i++) {
if (ap[i].nlen < 1 || ap[i].nlen > SPECNAMELEN) {
- error = gctl_error(req,
+ gctl_error(req,
"wrong param name length %d: %d", i, ap[i].nlen);
break;
}
@@ -166,7 +162,7 @@
if (p == NULL)
break;
if (p[ap[i].nlen - 1] != '\0') {
- error = gctl_error(req, "unterminated param name");
+ gctl_error(req, "unterminated param name");
g_free(p);
break;
}
@@ -173,7 +169,7 @@
ap[i].name = p;
ap[i].flag |= GCTL_PARAM_NAMEKERNEL;
if (ap[i].len <= 0) {
- error = gctl_error(req, "negative param length");
+ gctl_error(req, "negative param length");
break;
}
p = geom_alloc_copyin(req, ap[i].value, ap[i].len);
@@ -181,7 +177,7 @@
break;
if ((ap[i].flag & GCTL_PARAM_ASCII) &&
p[ap[i].len - 1] != '\0') {
- error = gctl_error(req, "unterminated param value");
+ gctl_error(req, "unterminated param value");
g_free(p);
break;
}
@@ -217,8 +213,9 @@
static void
gctl_free(struct gctl_req *req)
{
- int i;
+ u_int i;
+ sbuf_delete(req->serror);
if (req->arg == NULL)
return;
for (i = 0; i < req->narg; i++) {
@@ -229,15 +226,14 @@
g_free(req->arg[i].kvalue);
}
g_free(req->arg);
- sbuf_delete(req->serror);
}
static void
gctl_dump(struct gctl_req *req)
{
+ struct gctl_req_arg *ap;
u_int i;
int j;
- struct gctl_req_arg *ap;
printf("Dump of gctl request at %p:\n", req);
if (req->nerror > 0) {
@@ -245,6 +241,8 @@
if (sbuf_len(req->serror) > 0)
printf(" error:\t\"%s\"\n", sbuf_data(req->serror));
}
+ if (req->arg == NULL)
+ return;
for (i = 0; i < req->narg; i++) {
ap = &req->arg[i];
if (!(ap->flag & GCTL_PARAM_NAMEKERNEL))
@@ -273,7 +271,7 @@
gctl_set_param(struct gctl_req *req, const char *param, void const *ptr,
int len)
{
- int i;
+ u_int i;
struct gctl_req_arg *ap;
for (i = 0; i < req->narg; i++) {
@@ -314,7 +312,7 @@
void *
gctl_get_param(struct gctl_req *req, const char *param, int *len)
{
- int i;
+ u_int i;
void *p;
struct gctl_req_arg *ap;
@@ -335,7 +333,7 @@
char const *
gctl_get_asciiparam(struct gctl_req *req, const char *param)
{
- int i;
+ u_int i;
char const *p;
struct gctl_req_arg *ap;
@@ -465,7 +463,6 @@
req = (void *)data;
req->nerror = 0;
- req->serror = sbuf_new_auto();
/* It is an error if we cannot return an error text */
if (req->lerror < 2)
return (EINVAL);
@@ -472,23 +469,25 @@
if (!useracc(req->error, req->lerror, VM_PROT_WRITE))
return (EINVAL);
+ req->serror = sbuf_new_auto();
/* Check the version */
- if (req->version != GCTL_VERSION)
- return (gctl_error(req,
- "kernel and libgeom version mismatch."));
-
- /* Get things on board */
- gctl_copyin(req);
+ if (req->version != GCTL_VERSION) {
+ gctl_error(req, "kernel and libgeom version mismatch.");
+ req->arg = NULL;
+ } else {
+ /* Get things on board */
+ gctl_copyin(req);
- if (g_debugflags & G_F_CTLDUMP)
- gctl_dump(req);
+ if (g_debugflags & G_F_CTLDUMP)
+ gctl_dump(req);
- if (!req->nerror) {
- g_waitfor_event(g_ctl_req, req, M_WAITOK, NULL);
- gctl_copyout(req);
+ if (!req->nerror) {
+ g_waitfor_event(g_ctl_req, req, M_WAITOK, NULL);
+ gctl_copyout(req);
+ }
}
if (sbuf_done(req->serror)) {
- req->nerror = copyout(sbuf_data(req->serror), req->error,
+ copyout(sbuf_data(req->serror), req->error,
imin(req->lerror, sbuf_len(req->serror) + 1));
}
More information about the Midnightbsd-cvs
mailing list