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

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

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

MFC after: 1 week
Found by: Valgrind
Reported by: Dan Roberts <dan.roberts@isilon.com>
Submitted by: Miles Ohlrich <miles.ohlrich@isilon.com>
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2016-01-12 00:20:57 +00:00
parent 6420fb29aa
commit c16d674c2d
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

@ -207,14 +207,14 @@ xdr_rpcb_entry_list_ptr(XDR *xdrs, rpcb_entry_list_ptr *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;
/* /*