From e81fd0b85c8dd3f521e54e32b7da2f99a513f2f2 Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Thu, 17 Nov 2016 18:22:39 +0530 Subject: access_control : address O_TRUNC and O_APPEND flag properly in posix_acl_open In posix_acl_open, in switch value passed is (flag & O_ACCMODE). The value for O_ACCMODE is 0003, so the result will always be less than or equal to 3. But value for O_TRUNC is 01000 and O_APPEND is 02000, so it is not right to check it in switch case Change-Id: Ia17db80a6a5f681c35e08e062d384f33ef7e0354 BUG: 1387241 Signed-off-by: Jiffin Tony Thottan Reviewed-on: http://review.gluster.org/15688 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos Reviewed-by: Kaleb KEITHLEY --- xlators/system/posix-acl/src/posix-acl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xlators/system') diff --git a/xlators/system/posix-acl/src/posix-acl.c b/xlators/system/posix-acl/src/posix-acl.c index 9b3698618fa..dbe0e716e2b 100644 --- a/xlators/system/posix-acl/src/posix-acl.c +++ b/xlators/system/posix-acl/src/posix-acl.c @@ -1203,8 +1203,6 @@ posix_acl_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags, break; case O_WRONLY: - case O_APPEND: - case O_TRUNC: perm = POSIX_ACL_WRITE; break; case O_RDWR: @@ -1212,6 +1210,9 @@ posix_acl_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags, break; } + if (flags & (O_TRUNC | O_APPEND)) + perm |= POSIX_ACL_WRITE; + if (acl_permits (frame, loc->inode, perm)) goto green; else -- cgit