MFC r297391:
Remove some NULL checks for M_WAITOK allocations.
This commit is contained in:
parent
039c648cc1
commit
46cba9192e
@ -1325,10 +1325,6 @@ __elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags)
|
||||
* and write it out following the notes.
|
||||
*/
|
||||
hdr = malloc(hdrsize, M_TEMP, M_WAITOK);
|
||||
if (hdr == NULL) {
|
||||
error = EINVAL;
|
||||
goto done;
|
||||
}
|
||||
error = __elfN(corehdr)(td, vp, cred, seginfo.count, hdr, hdrsize,
|
||||
¬elst, notesz, gzfile);
|
||||
|
||||
|
@ -1498,8 +1498,6 @@ exec_register(execsw_arg)
|
||||
for (es = execsw; *es; es++)
|
||||
count++;
|
||||
newexecsw = malloc(count * sizeof(*es), M_TEMP, M_WAITOK);
|
||||
if (newexecsw == NULL)
|
||||
return (ENOMEM);
|
||||
xs = newexecsw;
|
||||
if (execsw)
|
||||
for (es = execsw; *es; es++)
|
||||
@ -1532,8 +1530,6 @@ exec_unregister(execsw_arg)
|
||||
if (*es != execsw_arg)
|
||||
count++;
|
||||
newexecsw = malloc(count * sizeof(*es), M_TEMP, M_WAITOK);
|
||||
if (newexecsw == NULL)
|
||||
return (ENOMEM);
|
||||
xs = newexecsw;
|
||||
for (es = execsw; *es; es++)
|
||||
if (*es != execsw_arg)
|
||||
|
@ -1762,8 +1762,6 @@ linker_hints_lookup(const char *path, int pathlen, const char *modname,
|
||||
goto bad;
|
||||
}
|
||||
hints = malloc(vattr.va_size, M_TEMP, M_WAITOK);
|
||||
if (hints == NULL)
|
||||
goto bad;
|
||||
error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t)hints, vattr.va_size, 0,
|
||||
UIO_SYSSPACE, IO_NODELOCKED, cred, NOCRED, &reclen, td);
|
||||
if (error)
|
||||
|
@ -301,8 +301,6 @@ rts_attach(struct socket *so, int proto, struct thread *td)
|
||||
|
||||
/* XXX */
|
||||
rp = malloc(sizeof *rp, M_PCB, M_WAITOK | M_ZERO);
|
||||
if (rp == NULL)
|
||||
return ENOBUFS;
|
||||
|
||||
so->so_pcb = (caddr_t)rp;
|
||||
so->so_fibnum = td->td_proc->p_fibnum;
|
||||
|
@ -1285,8 +1285,6 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS)
|
||||
return (error);
|
||||
|
||||
inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
|
||||
if (inp_list == NULL)
|
||||
return (ENOMEM);
|
||||
|
||||
INP_INFO_RLOCK(&V_tcbinfo);
|
||||
for (inp = LIST_FIRST(V_tcbinfo.ipi_listhead), i = 0;
|
||||
|
@ -390,15 +390,11 @@ __rpc_uaddr2taddr_af(int af, const char *uaddr)
|
||||
}
|
||||
|
||||
ret = (struct netbuf *)malloc(sizeof *ret, M_RPC, M_WAITOK);
|
||||
if (ret == NULL)
|
||||
goto out;
|
||||
|
||||
switch (af) {
|
||||
case AF_INET:
|
||||
sin = (struct sockaddr_in *)malloc(sizeof *sin, M_RPC,
|
||||
M_WAITOK);
|
||||
if (sin == NULL)
|
||||
goto out;
|
||||
memset(sin, 0, sizeof *sin);
|
||||
sin->sin_family = AF_INET;
|
||||
sin->sin_port = htons(port);
|
||||
@ -415,8 +411,6 @@ __rpc_uaddr2taddr_af(int af, const char *uaddr)
|
||||
case AF_INET6:
|
||||
sin6 = (struct sockaddr_in6 *)malloc(sizeof *sin6, M_RPC,
|
||||
M_WAITOK);
|
||||
if (sin6 == NULL)
|
||||
goto out;
|
||||
memset(sin6, 0, sizeof *sin6);
|
||||
sin6->sin6_family = AF_INET6;
|
||||
sin6->sin6_port = htons(port);
|
||||
@ -433,8 +427,6 @@ __rpc_uaddr2taddr_af(int af, const char *uaddr)
|
||||
case AF_LOCAL:
|
||||
sun = (struct sockaddr_un *)malloc(sizeof *sun, M_RPC,
|
||||
M_WAITOK);
|
||||
if (sun == NULL)
|
||||
goto out;
|
||||
memset(sun, 0, sizeof *sun);
|
||||
sun->sun_family = AF_LOCAL;
|
||||
strncpy(sun->sun_path, addrstr, sizeof(sun->sun_path) - 1);
|
||||
|
@ -599,8 +599,6 @@ ufs_extattr_enable(struct ufsmount *ump, int attrnamespace,
|
||||
|
||||
attribute = malloc(sizeof(struct ufs_extattr_list_entry),
|
||||
M_UFS_EXTATTR, M_WAITOK);
|
||||
if (attribute == NULL)
|
||||
return (ENOMEM);
|
||||
|
||||
if (!(ump->um_extattr.uepm_flags & UFS_EXTATTR_UEPM_STARTED)) {
|
||||
error = EOPNOTSUPP;
|
||||
|
Loading…
Reference in New Issue
Block a user