From 38907b4cc7ddbda8f26a2f55ee2c2065731f0fbc Mon Sep 17 00:00:00 2001 From: Xin LI Date: Tue, 2 Feb 2010 22:25:22 +0000 Subject: [PATCH] Prevent NULL deference by checking return value of gctl_get_asciiparam. MFC after: 2 weeks --- sys/geom/virstor/g_virstor.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/geom/virstor/g_virstor.c b/sys/geom/virstor/g_virstor.c index cd84b05c7a6..efdba4ba3ff 100644 --- a/sys/geom/virstor/g_virstor.c +++ b/sys/geom/virstor/g_virstor.c @@ -311,6 +311,11 @@ virstor_ctl_add(struct gctl_req *req, struct g_class *cp) snprintf(aname, sizeof aname, "arg%d", i); prov_name = gctl_get_asciiparam(req, aname); + if (prov_name == NULL) { + gctl_error(req, "Error fetching argument '%s'", aname); + g_topology_unlock(); + return; + } if (strncmp(prov_name, _PATH_DEV, strlen(_PATH_DEV)) == 0) prov_name += strlen(_PATH_DEV); @@ -565,6 +570,10 @@ virstor_ctl_remove(struct gctl_req *req, struct g_class *cp) sprintf(param, "arg%d", i); prov_name = gctl_get_asciiparam(req, param); + if (prov_name == NULL) { + gctl_error(req, "Error fetching argument '%s'", param); + return; + } if (strncmp(prov_name, _PATH_DEV, strlen(_PATH_DEV)) == 0) prov_name += strlen(_PATH_DEV);