summaryrefslogtreecommitdiffstats
path: root/sys/kern/link_elf.c
diff options
context:
space:
mode:
authordchagin <dchagin@FreeBSD.org>2011-04-16 16:20:51 +0000
committerdchagin <dchagin@FreeBSD.org>2011-04-16 16:20:51 +0000
commit95da67cdb879f2629d864907d93b430ff3c237fb (patch)
tree62580fe174811890d7717b4438e7037b85d8f5f4 /sys/kern/link_elf.c
parentd47945ce8b7bb137ed04a2a05ff8f15ce2139fe3 (diff)
downloadFreeBSD-src-95da67cdb879f2629d864907d93b430ff3c237fb.zip
FreeBSD-src-95da67cdb879f2629d864907d93b430ff3c237fb.tar.gz
Remove malloc(9) return value checks when M_WAITOK is used.
MFC after: 2 Week
Diffstat (limited to 'sys/kern/link_elf.c')
-rw-r--r--sys/kern/link_elf.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 1e0bac1..38bf37f 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -692,10 +692,6 @@ link_elf_load_file(linker_class_t cls, const char* filename,
* Read the elf header from the file.
*/
firstpage = malloc(PAGE_SIZE, M_LINKER, M_WAITOK);
- if (firstpage == NULL) {
- error = ENOMEM;
- goto out;
- }
hdr = (Elf_Ehdr *)firstpage;
error = vn_rdwr(UIO_READ, nd.ni_vp, firstpage, PAGE_SIZE, 0,
UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED,
@@ -829,10 +825,6 @@ link_elf_load_file(linker_class_t cls, const char* filename,
}
#else
ef->address = malloc(mapsize, M_LINKER, M_WAITOK);
- if (ef->address == NULL) {
- error = ENOMEM;
- goto out;
- }
#endif
mapbase = ef->address;
@@ -918,10 +910,6 @@ link_elf_load_file(linker_class_t cls, const char* filename,
if (nbytes == 0 || hdr->e_shoff == 0)
goto nosyms;
shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO);
- if (shdr == NULL) {
- error = ENOMEM;
- goto out;
- }
error = vn_rdwr(UIO_READ, nd.ni_vp,
(caddr_t)shdr, nbytes, hdr->e_shoff,
UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED,
@@ -944,10 +932,6 @@ link_elf_load_file(linker_class_t cls, const char* filename,
strcnt = shdr[symstrindex].sh_size;
ef->strbase = malloc(strcnt, M_LINKER, M_WAITOK);
- if (ef->symbase == NULL || ef->strbase == NULL) {
- error = ENOMEM;
- goto out;
- }
error = vn_rdwr(UIO_READ, nd.ni_vp,
ef->symbase, symcnt, shdr[symtabindex].sh_offset,
UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED,
@@ -1318,8 +1302,6 @@ link_elf_lookup_set(linker_file_t lf, const char *name,
len = strlen(name) + sizeof("__start_set_"); /* sizeof includes \0 */
setsym = malloc(len, M_LINKER, M_WAITOK);
- if (setsym == NULL)
- return (ENOMEM);
/* get address of first entry */
snprintf(setsym, len, "%s%s", "__start_set_", name);
OpenPOWER on IntegriCloud