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

MFC r293715:

Browse Source 
Fix a mismerge from NetBSD in r162194 with `xdr_rpcb_entry_list_ptr(..)`

This fixes the potential NULL pointer dereference properly, and also fixes
memory leaks encountered in the process of iterating through `*rp`.

Found by: Valgrind
Submitted by: Miles Ohlrich <miles.ohlrich@isilon.com>
This commit is contained in:
ngie 2016-01-19 01:30:22 +00:00
parent ba5e3d1893
commit 95e3008df9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc/rpc/rpcb_prot.c
View File

@ -217,14 +217,14 @@ xdr_rpcb_entry_list_ptr(xdrs, rp)
* the case of freeing we must remember the next object * the case of freeing we must remember the next object
* before we free the current object ... * before we free the current object ...
*/ */
if (freeing) if (freeing && *rp)
next = (*rp)->rpcb_entry_next; next = (*rp)->rpcb_entry_next;
if (! xdr_reference(xdrs, (caddr_t *)rp, if (! xdr_reference(xdrs, (caddr_t *)rp,
(u_int)sizeof (rpcb_entry_list), (u_int)sizeof (rpcb_entry_list),
(xdrproc_t)xdr_rpcb_entry)) { (xdrproc_t)xdr_rpcb_entry)) {
return (FALSE); return (FALSE);
} }
if (freeing && *rp) { if (freeing) {
next_copy = next; next_copy = next;
rp = &next_copy; rp = &next_copy;
/* /*