sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-10 12:58:35 +03:00
Code

smbd: put back dev/ino stat/fstat check in openat_pathref_fsp()

Browse Source 
This reverts commit a6df051dd5e8c63f2fdfdb20ee01169d2bdb97dd:

  "s3: smbd: In openat_pathref_fsp(), just check we're opening the same file type, not dev and inode."

The prior changes mean we can go back to checking dev/ino
matches.

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2021-07-07 11:48:34 +02:00
parent 18a30d939e
commit 2c9ae4b78c
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source3/smbd/files.c
View File

@ -529,32 +529,18 @@ NTSTATUS openat_pathref_fsp(const struct files_struct *dirfsp,
goto fail;
}
/*
* As this is an internal open and we don't have any
* locks around, we don't have to mandate the dev and ino
* pair are the same (and in fact not doing so fixes bugs
* when this is called by VFS modules that like to play tricks
* with ino number on stream paths (fruit, and streams_xattr
* are the two that currently do this).
*
* There's no security advantage to checking that, as the
* fd_openat() above ensures this is safe.
*/
if ((S_IFMT & smb_fname->st.st_ex_mode) != (S_IFMT & fsp->fsp_name->st.st_ex_mode)) {
DBG_DEBUG("file [%s] - S_IFMT mismatch. "
"old = 0%o, new = 0%o\n",
if (!check_same_dev_ino(&smb_fname->st, &fsp->fsp_name->st)) {
DBG_DEBUG("file [%s] - dev/ino mismatch. "
"Old (dev=%ju, ino=%ju). "
"New (dev=%ju, ino=%ju).\n",
smb_fname_str_dbg(smb_fname),
(unsigned int)(S_IFMT & smb_fname->st.st_ex_mode),
(unsigned int)(S_IFMT & fsp->fsp_name->st.st_ex_mode));
(uintmax_t)smb_fname->st.st_ex_dev,
(uintmax_t)smb_fname->st.st_ex_ino,
(uintmax_t)fsp->fsp_name->st.st_ex_dev,
(uintmax_t)fsp->fsp_name->st.st_ex_ino);
status = NT_STATUS_ACCESS_DENIED;
goto fail;
}
/*
* fd_openat() has done an FSTAT on the handle
* so update the smb_fname stat info with "truth".
* from the handle.
*/
smb_fname->st = fsp->fsp_name->st;
fsp->file_id = vfs_file_id_from_sbuf(conn, &fsp->fsp_name->st);