sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

CVE-2017-2619: s3: smbd: Correctly fallback to open_dir_safely if FDOPENDIR not supported on system.

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12496

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
This commit is contained in:
Jeremy Allison 2016-12-19 12:35:32 -08:00 committed by Karolin Seeger
parent f6dfdf7d31
commit 49ed0b01d1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source3/smbd/dir.c
View File

@ -1797,20 +1797,15 @@ static struct smb_Dir *OpenDir_fsp(TALLOC_CTX *mem_ctx, connection_struct *conn,
}
if (dirp->dir == NULL) {
/* FDOPENDIR didn't work. Use OPENDIR instead. */
dirp->dir = SMB_VFS_OPENDIR(conn,
dirp->dir_smb_fname,
/* FDOPENDIR is not supported. Use OPENDIR instead. */
TALLOC_FREE(dirp);
return open_dir_safely(mem_ctx,
conn,
fsp->fsp_name,
mask,
attr);
}
if (!dirp->dir) {
DEBUG(5,("OpenDir_fsp: Can't open %s. %s\n",
dirp->dir_smb_fname->base_name,
strerror(errno) ));
goto fail;
}
if (sconn && !sconn->using_smb2) {
sconn->searches.dirhandles_open++;
}