From eb4e6e6bac93da4ff0f9bb63c0a1a0366fc222d6 Mon Sep 17 00:00:00 2001 From: corinna Date: Tue, 17 Jul 2007 14:39:02 +0000 Subject: [PATCH] * 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. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/fhandler.cc | 6 ++++++ winsup/cygwin/security.cc | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 50a09c1060..5afa9dafd3 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2007-07-17 Corinna Vinschen + * 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 + * 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 ccd556c396..1920dbec79 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 130b92d255..2c3cb141c1 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; } -- 2.11.0