diff options
| author | ae <ae@FreeBSD.org> | 2014-01-23 19:07:22 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2014-01-23 19:07:22 +0000 |
| commit | 3ec50b516b53b75bc8d0a90f5118fdf19cf0de5e (patch) | |
| tree | 0d76ad94edb6491df411115e8908aeb5fea746ac | |
| parent | 535c77d1fcc9f6ae6a8cb27ead8a7467462a5a8f (diff) | |
| download | FreeBSD-src-3ec50b516b53b75bc8d0a90f5118fdf19cf0de5e.zip FreeBSD-src-3ec50b516b53b75bc8d0a90f5118fdf19cf0de5e.tar.gz | |
malloc() with M_WAITOK doesn't return NULL.
MFC after: 1 week
| -rw-r--r-- | sys/geom/geom_ctl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index d8ca92f..afdce69 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -122,10 +122,7 @@ geom_alloc_copyin(struct gctl_req *req, void *uaddr, size_t len) void *ptr; ptr = g_malloc(len, M_WAITOK); - if (ptr == NULL) - req->nerror = ENOMEM; - else - req->nerror = copyin(uaddr, ptr, len); + nreq->nerror = copyin(uaddr, ptr, len); if (!req->nerror) return (ptr); if (ptr != NULL) |
