diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2016-08-09 15:55:14 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2016-08-09 15:55:14 +0000 |
| commit | 108c2273308bdf2710733485727a68914cf46cc0 (patch) | |
| tree | cd0a5d5c7a79e80fd235ea2e088e7dd79a8d5585 /sys/dev | |
| parent | 4466486fb67e8c5ae0de32b865a7e13975deaa83 (diff) | |
| download | src-108c2273308bdf2710733485727a68914cf46cc0.tar.gz src-108c2273308bdf2710733485727a68914cf46cc0.zip | |
Remove NULL checks after M_WAITOK allocations from sys/dev/ofw/.
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=303875
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ofw/openfirmio.c | 10 | ||||
| -rw-r--r-- | sys/dev/ofw/openpromio.c | 8 |
2 files changed, 0 insertions, 18 deletions
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c index 5803ec1d6c4a..0079310dc83c 100644 --- a/sys/dev/ofw/openfirmio.c +++ b/sys/dev/ofw/openfirmio.c @@ -100,8 +100,6 @@ openfirm_getstr(int len, const char *user, char **cpp) return (ENAMETOOLONG); *cpp = cp = malloc(len + 1, M_TEMP, M_WAITOK); - if (cp == NULL) - return (ENOMEM); error = copyin(user, cp, len); cp[len] = '\0'; return (error); @@ -173,10 +171,6 @@ openfirm_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, if (len <= 0) break; value = malloc(len, M_TEMP, M_WAITOK); - if (value == NULL) { - error = ENOMEM; - break; - } len = OF_getprop(node, name, (void *)value, len); error = copyout(value, of->of_buf, len); break; @@ -199,10 +193,6 @@ openfirm_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, if (error) break; value = malloc(of->of_buflen, M_TEMP, M_WAITOK); - if (value == NULL) { - error = ENOMEM; - break; - } error = copyin(of->of_buf, value, of->of_buflen); if (error) break; diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c index 8ba6d3acef3f..e2a345b1e9db 100644 --- a/sys/dev/ofw/openpromio.c +++ b/sys/dev/ofw/openpromio.c @@ -151,18 +151,10 @@ openprom_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, break; } prop = malloc(len, M_TEMP, M_WAITOK | M_ZERO); - if (prop == NULL) { - error = ENOMEM; - break; - } error = copyinstr(&oprom->oprom_array, prop, len, &done); if (error != 0) break; buf = malloc(OPROMMAXPARAM, M_TEMP, M_WAITOK | M_ZERO); - if (buf == NULL) { - error = ENOMEM; - break; - } node = openprom_node; switch (cmd) { case OPROMGETPROP: |