From c08396c7691e1e6a04b6b45892e7e4612ceed8d7 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 9 Oct 2017 12:44:48 +0200 Subject: libmount: use eacess() rather than open() to check mtab/utab The open() syscall is probably the most strong way how to check write accessibility in all situations, but it's overkill and on some paranoid systems with enabled audit/selinux. It fills logs with "Permission denied" entries. Let's use eaccess() if available. Signed-off-by: Karel Zak --- libmount/src/utils.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'libmount/src/utils.c') diff --git a/libmount/src/utils.c b/libmount/src/utils.c index a5617e6c0..711d1683e 100644 --- a/libmount/src/utils.c +++ b/libmount/src/utils.c @@ -647,17 +647,24 @@ done: static int try_write(const char *filename) { - int fd, rc = 0; + int rc = 0; if (!filename) return -EINVAL; - fd = open(filename, O_RDWR|O_CREAT|O_CLOEXEC, - S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH); - if (fd < 0) +#ifdef HAVE_EACCESS + if (eaccess(filename, R_OK|W_OK) != 0) rc = -errno; - else - close(fd); +#else + { + int fd = open(filename, O_RDWR|O_CREAT|O_CLOEXEC, + S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH); + if (fd < 0) + rc = -errno; + else + close(fd); + } +#endif return rc; } -- cgit v1.2.3-55-g7522