[SCM] Samba Shared Repository - branch v4-7-stable updated
Karolin Seeger
kseeger at samba.org
Wed Nov 15 08:56:04 UTC 2017
The branch, v4-7-stable has been updated
via c5bb8ef VERSION: Disable GIT_SNAPSHOT for the 4.7.2 release.
via 53b7208 WHATSNEW: Add release notes for Samba 4.7.2.
via d7a0721 s4: torture: kernel oplocks. Add smb2.kernel-oplocks.kernel_oplocks8
via 6e276ca s3: smbd: kernel oplocks. Replace retry_open() with setup_kernel_oplock_poll_open().
via 510b11d python: use communicate to fix Popen deadlock
via f1fe68f blackbox tests: method to check specific exit codes
via e45ab18 tevent: version 0.9.34
via c0000bd lib: tevent: Remove select backend.
via 5ec68b2 tevent: Fix a race condition
via d41af5d s4: torture: Add smb2 FIND_and_set_DOC test case.
via 007e8fe s3: smbd: Fix delete-on-close after smb2_find
via aebe7a4 s4: torture: kernel_oplocks. Create a regression test case for bug #13058.
via 0b0d248 Revert "s3/smbd: fix deferred open with streams and kernel oplocks"
via 2505c6c VERSION: Bump version up to 4.7.2...
from b174cb5 VERSION: Disable GIT_SNAPSHOTS for the Samba 4.7.1 release.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-7-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 60 +++-
.../ABI/{tevent-0.9.31.sigs => tevent-0.9.34.sigs} | 0
lib/tevent/tevent.c | 1 -
lib/tevent/tevent_internal.h | 1 -
lib/tevent/tevent_select.c | 280 ----------------
lib/tevent/tevent_threads.c | 6 +-
lib/tevent/wscript | 4 +-
python/samba/tests/__init__.py | 25 +-
source3/selftest/tests.py | 4 +-
source3/smbd/dir.c | 4 +-
source3/smbd/open.c | 201 +++++-------
source3/torture/torture.c | 10 +-
source4/torture/smb2/delete-on-close.c | 66 ++++
source4/torture/smb2/oplock.c | 353 +++++++++++++++++++++
15 files changed, 585 insertions(+), 432 deletions(-)
copy lib/tevent/ABI/{tevent-0.9.31.sigs => tevent-0.9.34.sigs} (100%)
delete mode 100644 lib/tevent/tevent_select.c
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index c8a4837..2f5c246 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=4
SAMBA_VERSION_MINOR=7
-SAMBA_VERSION_RELEASE=1
+SAMBA_VERSION_RELEASE=2
########################################################
# If a official release has a serious bug #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 6de5de8..8074a83 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,60 @@
=============================
+ Release Notes for Samba 4.7.2
+ November 15, 2017
+ =============================
+
+
+This is an additional bugfix release to address a possible data corruption
+issue. Please update immediately! For details, please see
+
+ https://bugzilla.samba.org/show_bug.cgi?id=13130
+
+Samba 4.6.0 and newer is affected by this issue.
+
+
+Changes since 4.7.1:
+--------------------
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 13121: Non-smbd processes using kernel oplocks can hang smbd.
+
+o Joe Guo <joeg at catalyst.net.nz>
+ * BUG 13127: python: use communicate to fix Popen deadlock.
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 13130: smbd on disk file corruption bug under heavy threaded load.
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 13130: tevent: version 0.9.34.
+
+o Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
+ * BUG 13118: s3: smbd: Fix delete-on-close after smb2_find.
+
+
+#######################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the "Samba 4.1 and newer" product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
+
+ =============================
Release Notes for Samba 4.7.1
November 02, 2017
=============================
@@ -106,8 +162,8 @@ database (https://bugzilla.samba.org/).
======================================================================
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
=============================
Release Notes for Samba 4.7.0
diff --git a/lib/tevent/ABI/tevent-0.9.31.sigs b/lib/tevent/ABI/tevent-0.9.34.sigs
similarity index 100%
copy from lib/tevent/ABI/tevent-0.9.31.sigs
copy to lib/tevent/ABI/tevent-0.9.34.sigs
diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
index 5f44b03..a2d2003 100644
--- a/lib/tevent/tevent.c
+++ b/lib/tevent/tevent.c
@@ -128,7 +128,6 @@ static void tevent_backend_init(void)
done = true;
- tevent_select_init();
tevent_poll_init();
tevent_poll_mt_init();
#if defined(HAVE_EPOLL)
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index a5f1ebde..47ea39b 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -377,7 +377,6 @@ int tevent_common_check_signal(struct tevent_context *ev);
void tevent_cleanup_pending_signal_handlers(struct tevent_signal *se);
bool tevent_standard_init(void);
-bool tevent_select_init(void);
bool tevent_poll_init(void);
void tevent_poll_event_add_fd_internal(struct tevent_context *ev,
struct tevent_fd *fde);
diff --git a/lib/tevent/tevent_select.c b/lib/tevent/tevent_select.c
deleted file mode 100644
index 55dd0b6..0000000
--- a/lib/tevent/tevent_select.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- main select loop and event handling
- Copyright (C) Andrew Tridgell 2003-2005
- Copyright (C) Stefan Metzmacher 2005-2009
-
- ** NOTE! The following LGPL license applies to the tevent
- ** library. This does NOT imply that all of Samba is released
- ** under the LGPL
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "replace.h"
-#include "system/filesys.h"
-#include "system/select.h"
-#include "tevent.h"
-#include "tevent_util.h"
-#include "tevent_internal.h"
-
-struct select_event_context {
- /* a pointer back to the generic event_context */
- struct tevent_context *ev;
-
- /* the maximum file descriptor number in fd_events */
- int maxfd;
-};
-
-/*
- create a select_event_context structure.
-*/
-static int select_event_context_init(struct tevent_context *ev)
-{
- struct select_event_context *select_ev;
-
- /*
- * We might be called during tevent_re_initialise()
- * which means we need to free our old additional_data.
- */
- TALLOC_FREE(ev->additional_data);
-
- select_ev = talloc_zero(ev, struct select_event_context);
- if (!select_ev) return -1;
- select_ev->ev = ev;
-
- ev->additional_data = select_ev;
- return 0;
-}
-
-/*
- recalculate the maxfd
-*/
-static void calc_maxfd(struct select_event_context *select_ev)
-{
- struct tevent_fd *fde;
-
- select_ev->maxfd = 0;
- for (fde = select_ev->ev->fd_events; fde; fde = fde->next) {
- if (fde->fd > select_ev->maxfd) {
- select_ev->maxfd = fde->fd;
- }
- }
-}
-
-
-/* to mark the ev->maxfd invalid
- * this means we need to recalculate it
- */
-#define EVENT_INVALID_MAXFD (-1)
-
-/*
- destroy an fd_event
-*/
-static int select_event_fd_destructor(struct tevent_fd *fde)
-{
- struct tevent_context *ev = fde->event_ctx;
- struct select_event_context *select_ev = NULL;
-
- if (ev) {
- select_ev = talloc_get_type_abort(ev->additional_data,
- struct select_event_context);
-
- if (select_ev->maxfd == fde->fd) {
- select_ev->maxfd = EVENT_INVALID_MAXFD;
- }
- }
-
- return tevent_common_fd_destructor(fde);
-}
-
-/*
- add a fd based event
- return NULL on failure (memory allocation error)
-*/
-static struct tevent_fd *select_event_add_fd(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
- int fd, uint16_t flags,
- tevent_fd_handler_t handler,
- void *private_data,
- const char *handler_name,
- const char *location)
-{
- struct select_event_context *select_ev =
- talloc_get_type_abort(ev->additional_data,
- struct select_event_context);
- struct tevent_fd *fde;
-
- if (fd < 0 || fd >= FD_SETSIZE) {
- errno = EBADF;
- return NULL;
- }
-
- fde = tevent_common_add_fd(ev, mem_ctx, fd, flags,
- handler, private_data,
- handler_name, location);
- if (!fde) return NULL;
-
- if ((select_ev->maxfd != EVENT_INVALID_MAXFD)
- && (fde->fd > select_ev->maxfd)) {
- select_ev->maxfd = fde->fd;
- }
- talloc_set_destructor(fde, select_event_fd_destructor);
-
- return fde;
-}
-
-/*
- event loop handling using select()
-*/
-static int select_event_loop_select(struct select_event_context *select_ev, struct timeval *tvalp)
-{
- fd_set r_fds, w_fds;
- struct tevent_fd *fde;
- int selrtn;
- int select_errno;
-
- /* we maybe need to recalculate the maxfd */
- if (select_ev->maxfd == EVENT_INVALID_MAXFD) {
- calc_maxfd(select_ev);
- }
-
- FD_ZERO(&r_fds);
- FD_ZERO(&w_fds);
-
- /* setup any fd events */
- for (fde = select_ev->ev->fd_events; fde; fde = fde->next) {
- if (fde->fd < 0 || fde->fd >= FD_SETSIZE) {
- tevent_debug(select_ev->ev, TEVENT_DEBUG_FATAL,
- "ERROR: EBADF fd[%d] >= %d "
- "select_event_loop_once\n",
- fde->fd, FD_SETSIZE);
- errno = EBADF;
- return -1;
- }
-
- if (fde->flags & TEVENT_FD_READ) {
- FD_SET(fde->fd, &r_fds);
- }
- if (fde->flags & TEVENT_FD_WRITE) {
- FD_SET(fde->fd, &w_fds);
- }
- }
-
- if (select_ev->ev->signal_events &&
- tevent_common_check_signal(select_ev->ev)) {
- return 0;
- }
-
- tevent_trace_point_callback(select_ev->ev, TEVENT_TRACE_BEFORE_WAIT);
- selrtn = select(select_ev->maxfd+1, &r_fds, &w_fds, NULL, tvalp);
- select_errno = errno;
- tevent_trace_point_callback(select_ev->ev, TEVENT_TRACE_AFTER_WAIT);
-
- if (selrtn == -1 && select_errno == EINTR &&
- select_ev->ev->signal_events) {
- tevent_common_check_signal(select_ev->ev);
- return 0;
- }
-
- if (selrtn == -1 && select_errno == EBADF) {
- /* the socket is dead! this should never
- happen as the socket should have first been
- made readable and that should have removed
- the event, so this must be a bug. This is a
- fatal error. */
- tevent_debug(select_ev->ev, TEVENT_DEBUG_FATAL,
- "ERROR: EBADF on select_event_loop_once\n");
- errno = select_errno;
- return -1;
- }
-
- if (selrtn == 0 && tvalp) {
- /* we don't care about a possible delay here */
- tevent_common_loop_timer_delay(select_ev->ev);
- return 0;
- }
-
- if (selrtn > 0) {
- /* at least one file descriptor is ready - check
- which ones and call the handler, being careful to allow
- the handler to remove itself when called */
- for (fde = select_ev->ev->fd_events; fde; fde = fde->next) {
- uint16_t flags = 0;
-
- if (FD_ISSET(fde->fd, &r_fds) && (fde->flags & TEVENT_FD_READ)) {
- flags |= TEVENT_FD_READ;
- }
- if (FD_ISSET(fde->fd, &w_fds) && (fde->flags & TEVENT_FD_WRITE)) {
- flags |= TEVENT_FD_WRITE;
- }
- if (flags) {
- DLIST_DEMOTE(select_ev->ev->fd_events, fde);
- fde->handler(select_ev->ev, fde, flags, fde->private_data);
- break;
- }
- }
- }
-
- return 0;
-}
-
-/*
- do a single event loop using the events defined in ev
-*/
-static int select_event_loop_once(struct tevent_context *ev, const char *location)
-{
- struct select_event_context *select_ev =
- talloc_get_type_abort(ev->additional_data,
- struct select_event_context);
- struct timeval tval;
-
- if (ev->signal_events &&
- tevent_common_check_signal(ev)) {
- return 0;
- }
-
- if (ev->threaded_contexts != NULL) {
- tevent_common_threaded_activate_immediate(ev);
- }
-
- if (ev->immediate_events &&
- tevent_common_loop_immediate(ev)) {
- return 0;
- }
-
- tval = tevent_common_loop_timer_delay(ev);
- if (tevent_timeval_is_zero(&tval)) {
- return 0;
- }
-
- return select_event_loop_select(select_ev, &tval);
-}
-
-static const struct tevent_ops select_event_ops = {
- .context_init = select_event_context_init,
- .add_fd = select_event_add_fd,
- .set_fd_close_fn = tevent_common_fd_set_close_fn,
- .get_fd_flags = tevent_common_fd_get_flags,
- .set_fd_flags = tevent_common_fd_set_flags,
- .add_timer = tevent_common_add_timer_v2,
- .schedule_immediate = tevent_common_schedule_immediate,
- .add_signal = tevent_common_add_signal,
- .loop_once = select_event_loop_once,
- .loop_wait = tevent_common_loop_wait,
-};
-
-_PRIVATE_ bool tevent_select_init(void)
-{
- return tevent_register_backend("select", &select_event_ops);
-}
diff --git a/lib/tevent/tevent_threads.c b/lib/tevent/tevent_threads.c
index 4d1a880..2e83f1b 100644
--- a/lib/tevent/tevent_threads.c
+++ b/lib/tevent/tevent_threads.c
@@ -451,7 +451,7 @@ void _tevent_threaded_schedule_immediate(struct tevent_threaded_context *tctx,
{
#ifdef HAVE_PTHREAD
struct tevent_context *ev;
- int ret;
+ int ret, wakeup_fd;
ret = pthread_mutex_lock(&tctx->event_ctx_mutex);
if (ret != 0) {
@@ -495,6 +495,8 @@ void _tevent_threaded_schedule_immediate(struct tevent_threaded_context *tctx,
abort();
}
+ wakeup_fd = tctx->wakeup_fd;
+
ret = pthread_mutex_unlock(&tctx->event_ctx_mutex);
if (ret != 0) {
abort();
@@ -510,7 +512,7 @@ void _tevent_threaded_schedule_immediate(struct tevent_threaded_context *tctx,
* than a noncontended one. So I'd opt for the lower footprint
* initially. Maybe we have to change that later.
*/
- tevent_common_wakeup_fd(tctx->wakeup_fd);
+ tevent_common_wakeup_fd(wakeup_fd);
#else
/*
* tevent_threaded_context_create() returned NULL with ENOSYS...
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index bc874bb..31f7ee7 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'tevent'
-VERSION = '0.9.33'
+VERSION = '0.9.34'
blddir = 'bin'
@@ -77,7 +77,7 @@ def build(bld):
bld.RECURSE('lib/talloc')
SRC = '''tevent.c tevent_debug.c tevent_fd.c tevent_immediate.c
- tevent_queue.c tevent_req.c tevent_select.c
+ tevent_queue.c tevent_req.c
tevent_poll.c tevent_threads.c
tevent_signal.c tevent_standard.c tevent_timed.c tevent_util.c tevent_wakeup.c'''
diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 07c68c4..0b0f567 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -311,19 +311,30 @@ class BlackboxTestCase(TestCaseInTempDir):
return line
def check_run(self, line):
+ self.check_exit_code(line, 0)
+
+ def check_exit_code(self, line, expected):
line = self._make_cmdline(line)
- p = subprocess.Popen(line, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
- retcode = p.wait()
- if retcode:
- raise BlackboxProcessError(retcode, line, p.stdout.read(), p.stderr.read())
+ p = subprocess.Popen(line,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ shell=True)
+ stdoutdata, stderrdata = p.communicate()
+ retcode = p.returncode
+ if retcode != expected:
+ raise BlackboxProcessError(retcode,
+ line,
+ stdoutdata,
+ stderrdata)
def check_output(self, line):
line = self._make_cmdline(line)
p = subprocess.Popen(line, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, close_fds=True)
- retcode = p.wait()
+ stdoutdata, stderrdata = p.communicate()
+ retcode = p.returncode
if retcode:
- raise BlackboxProcessError(retcode, line, p.stdout.read(), p.stderr.read())
- return p.stdout.read()
+ raise BlackboxProcessError(retcode, line, stdoutdata, stderrdata)
+ return stdoutdata
def connect_samdb(samdb_url, lp=None, session_info=None, credentials=None,
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 56b94c4..357970d 100755
--
Samba Shared Repository
More information about the samba-cvs
mailing list