From c2bb949a46613bc8115db4e62668fe23594ca4fa Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 15 Mar 2015 10:53:43 +0100 Subject: [PATCH] g_eli_ctl_onetime(): Fix NULL pointer dereference ... caused by the previous commit. #9 0xffffffff80804c02 in calltrap () at /usr/src/sys/amd64/amd64/exception.S:235 #10 0xffffffff81b9dd01 in g_eli_ctl_onetime (req=0xfffffe009433fa20, mp=0xffffffff81baa0b8) at /usr/src/sys/modules/geom/geom_eli/../../../geom/eli/g_eli_ctl.c:270 #11 0xffffffff81b9cf7a in g_eli_config (req=0xfffffe009433fa20, mp=0xffffffff81baa0b8, verb=0xfffff8000265af00 "onetime") at /usr/src/sys/modules/geom/geom_eli/../../../geom/eli/g_eli_ctl.c:1092 #12 0xffffffff8049c8e0 in g_run_events () at /usr/src/sys/geom/geom_event.c:265 #13 0xffffffff80513eda in fork_exit (callout=0xffffffff8049ed40 , arg=0x0, frame=0xfffffe00785d1c00) at /usr/src/sys/kern/kern_fork.c:996 #14 0xffffffff8080513e in fork_trampoline () at /usr/src/sys/amd64/amd64/exception.S:610 #15 0x0000000000000000 in ?? () Current language: auto; currently minimal (kgdb) f 10 #10 0xffffffff81b9dd01 in g_eli_ctl_onetime (req=0xfffffe009433fa20, mp=0xffffffff81baa0b8) at /usr/src/sys/modules/geom/geom_eli/../../../geom/eli/g_eli_ctl.c:270 270 if (*trim) (kgdb) p trim $1 = (int *) 0x0 (kgdb) l - 260 if (detach == NULL) { 261 gctl_error(req, "No '%s' argument.", "trim"); 262 return; 263 } 264 265 strlcpy(md.md_magic, G_ELI_MAGIC, sizeof(md.md_magic)); 266 md.md_version = G_ELI_VERSION; 267 md.md_flags |= G_ELI_FLAG_ONETIME; 268 if (*detach) 269 md.md_flags |= G_ELI_FLAG_WO_DETACH; --- sys/geom/eli/g_eli_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/eli/g_eli_ctl.c b/sys/geom/eli/g_eli_ctl.c index 42f0daf..6834f43 100644 --- a/sys/geom/eli/g_eli_ctl.c +++ b/sys/geom/eli/g_eli_ctl.c @@ -257,7 +257,7 @@ g_eli_ctl_onetime(struct gctl_req *req, struct g_class *mp) return; } trim = gctl_get_paraml(req, "trim", sizeof(*trim)); - if (detach == NULL) { + if (trim == NULL) { gctl_error(req, "No '%s' argument.", "trim"); return; } -- 2.3.0