2014-03-20 20:12:36

by Scott Mayhew

Subject: [nfs-utils PATCH] mount: chk_mountpoint should only check for execute perms for unpriveleged users

Otherwise 'mount -o remount' fails on mounts that have root squashing
enabled and world execute perms disabled.

Signed-off-by: Scott Mayhew <[email protected]>
---
utils/mount/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/mount/utils.c b/utils/mount/utils.c
index ede77a8..92662ed 100644
--- a/utils/mount/utils.c
+++ b/utils/mount/utils.c
@@ -130,7 +130,7 @@ int chk_mountpoint(const char *mount_point)
mount_error(NULL, mount_point, ENOTDIR);
return 1;
}
- if (access(mount_point, X_OK) < 0) {
+ if (getuid() != 0 && geteuid() != 0 && access(mount_point, X_OK) < 0) {
mount_error(NULL, mount_point, errno);
return 1;
}
--
1.7.11.7

2014-03-22 14:13:53

by Steve Dickson

Subject: Re: [nfs-utils PATCH] mount: chk_mountpoint should only check for execute perms for unpriveleged users

On 03/20/2014 04:12 PM, Scott Mayhew wrote:
> Otherwise 'mount -o remount' fails on mounts that have root squashing
> enabled and world execute perms disabled.
>
> Signed-off-by: Scott Mayhew <[email protected]>
Committed...

steved.
> ---
> utils/mount/utils.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/utils/mount/utils.c b/utils/mount/utils.c
> index ede77a8..92662ed 100644
> --- a/utils/mount/utils.c
> +++ b/utils/mount/utils.c
> @@ -130,7 +130,7 @@ int chk_mountpoint(const char *mount_point)
> mount_error(NULL, mount_point, ENOTDIR);
> return 1;
> }
> - if (access(mount_point, X_OK) < 0) {
> + if (getuid() != 0 && geteuid() != 0 && access(mount_point, X_OK) < 0) {
> mount_error(NULL, mount_point, errno);
> return 1;
> }
> -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
>