CVS commit: [netbsd-9] src/sys/fs/ptyfs

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Mon Aug 29 15:45:10 UTC 2022

Modified Files:
        src/sys/fs/ptyfs [netbsd-9]: ptyfs_vnops.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1504):

        sys/fs/ptyfs/ptyfs_vnops.c: revision 1.69

ptyfs: Don't copy out cookies past end of buffer.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.4.1 src/sys/fs/ptyfs/ptyfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/fs/ptyfs/ptyfs_vnops.c
diff -u src/sys/fs/ptyfs/ptyfs_vnops.c:1.55 src/sys/fs/ptyfs/ptyfs_vnops.c:1.55.4.1
--- src/sys/fs/ptyfs/ptyfs_vnops.c:1.55	Mon Sep  3 16:29:35 2018
+++ src/sys/fs/ptyfs/ptyfs_vnops.c	Mon Aug 29 15:45:10 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptyfs_vnops.c,v 1.55 2018/09/03 16:29:35 riastradh Exp $	*/
+/*	$NetBSD: ptyfs_vnops.c,v 1.55.4.1 2022/08/29 15:45:10 martin Exp $	*/
 
 /*
  * Copyright (c) 1993, 1995
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.55 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.55.4.1 2022/08/29 15:45:10 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -716,7 +716,7 @@ ptyfs_readdir(void *v)
 		*ap->a_cookies = cookies;
 	}
 
-	for (; i < 2; i++) {
+	for (; i < 2 && uio->uio_resid >= UIO_MX; i++) {
 		/* `.' and/or `..' */
 		dp->d_fileno = PTYFS_FILENO(0, PTYFSroot);
 		dp->d_namlen = i + 1;