Re: svn commit: r302454 - stable/9/usr.sbin/rpcbind

2016-07-08 Thread Bryan Drewery 
On 7/8/16 1:40 PM, Garrett Cooper wrote:
> Author: ngie
> Date: Fri Jul  8 20:40:50 2016
> New Revision: 302454
> URL: https://svnweb.freebsd.org/changeset/base/302454
> 
> Log:
>   MFstable/10 r302453:

I just noticed this. Why merge from stable/10 and not head? The
documentation does state 'head'.  The only exception I know of is
merging to releng/ which originates from stable.

https://www.freebsd.org/doc/en/articles/committers-guide/article.html

"For instance, you will always merge stable/7/lib/libc/ from
head/lib/libc/."

>   
>   MFC r301605:


-- 
Regards,
Bryan Drewery
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r302454 - stable/9/usr.sbin/rpcbind

2016-07-08 Thread Garrett Cooper 
Author: ngie
Date: Fri Jul  8 20:40:50 2016
New Revision: 302454
URL: https://svnweb.freebsd.org/changeset/base/302454

Log:
  MFstable/10 r302453:
  
  MFC r301605:
  
  Bounds check rpcbs_rmtcall(..) to ensure rtype is less than RPCBVERS_STAT
  
  Not returning if rtype == RPCBVERS_STAT will cause us to overrun the inf 
array, as
  it's defined to be exactly RPCBVERS_STAT elements in rpcb_prot.x:
  
  > include/rpc/rpcb_prot.x:typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
  
  The proposed change also matches the rest of the rtype upper bound checks in 
the
  file, so the original change was likely a typo.
  
  CID: 1007567

Modified:
  stable/9/usr.sbin/rpcbind/rpcb_stat.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/usr.sbin/   (props changed)

Modified: stable/9/usr.sbin/rpcbind/rpcb_stat.c
==
--- stable/9/usr.sbin/rpcbind/rpcb_stat.c   Fri Jul  8 20:39:37 2016
(r302453)
+++ stable/9/usr.sbin/rpcbind/rpcb_stat.c   Fri Jul  8 20:40:50 2016
(r302454)
@@ -152,7 +152,7 @@ rpcbs_rmtcall(rpcvers_t rtype, rpcproc_t
rpcbs_rmtcalllist *rl;
struct netconfig *nconf;
 
-   if (rtype > RPCBVERS_STAT)
+   if (rtype >= RPCBVERS_STAT)
return;
for (rl = inf[rtype].rmtinfo; rl; rl = rl->next) {
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"