CVS commit: [netbsd-5] src/sys/coda

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Wed Jan 25 21:20:51 UTC 2012

Modified Files:
src/sys/coda [netbsd-5]: coda.h

Log Message:
Pull up following revision(s) (requested by gdt in ticket #1716):
sys/coda/coda.h: revision 1.15
Make file_id unsigned so it does not get sign extended when promoted
to a 64bit ino_t.


To generate a diff of this commit:
cvs rdiff -u -r1.14.52.1 -r1.14.52.2 src/sys/coda/coda.h

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

Modified files:

Index: src/sys/coda/coda.h
diff -u src/sys/coda/coda.h:1.14.52.1 src/sys/coda/coda.h:1.14.52.2
--- src/sys/coda/coda.h:1.14.52.1	Wed Aug 25 04:17:47 2010
+++ src/sys/coda/coda.h	Wed Jan 25 21:20:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: coda.h,v 1.14.52.1 2010/08/25 04:17:47 snj Exp $ */
+/* $NetBSD: coda.h,v 1.14.52.2 2012/01/25 21:20:51 riz Exp $ */
 
 /*
 
@@ -272,7 +272,7 @@ struct coda_vattr {
 	short		va_nlink;	/* number of references to file */
 	uid_t		va_uid;		/* owner user id */
 	gid_t		va_gid;		/* owner group id */
-	long		va_fileid;	/* file id */
+	u_long		va_fileid;	/* file id */
 	u_quad_t	va_size;	/* file size in bytes */
 	long		va_blocksize;	/* blocksize preferred for i/o */
 	struct timespec	va_atime;	/* time of last access */

CVS commit: [netbsd-5] src/sys/coda

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Aug 25 04:17:48 UTC 2010

Modified Files:
src/sys/coda [netbsd-5]: coda.h coda_venus.c coda_vnops.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1431):
sys/coda/coda.h: revision 1.16
sys/coda/coda_venus.c: revision 1.28
sys/coda/coda_vnops.c: revision 1.76
Correct incomplete size checks for the coda ioctls. From Dan Rosenberg.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.52.1 src/sys/coda/coda.h
cvs rdiff -u -r1.25 -r1.25.52.1 src/sys/coda/coda_venus.c
cvs rdiff -u -r1.68 -r1.68.22.1 src/sys/coda/coda_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/coda/coda.h
diff -u src/sys/coda/coda.h:1.14 src/sys/coda/coda.h:1.14.52.1
--- src/sys/coda/coda.h:1.14	Sun Mar  4 06:01:11 2007
+++ src/sys/coda/coda.h	Wed Aug 25 04:17:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: coda.h,v 1.14 2007/03/04 06:01:11 christos Exp $ */
+/* $NetBSD: coda.h,v 1.14.52.1 2010/08/25 04:17:47 snj Exp $ */
 
 /*
 
@@ -793,8 +793,8 @@
 #define PIOCPARM_MASK 0x
 struct ViceIoctl {
 void *in, *out;		/* Data to be transferred in, or out */
-short in_size;  /* Size of input buffer = 2K */
-short out_size; /* Maximum size of output buffer, = 2K */
+unsigned short in_size; /* Size of input buffer = 2K */
+unsigned short out_size;/* Maximum size of output buffer, = 2K */
 };
 
 struct PioctlData {

Index: src/sys/coda/coda_venus.c
diff -u src/sys/coda/coda_venus.c:1.25 src/sys/coda/coda_venus.c:1.25.52.1
--- src/sys/coda/coda_venus.c:1.25	Sun Mar  4 06:01:12 2007
+++ src/sys/coda/coda_venus.c	Wed Aug 25 04:17:47 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: coda_venus.c,v 1.25 2007/03/04 06:01:12 christos Exp $	*/
+/*	$NetBSD: coda_venus.c,v 1.25.52.1 2010/08/25 04:17:47 snj Exp $	*/
 
 /*
  *
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: coda_venus.c,v 1.25 2007/03/04 06:01:12 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: coda_venus.c,v 1.25.52.1 2010/08/25 04:17:47 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -308,7 +308,7 @@
 tmp = ((com  16)  IOCPARM_MASK) - sizeof (char *) - sizeof (int);
 inp-cmd |= (tmp  IOCPARM_MASK) 	16;
 
-if (iap-vi.in_size  0 || iap-vi.in_size  VC_MAXMSGSIZE) {
+if (iap-vi.in_size  VC_MAXMSGSIZE || iap-vi.out_size  VC_MAXMSGSIZE) {
 	CODA_FREE(inp, coda_ioctl_size);
 	return (EINVAL);
 }

Index: src/sys/coda/coda_vnops.c
diff -u src/sys/coda/coda_vnops.c:1.68 src/sys/coda/coda_vnops.c:1.68.22.1
--- src/sys/coda/coda_vnops.c:1.68	Wed Jan 30 09:50:19 2008
+++ src/sys/coda/coda_vnops.c	Wed Aug 25 04:17:47 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: coda_vnops.c,v 1.68 2008/01/30 09:50:19 ad Exp $	*/
+/*	$NetBSD: coda_vnops.c,v 1.68.22.1 2010/08/25 04:17:47 snj Exp $	*/
 
 /*
  *
@@ -46,7 +46,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: coda_vnops.c,v 1.68 2008/01/30 09:50:19 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: coda_vnops.c,v 1.68.22.1 2010/08/25 04:17:47 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -541,7 +541,7 @@
 	return(EINVAL);
 }
 
-if (iap-vi.in_size  VC_MAXDATASIZE) {
+if (iap-vi.in_size  VC_MAXDATASIZE || iap-vi.out_size  VC_MAXDATASIZE) {
 	vrele(tvp);
 	return(EINVAL);
 }