diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-01-31 10:30:49 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-01-31 10:30:49 +0000 |
| commit | 60363b44ec17a2a0e751d00b248df0879d703745 (patch) | |
| tree | 1b55f887a536c20756762bb748593152e75a9e9b /sys/nfs | |
| parent | 5b53660f595b186a372cadf5cb50116a8dd4d673 (diff) | |
do not walk off the end of a directory info buffer; netbsd pr#3170, mhitch@gemini.oscs.montana.edu
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_serv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index d18d4fc6937..81ed30ef401 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_serv.c,v 1.9 1997/01/28 18:50:21 niklas Exp $ */ +/* $OpenBSD: nfs_serv.c,v 1.10 1997/01/31 10:30:48 deraadt Exp $ */ /* $NetBSD: nfs_serv.c,v 1.25 1996/03/02 15:55:52 jtk Exp $ */ /* @@ -2803,8 +2803,8 @@ again: dp = (struct dirent *)cpos; cookiep = cookies; - while ((dp->d_fileno == 0 || dp->d_type == DT_WHT) - && cpos < cend && ncookies > 0) { + while (cpos < cend && ncookies > 0 + && (dp->d_fileno == 0 || dp->d_type == DT_WHT)) { cpos += dp->d_reclen; dp = (struct dirent *)cpos; cookiep++; |