diff options
| author | Jeremy Allison <jra@samba.org> | 2018-04-11 08:41:00 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-05-07 09:57:26 +0200 |
| commit | db8296bc1ba91afee9103165ff9dde49e2be87ab (patch) | |
| tree | 916c51e35ad1829f3a327263cd0997c506732cb4 /source3 | |
| parent | d4940e673a29a82d25a3f9ef3c0b3b69b6d4cb59 (diff) | |
| download | samba-db8296bc1ba91afee9103165ff9dde49e2be87ab.tar.gz | |
s3: vfs: vfs_streams_xattr: Don't blindly re-use the base file mode bits.
When returning the stat struct for an xattr stream,
we originally base the st_ex_mode field on the value
from the base file containing the xattr. If the base
file is a directory, it will have S_IFDIR set in st_ex_mode,
but streams can never be directories, they must be reported
as regular files.
The original code OR'ed in S_IFREG, but neglected to
AND out S_IFDIR.
Note this is not a complete to fix bug 13380 as
it doesn't fix the generic case with all streams
modules. See later fix and regression test.
Found in real-world use case by Andrew Walker <awalker@ixsystems.com>.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13380
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
(cherry picked from commit 4d839d0f46b723ed6809bb932b9ebe4ead2cec82)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/vfs_streams_xattr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index f75f6a18dd6..1340d0421f4 100644 --- a/source3/modules/vfs_streams_xattr.c +++ b/source3/modules/vfs_streams_xattr.c @@ -277,6 +277,7 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp, sbuf->st_ex_ino = stream_inode(sbuf, io->xattr_name); sbuf->st_ex_mode &= ~S_IFMT; + sbuf->st_ex_mode &= ~S_IFDIR; sbuf->st_ex_mode |= S_IFREG; sbuf->st_ex_blocks = sbuf->st_ex_size / STAT_ST_BLOCKSIZE + 1; @@ -331,6 +332,7 @@ static int streams_xattr_stat(vfs_handle_struct *handle, smb_fname->st.st_ex_ino = stream_inode(&smb_fname->st, xattr_name); smb_fname->st.st_ex_mode &= ~S_IFMT; + smb_fname->st.st_ex_mode &= ~S_IFDIR; smb_fname->st.st_ex_mode |= S_IFREG; smb_fname->st.st_ex_blocks = smb_fname->st.st_ex_size / STAT_ST_BLOCKSIZE + 1; |