d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for malloc failure (also move malloc up to simplify error recovery)

Browse Source 
Noticed by:	Coverity Prevent analysis tool
Reviewed by:	gnn
This commit is contained in:
Sam Leffler 2005-03-29 01:26:27 +00:00
parent 812d865346
commit 8a9d54df38
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=144261
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/netinet6/raw_ip6.c
View File

@ -560,6 +560,7 @@ static int
rip6_attach(struct socket *so, int proto, struct thread *td)
{
struct inpcb *inp;
struct icmp6_filter *filter;
int error, s;
INP_INFO_WLOCK(&ripcbinfo);
@ -577,11 +578,16 @@ rip6_attach(struct socket *so, int proto, struct thread *td)
INP_INFO_WUNLOCK(&ripcbinfo);
return error;
}
MALLOC(filter, struct icmp6_filter *,
sizeof(struct icmp6_filter), M_PCB, M_NOWAIT);
if (filter == NULL)
return ENOMEM;
s = splnet();
error = in_pcballoc(so, &ripcbinfo, "raw6inp");
splx(s);
if (error) {
INP_INFO_WUNLOCK(&ripcbinfo);
FREE(filter, M_PCB);
return error;
}
inp = (struct inpcb *)so->so_pcb;
@ -591,8 +597,7 @@ rip6_attach(struct socket *so, int proto, struct thread *td)
inp->in6p_ip6_nxt = (long)proto;
inp->in6p_hops = -1; /* use kernel default */
inp->in6p_cksum = -1;
MALLOC(inp->in6p_icmp6filt, struct icmp6_filter *,
sizeof(struct icmp6_filter), M_PCB, M_NOWAIT);
inp->in6p_icmp6filt = filter;
ICMP6_FILTER_SETPASSALL(inp->in6p_icmp6filt);
INP_UNLOCK(inp);
return 0;