diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-07-17 14:39:02 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-07-17 14:39:02 +0000 |
| commit | 52a6e6d8c7466fe78ab755ae2895dfc0948e401d (patch) | |
| tree | 4a9ebef9441b29a1c207267e9c3af58a748d4854 | |
| parent | a58a8938cc1bea57af6fbdda6a428864c6034791 (diff) | |
| download | cygnal-52a6e6d8c7466fe78ab755ae2895dfc0948e401d.tar.gz cygnal-52a6e6d8c7466fe78ab755ae2895dfc0948e401d.tar.bz2 cygnal-52a6e6d8c7466fe78ab755ae2895dfc0948e401d.zip | |
* fhandler.cc (fhandler_base::fhaccess): Add check for R/O file system.
* security.cc (check_registry_access): Set errno to EROFS when checking
for W_OK.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 6 | ||||
| -rw-r--r-- | winsup/cygwin/security.cc | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 50a09c106..5afa9dafd 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2007-07-17 Corinna Vinschen <corinna@vinschen.de> + * fhandler.cc (fhandler_base::fhaccess): Add check for R/O file system. + * security.cc (check_registry_access): Set errno to EROFS when checking + for W_OK. + +2007-07-17 Corinna Vinschen <corinna@vinschen.de> + * fhandler_disk_file.cc (fhandler_disk_file::opendir): Move setting cfd->nohandle where it won't crash. diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index ccd556c39..1920dbec7 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -443,6 +443,12 @@ fhandler_base::fhaccess (int flags) eaccess_done: set_errno (EACCES); done: + if (!res && (flags & W_OK) && get_device () == FH_FS + && (pc.fs_flags () & FILE_READ_ONLY_VOLUME)) + { + set_errno (EROFS); + res = -1; + } debug_printf ("returning %d", res); return res; } diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index 130b92d25..2c3cb141c 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -2044,7 +2044,10 @@ check_registry_access (HANDLE hdl, int flags) ret = check_access (sd, mapping, desired, flags); /* As long as we can't write the registry... */ if (flags & W_OK) - ret = -1; + { + set_errno (EROFS); + ret = -1; + } debug_printf ("flags %x, ret %d", flags, ret); return ret; } |