diff options
| author | Jeremy Allison <jra@samba.org> | 2016-12-15 12:52:13 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-03-22 10:45:17 +0100 |
| commit | 17b90d640ac941f00c93d0eefc81ac5e429faaf6 (patch) | |
| tree | 274c833f0ded2c01554303776e68c6901a631ea1 | |
| parent | 6165d9a0158d40a971d7d72a379d1d436f1b30fb (diff) | |
| download | samba-17b90d640ac941f00c93d0eefc81ac5e429faaf6.tar.gz | |
CVE-2017-2619: s3: smbd: Remove O_NOFOLLOW guards. We insist on O_NOFOLLOW existing.
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>
| -rw-r--r-- | source3/smbd/open.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 1c67684b8bf..a014b5e9974 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -363,8 +363,7 @@ NTSTATUS fd_open(struct connection_struct *conn, struct smb_filename *smb_fname = fsp->fsp_name; NTSTATUS status = NT_STATUS_OK; -#ifdef O_NOFOLLOW - /* + /* * Never follow symlinks on a POSIX client. The * client should be doing this. */ @@ -372,12 +371,10 @@ NTSTATUS fd_open(struct connection_struct *conn, if ((fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) || !lp_follow_symlinks(SNUM(conn))) { flags |= O_NOFOLLOW; } -#endif fsp->fh->fd = SMB_VFS_OPEN(conn, smb_fname, fsp, flags, mode); if (fsp->fh->fd == -1) { int posix_errno = errno; -#ifdef O_NOFOLLOW #if defined(ENOTSUP) && defined(OSF1) /* handle special Tru64 errno */ if (errno == ENOTSUP) { @@ -394,7 +391,6 @@ NTSTATUS fd_open(struct connection_struct *conn, if (errno == EMLINK) { posix_errno = ELOOP; } -#endif /* O_NOFOLLOW */ status = map_nt_error_from_unix(posix_errno); if (errno == EMFILE) { static time_t last_warned = 0L; |