diff options
author | ngie <ngie@FreeBSD.org> | 2016-08-03 01:06:51 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2016-08-03 01:06:51 +0000 |
commit | bd38a253d7c8bab87a63fc12cace0b20ee4f3ad9 (patch) | |
tree | 22dbcc1d555bb8bb93963f74841dc86334965747 /sys/rpc | |
parent | 747626849cf51886f0f6f0b255728b5fd4aedb28 (diff) | |
download | FreeBSD-src-bd38a253d7c8bab87a63fc12cace0b20ee4f3ad9.zip FreeBSD-src-bd38a253d7c8bab87a63fc12cace0b20ee4f3ad9.tar.gz |
MFC r302550,r302551,r302552,r302553:
Approved by: re (gjb)
r302550:
Deobfuscate cleanup path in clnt_dg_create(..)
Similar to r300836 and r301800, cl and cu will always be non-NULL as they're
allocated using the mem_alloc routines, which always use
`malloc(..., M_WAITOK)`.
Deobfuscating the cleanup path fixes a leak where if cl was NULL and
cu was not, cu would not be free'd, and also removes a duplicate test for
cl not being NULL.
CID: 1007033, 1007344
r302551:
Deobfuscate cleanup path in clnt_vc_create(..)
Similar to r300836, r301800, and r302550, cl and ct will always
be non-NULL as they're allocated using the mem_alloc routines,
which always use `malloc(..., M_WAITOK)`.
CID: 1007342
r302552:
Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to
ANSI C style prototypes
r302553:
Don't test for xpt not being NULL before calling svc_xprt_free(..)
svc_xprt_alloc(..) will always return initialized memory as it uses
mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..).
CID: 1007341
Diffstat (limited to 'sys/rpc')
-rw-r--r-- | sys/rpc/clnt_dg.c | 8 | ||||
-rw-r--r-- | sys/rpc/clnt_vc.c | 10 | ||||
-rw-r--r-- | sys/rpc/svc.c | 5 | ||||
-rw-r--r-- | sys/rpc/svc_dg.c | 5 |
4 files changed, 11 insertions, 17 deletions
diff --git a/sys/rpc/clnt_dg.c b/sys/rpc/clnt_dg.c index 1f181fd..c82d270 100644 --- a/sys/rpc/clnt_dg.c +++ b/sys/rpc/clnt_dg.c @@ -313,11 +313,9 @@ recheck_socket: cl->cl_netid = NULL; return (cl); err2: - if (cl) { - mem_free(cl, sizeof (CLIENT)); - if (cu) - mem_free(cu, sizeof (*cu)); - } + mem_free(cl, sizeof (CLIENT)); + mem_free(cu, sizeof (*cu)); + return (NULL); } diff --git a/sys/rpc/clnt_vc.c b/sys/rpc/clnt_vc.c index 1bd6e1c..67555d6 100644 --- a/sys/rpc/clnt_vc.c +++ b/sys/rpc/clnt_vc.c @@ -270,12 +270,10 @@ clnt_vc_create( return (cl); err: - if (ct) { - mtx_destroy(&ct->ct_lock); - mem_free(ct, sizeof (struct ct_data)); - } - if (cl) - mem_free(cl, sizeof (CLIENT)); + mtx_destroy(&ct->ct_lock); + mem_free(ct, sizeof (struct ct_data)); + mem_free(cl, sizeof (CLIENT)); + return ((CLIENT *)NULL); } diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c index 3e682b9..ea0024b 100644 --- a/sys/rpc/svc.c +++ b/sys/rpc/svc.c @@ -841,7 +841,7 @@ svcerr_progvers(struct svc_req *rqstp, rpcvers_t low_vers, rpcvers_t high_vers) * parameters. */ SVCXPRT * -svc_xprt_alloc() +svc_xprt_alloc(void) { SVCXPRT *xprt; SVCXPRT_EXT *ext; @@ -858,8 +858,7 @@ svc_xprt_alloc() * Free a server transport structure. */ void -svc_xprt_free(xprt) - SVCXPRT *xprt; +svc_xprt_free(SVCXPRT *xprt) { mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT)); diff --git a/sys/rpc/svc_dg.c b/sys/rpc/svc_dg.c index 1c530bd..121d151 100644 --- a/sys/rpc/svc_dg.c +++ b/sys/rpc/svc_dg.c @@ -142,9 +142,8 @@ svc_dg_create(SVCPOOL *pool, struct socket *so, size_t sendsize, return (xprt); freedata: (void) printf(svc_dg_str, __no_mem_str); - if (xprt) { - svc_xprt_free(xprt); - } + svc_xprt_free(xprt); + return (NULL); } |