diff options
| author | David Greenman <dg@FreeBSD.org> | 1995-11-12 10:16:53 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1995-11-12 10:16:53 +0000 |
| commit | ba14c327258056ce8841a79614ef3987108aa9da (patch) | |
| tree | a59c2918b630f1fdd66be9df10be77c984e38f25 /sys/fs | |
| parent | bea41bcf3a2a720845eaab7e5f8702d53a735d2a (diff) | |
| download | src-ba14c327258056ce8841a79614ef3987108aa9da.tar.gz src-ba14c327258056ce8841a79614ef3987108aa9da.zip | |
Fix isoilk hang caused by not checking for read-onlyness in several places.
The fix for this in Lite-2 is more complete, but these quick hacks of mine
are safer for now. I plan to integrate the additional Lite-2 stuff at some
later time. Should completely fix PR810.
Notes
Notes:
svn path=/head/; revision=12228
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/cd9660/cd9660_lookup.c | 4 | ||||
| -rw-r--r-- | sys/fs/cd9660/cd9660_vnops.c | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index 9c359d13403f..c22bfcdf1832 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -38,7 +38,7 @@ * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91 * * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_lookup.c,v 1.7 1995/05/30 08:04:57 rgrimes Exp $ + * $Id: cd9660_lookup.c,v 1.8 1995/10/22 09:32:15 davidg Exp $ */ #include <sys/param.h> @@ -376,7 +376,7 @@ notfound: if (cnp->cn_flags & MAKEENTRY) cache_enter(vdp, *vpp, cnp); if (nameiop == CREATE || nameiop == RENAME) - return (EJUSTRETURN); + return (EROFS); return (ENOENT); found: diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 074de85d434c..0296eca22d45 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vnops.c 8.3 (Berkeley) 1/23/94 - * $Id: cd9660_vnops.c,v 1.18 1995/10/31 12:13:47 phk Exp $ + * $Id: cd9660_vnops.c,v 1.19 1995/11/09 08:13:37 bde Exp $ */ #include <sys/param.h> @@ -183,6 +183,22 @@ cd9660_access(ap) struct proc *a_p; } */ *ap; { + /* + * Disallow write attempts on read-only file systems; + * unless the file is a socket, fifo, or a block or + * character device resident on the file system. + */ + if (ap->a_mode & VWRITE) { + switch (ap->a_vp->v_type) { + case VDIR: + case VLNK: + case VREG: + if (ap->a_vp->v_mount->mnt_flag & MNT_RDONLY) + return (EROFS); + break; + } + } + return (0); } |