mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

o Don't cause a panic when the control request lacks a verb.

Browse Source 
o  Don't set the error twice when the named class does not exist.
   It causes ioctl(2) to return with error EEXIST.
This commit is contained in:
Marcel Moolenaar 2005-09-18 23:54:40 +00:00
parent 73130b2224
commit 40fcaded53
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=150304
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/geom/geom_ctl.c
View File

@ -371,7 +371,6 @@ gctl_get_class(struct gctl_req *req, char const *arg)
if (!strcmp(p, cp->name)) if (!strcmp(p, cp->name))
return (cp); return (cp);
} }
gctl_error(req, "Class not found");
return (NULL); return (NULL);
} }
@ -427,11 +426,16 @@ g_ctl_req(void *arg, int flag __unused)
gctl_error(req, "Class not found"); gctl_error(req, "Class not found");
return; return;
} }
verb = gctl_get_param(req, "verb", NULL); if (mp->ctlreq == NULL) {
if (mp->ctlreq == NULL)
gctl_error(req, "Class takes no requests"); gctl_error(req, "Class takes no requests");
else return;
mp->ctlreq(req, mp, verb); }
verb = gctl_get_param(req, "verb", NULL);
if (verb == NULL) {
gctl_error(req, "Verb missing");
return;
}
mp->ctlreq(req, mp, verb);
g_topology_assert(); g_topology_assert();
} }