From 48d9974adf6cff6cc75821f4f62f1b20365b9780 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 22 Jan 2009 16:04:36 -0800 Subject: [PATCH] Fix logic error in try_chown - we shouldn't arbitrarily chown to ourselves unless that was passed in. Jeremy. (cherry picked from commit 60289187a91e23787be581b824076651230245b2) --- source/smbd/posix_acls.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c index 5132e9725df..ed38ffcae15 100644 --- a/source/smbd/posix_acls.c +++ b/source/smbd/posix_acls.c @@ -3097,6 +3097,15 @@ int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid) return -1; } + /* only allow chown to the current user. This is more secure, + and also copes with the case where the SID in a take ownership ACL is + a local SID on the users workstation + */ + if (uid != current_user.ut.uid) { + errno = EPERM; + return -1; + } + if (SMB_VFS_STAT(conn,fname,&st)) { return -1; } @@ -3105,12 +3114,6 @@ int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid) return -1; } - /* only allow chown to the current user. This is more secure, - and also copes with the case where the SID in a take ownership ACL is - a local SID on the users workstation - */ - uid = current_user.ut.uid; - become_root(); /* Keep the current file gid the same. */ ret = SMB_VFS_FCHOWN(fsp, fsp->fh->fd, uid, (gid_t)-1); -- 2.47.3