X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/a39ff7e25e19b3a8c3020042a3872ca9ec9659f1..d9a64523371fa019c4575bb400cbbc3a50ac9903:/bsd/nfs/nfs_socket.c diff --git a/bsd/nfs/nfs_socket.c b/bsd/nfs/nfs_socket.c index 917927c01..8e3562c64 100644 --- a/bsd/nfs/nfs_socket.c +++ b/bsd/nfs/nfs_socket.c @@ -4749,6 +4749,7 @@ nfs_request_timer(__unused void *param0, __unused void *param1) int timeo, maxtime, finish_asyncio, error; struct timeval now; TAILQ_HEAD(nfs_mount_pokeq, nfsmount) nfs_mount_poke_queue; + TAILQ_INIT(&nfs_mount_poke_queue); restart: lck_mtx_lock(nfs_request_mutex); @@ -4760,7 +4761,6 @@ restart: } nfs_reqbusy(req); - TAILQ_INIT(&nfs_mount_poke_queue); microuptime(&now); for ( ; req != NULL ; req = nfs_reqnext(req)) { @@ -5345,7 +5345,8 @@ nfs_portmap_lookup( struct sockaddr *saddr = (struct sockaddr*)&ss; struct nfsm_chain nmreq, nmrep; mbuf_t mreq; - int error = 0, ip, pmprog, pmvers, pmproc, ualen = 0; + int error = 0, ip, pmprog, pmvers, pmproc; + uint32_t ualen = 0; uint32_t port; uint64_t xid = 0; char uaddr[MAX_IPv6_STR_LEN+16]; @@ -5406,7 +5407,7 @@ tryagain: /* get uaddr string and convert to sockaddr */ nfsm_chain_get_32(error, &nmrep, ualen); if (!error) { - if (ualen > ((int)sizeof(uaddr)-1)) + if (ualen > (sizeof(uaddr)-1)) error = EIO; if (ualen < 1) { /* program is not available, just return a zero port */