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

Fix nfssvc_addsock() to not attempt to free a NULL socket structure

Browse Source 
when returning an error.  Bug fix was extracted from the PR.  The PR
    is not yet entirely resolved by this commit.

PR:		kern/13049
Reviewed by:	Matt Dillon <dillon@freebsd.org>
Submitted by:	Ian Dowse <iedowse@maths.tcd.ie>
This commit is contained in:
dillon 1999-11-08 19:10:16 +00:00
parent 0b538034b3
commit 2fb940a103
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/nfs/nfs_syscalls.c
View File

@ -334,14 +334,16 @@ nfssvc_addsock(fp, mynam, p)
if (so->so_proto->pr_protocol == IPPROTO_UDP) { if (so->so_proto->pr_protocol == IPPROTO_UDP) {
tslp = nfs_udpsock; tslp = nfs_udpsock;
if (tslp->ns_flag & SLP_VALID) { if (tslp->ns_flag & SLP_VALID) {
FREE(mynam, M_SONAME); if (mynam != NULL)
FREE(mynam, M_SONAME);
return (EPERM); return (EPERM);
} }
#ifdef ISO #ifdef ISO
} else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) { } else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) {
tslp = nfs_cltpsock; tslp = nfs_cltpsock;
if (tslp->ns_flag & SLP_VALID) { if (tslp->ns_flag & SLP_VALID) {
FREE(mynam, M_SONAME); if (mynam != NULL)
FREE(mynam, M_SONAME);
return (EPERM); return (EPERM);
} }
#endif /* ISO */ #endif /* ISO */
@ -352,7 +354,8 @@ nfssvc_addsock(fp, mynam, p)
siz = NFS_MAXPACKET; siz = NFS_MAXPACKET;
error = soreserve(so, siz, siz); error = soreserve(so, siz, siz);
if (error) { if (error) {
FREE(mynam, M_SONAME); if (mynam != NULL)
FREE(mynam, M_SONAME);
return (error); return (error);
} }

9
sys/nfsclient/nfs_nfsiod.c
View File

@ -334,14 +334,16 @@ nfssvc_addsock(fp, mynam, p)
if (so->so_proto->pr_protocol == IPPROTO_UDP) { if (so->so_proto->pr_protocol == IPPROTO_UDP) {
tslp = nfs_udpsock; tslp = nfs_udpsock;
if (tslp->ns_flag & SLP_VALID) { if (tslp->ns_flag & SLP_VALID) {
FREE(mynam, M_SONAME); if (mynam != NULL)
FREE(mynam, M_SONAME);
return (EPERM); return (EPERM);
} }
#ifdef ISO #ifdef ISO
} else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) { } else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) {
tslp = nfs_cltpsock; tslp = nfs_cltpsock;
if (tslp->ns_flag & SLP_VALID) { if (tslp->ns_flag & SLP_VALID) {
FREE(mynam, M_SONAME); if (mynam != NULL)
FREE(mynam, M_SONAME);
return (EPERM); return (EPERM);
} }
#endif /* ISO */ #endif /* ISO */
@ -352,7 +354,8 @@ nfssvc_addsock(fp, mynam, p)
siz = NFS_MAXPACKET; siz = NFS_MAXPACKET;
error = soreserve(so, siz, siz); error = soreserve(so, siz, siz);
if (error) { if (error) {
FREE(mynam, M_SONAME); if (mynam != NULL)
FREE(mynam, M_SONAME);
return (error); return (error);
} }

9
sys/nfsserver/nfs_syscalls.c
View File

@ -334,14 +334,16 @@ nfssvc_addsock(fp, mynam, p)
if (so->so_proto->pr_protocol == IPPROTO_UDP) { if (so->so_proto->pr_protocol == IPPROTO_UDP) {
tslp = nfs_udpsock; tslp = nfs_udpsock;
if (tslp->ns_flag & SLP_VALID) { if (tslp->ns_flag & SLP_VALID) {
FREE(mynam, M_SONAME); if (mynam != NULL)
FREE(mynam, M_SONAME);
return (EPERM); return (EPERM);
} }
#ifdef ISO #ifdef ISO
} else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) { } else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) {
tslp = nfs_cltpsock; tslp = nfs_cltpsock;
if (tslp->ns_flag & SLP_VALID) { if (tslp->ns_flag & SLP_VALID) {
FREE(mynam, M_SONAME); if (mynam != NULL)
FREE(mynam, M_SONAME);
return (EPERM); return (EPERM);
} }
#endif /* ISO */ #endif /* ISO */
@ -352,7 +354,8 @@ nfssvc_addsock(fp, mynam, p)
siz = NFS_MAXPACKET; siz = NFS_MAXPACKET;
error = soreserve(so, siz, siz); error = soreserve(so, siz, siz);
if (error) { if (error) {
FREE(mynam, M_SONAME); if (mynam != NULL)
FREE(mynam, M_SONAME);
return (error); return (error);
} }