summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2004-08-03 06:58:41 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2004-08-03 06:58:41 +0000
commit13301c5989872d4ade7f776335fef413c5759290 (patch)
tree1bffc787e5b032edc4498de78356b8244386750b
parenta660c187998bcb15a4d9f63d0e0c901f96327e3b (diff)
When accessing device nodes over nfs, do not trim major and minor numbers
to 8 bits only; found the hard way by henning@. Ok deraadt@ marius@ millert@
-rw-r--r--sys/nfs/nfs_subs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 03c30ea00da..6cd3d3290c7 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_subs.c,v 1.48 2004/07/21 17:30:55 marius Exp $ */
+/* $OpenBSD: nfs_subs.c,v 1.49 2004/08/03 06:58:40 miod Exp $ */
/* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */
/*
@@ -1139,8 +1139,8 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
if (v3) {
vtyp = nfsv3tov_type(fp->fa_type);
vmode = fxdr_unsigned(mode_t, fp->fa_mode);
- rdev = makedev(fxdr_unsigned(u_char, fp->fa3_rdev.specdata1),
- fxdr_unsigned(u_char, fp->fa3_rdev.specdata2));
+ rdev = makedev(fxdr_unsigned(u_int32_t, fp->fa3_rdev.specdata1),
+ fxdr_unsigned(u_int32_t, fp->fa3_rdev.specdata2));
fxdr_nfsv3time(&fp->fa3_mtime, &mtime);
} else {
vtyp = nfsv2tov_type(fp->fa_type);