sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

nfs4_acls: Use correct owner information for ACL after owner change

Browse Source 
After a chown, the cached stat data is obviously no longer valid. The
code in smb_set_nt_acl_nfs4 checked the file correctly, but did only use
a local buffer for the stat data. So later checks of the stat buffer
under the fsp->fsp_name->st would still see the old information.

Fix this by removing the local stat buffer and always update the one
under fsp->fsp_name->st.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14032

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Christof Schmitt
2019-07-17 15:29:06 -07:00
parent 1a137a2f20
commit 86f7af84f0
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source3/modules/nfs4_acls.c
View File

@ -992,11 +992,11 @@ NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
struct SMB4ACL_T *theacl = NULL; struct SMB4ACL_T *theacl = NULL;
bool result, is_directory; bool result, is_directory;
SMB_STRUCT_STAT sbuf;
bool set_acl_as_root = false; bool set_acl_as_root = false;
uid_t newUID = (uid_t)-1; uid_t newUID = (uid_t)-1;
gid_t newGID = (gid_t)-1; gid_t newGID = (gid_t)-1;
int saved_errno; int saved_errno;
NTSTATUS status;
TALLOC_CTX *frame = talloc_stackframe(); TALLOC_CTX *frame = talloc_stackframe();
DEBUG(10, ("smb_set_nt_acl_nfs4 invoked for %s\n", fsp_str_dbg(fsp))); DEBUG(10, ("smb_set_nt_acl_nfs4 invoked for %s\n", fsp_str_dbg(fsp)));
@ -1020,25 +1020,29 @@ NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
pparams = &params; pparams = &params;
} }
if (smbacl4_fGetFileOwner(fsp, &sbuf)) { status = vfs_stat_fsp(fsp);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return map_nt_error_from_unix(errno); return status;
} }
is_directory = S_ISDIR(sbuf.st_ex_mode); is_directory = S_ISDIR(fsp->fsp_name->st.st_ex_mode);
if (pparams->do_chown) { if (pparams->do_chown) {
/* chown logic is a copy/paste from posix_acl.c:set_nt_acl */ /* chown logic is a copy/paste from posix_acl.c:set_nt_acl */
NTSTATUS status = unpack_nt_owners(fsp->conn, &newUID, &newGID,
security_info_sent, psd); uid_t old_uid = fsp->fsp_name->st.st_ex_uid;
uid_t old_gid = fsp->fsp_name->st.st_ex_uid;
status = unpack_nt_owners(fsp->conn, &newUID, &newGID,
security_info_sent, psd);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
DEBUG(8, ("unpack_nt_owners failed")); DEBUG(8, ("unpack_nt_owners failed"));
TALLOC_FREE(frame); TALLOC_FREE(frame);
return status; return status;
} }
if (((newUID != (uid_t)-1) && (sbuf.st_ex_uid != newUID)) || if (((newUID != (uid_t)-1) && (old_uid != newUID)) ||
((newGID != (gid_t)-1) && (sbuf.st_ex_gid != newGID))) { ((newGID != (gid_t)-1) && (old_gid != newGID)))
{
status = try_chown(fsp, newUID, newGID); status = try_chown(fsp, newUID, newGID);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
DEBUG(3,("chown %s, %u, %u failed. Error = " DEBUG(3,("chown %s, %u, %u failed. Error = "
@ -1053,11 +1057,14 @@ NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
DEBUG(10,("chown %s, %u, %u succeeded.\n", DEBUG(10,("chown %s, %u, %u succeeded.\n",
fsp_str_dbg(fsp), (unsigned int)newUID, fsp_str_dbg(fsp), (unsigned int)newUID,
(unsigned int)newGID)); (unsigned int)newGID));
if (smbacl4_GetFileOwner(fsp->conn,
fsp->fsp_name, /*
&sbuf)){ * Owner change, need to update stat info.
*/
status = vfs_stat_fsp(fsp);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return map_nt_error_from_unix(errno); return status;
} }
/* If we successfully chowned, we know we must /* If we successfully chowned, we know we must
@ -1075,7 +1082,8 @@ NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
} }
theacl = smbacl4_win2nfs4(frame, is_directory, psd->dacl, pparams, theacl = smbacl4_win2nfs4(frame, is_directory, psd->dacl, pparams,
sbuf.st_ex_uid, sbuf.st_ex_gid); fsp->fsp_name->st.st_ex_uid,
fsp->fsp_name->st.st_ex_gid);
if (!theacl) { if (!theacl) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return map_nt_error_from_unix(errno); return map_nt_error_from_unix(errno);