[SCM] Samba Shared Repository - branch v4-17-stable updated
The branch, v4-17-stable has been updated
via c15dfcca9f5 VERSION: Disable GIT_SNAPSHOT for the 4.17.0rc3 release.
via d9f7e8d41b7 WHATSNEW: Add release notes for Samba 4.17.0rc3.
via 4d37152c666 smbd: directly pass fsp to SMB_VFS_FGETXATTR() in
fget_ea_dos_attribute()
via 25d6dcd8897 smbd: add and use vfs_fget_dos_attributes()
via 9df07ee0fa5 smbtorture: add test smb2.stream.attributes2
via 81be412fb01 smbtorture: rename smb2.streams.attributes to
smb2.streams.attributes1
via 0d0eff66058 vfs_default: assert all passed in fsp's and names are
non-stream type
via f2272106f36 vfs_streams_xattr: restrict which fcntl's are allowed
on streams
via aca819549c3 smbd: skip access checks for stat-opens on streams in
open_file()
via 7c713f386f3 smbd: use metadata_fsp() in get_acl_group_bits()
via 107af8fd98b smbd: ignore request to set the SPARSE attribute on
streams
via 69742bab667 smbd: use metadata_fsp() with
SMB_VFS_FSET_DOS_ATTRIBUTES()
via 814fd4e8e89 smbd: use metadata_fsp() with
SMB_VFS_FGET_DOS_ATTRIBUTES()
via 1434b66f2a1 smbd: use metadata_fsp() with SMB_VFS_FSET_NT_ACL()
via ba468a9b416 smbd: use metadata_fsp() with SMB_VFS_FGET_NT_ACL()
via ab76ab52c39 CI: add a test trying to delete a stream on a pathref
("stat open") handle
via 3994f71f039 vfs_xattr_tdb: add "xattr_tdb:ignore_user_xattr" option
via aa85dac1e95 vfs_xattr_tdb: add a module config
via bae285ed702 vfs_xattr_tdb: move close_xattr_db()
via f23ef830bc7 smdb: use fsp_is_alternate_stream() in open_file()
via 721ea813b54 waf: Fix SO version number of libsamba-errors
via fbcb8db069c WHATSNEW: document new volume serial number smb.conf
parameter
via 0b15ebced78 s3:smbd: let delay_for_oplock_fn() only call
leases_db_get() once
via cb63afbda1b s3:smbd: lease_match_break_fn() only needs
leases_db_get() once
via e764e40ad55 s3:smbd: inline fsp_lease_type_is_exclusive() logic
into contend_level2_oplocks_begin_default
via fa8d19056bd s3:locking: move get_existing_share_mode_lock() to
share_mode_lock.[ch]
via 411af5fb48c s3:locking: pass lease_key explicitly to
set_share_mode()
via 6bf37ba4538 s3:smbd: only run validate_oplock_types() with
smbd:validate_oplock_types = yes
via f207ef33224 s3:g_lock: avoid useless talloc_array(0) in
g_lock_dump()
via e4538e70cbe s3:g_lock: add some const to the shared array passed
via g_lock_dump*()
via 208037a7eea lib/util: add unlikely() to SMB_ASSERT()
via 76bff90824a s3: smbd: Plumb close_type parameter through
close_file_in_loop(), file_close_conn()
via 91273a969ab s3: smbd: Add "enum file_close_type close_type"
parameter to file_close_conn().
via 5fc9bf0f63c s3: smbd: Add "enum file_close_type close_type"
parameter to close_cnum().
via c47b7479e74 s3/smbd: Use after free when iterating
smbd_server_connection->connections
via 0b33961e71a s3/smbd: Use after free when iterating
smbd_server_connection->connections
via 0725e1ea851 s3:utils remove documentation of -l as alias for --long
via c4c99397c56 s3:smbd: only clear LEASE_READ if there's no read lease
is left
via 0529214b3cc s4:torture/smb2: add smb2.lease.v[1,2]_bug_15148
via 6ac28f43868 s3:smbd: share_mode_flags_set() takes SMB2_LEASE_*
values
via e3ee5197a6d libcli/smb: Set error status if 'iov' pointer is NULL
via dee2505716d libcli/smb: Ensure we call tevent_req_nterror() on
failure
via 877287e6b4e VERSION: Bump version up to Samba 4.17.0rc3...
from 8e1f74303ee VERSION: Disable GIT_SNAPSHOT for the 4.17.0rc2 release.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-17-stable
- Log -
---
Summary of changes:
VERSION| 2 +-
WHATSNEW.txt | 29 ++-
docs-xml/manpages/net.8.xml| 14 +-
lib/util/fault.h | 2 +-
libcli/smb/smbXcli_base.c | 12 +-
libcli/util/wscript_build | 2 +-
selftest/knownfail | 4 +-
selftest/target/Samba3.pm | 8 +
selftest/target/Samba4.pm | 1 +
source3/include/g_lock.h | 4 +-
source3/include/proto.h| 3 +
source3/lib/g_lock.c | 20 +-
source3/locking/leases_util.c | 17 --
source3/locking/locking.c | 11 -
source3/locking/proto.h| 3 -
source3/locking/share_mode_lock.c | 30 ++-
source3/locking/share_mode_lock.h | 4 +
source3/modules/vfs_default.c | 92 +---
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 3fde208 NEWS[4.17.0rc3]: Samba 4.17.0rc3 Available for Download from 5ba9107 NEWS[4.17.0rc2]: Samba 4.17.0rc2 Available for Download https://git.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 3fde20890bd3a99a07663c519db62915d1007cc6 Author: Jule Anger Date: Tue Aug 23 16:48:07 2022 +0200 NEWS[4.17.0rc3]: Samba 4.17.0rc3 Available for Download Signed-off-by: Jule Anger --- Summary of changes: posted_news/20220823-144837.4.17.0rc3.body.html | 12 posted_news/20220823-144837.4.17.0rc3.headline.html | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 posted_news/20220823-144837.4.17.0rc3.body.html create mode 100644 posted_news/20220823-144837.4.17.0rc3.headline.html Changeset truncated at 500 lines: diff --git a/posted_news/20220823-144837.4.17.0rc3.body.html b/posted_news/20220823-144837.4.17.0rc3.body.html new file mode 100644 index 000..362c562 --- /dev/null +++ b/posted_news/20220823-144837.4.17.0rc3.body.html @@ -0,0 +1,12 @@ + +23 August 2022 +Samba 4.17.0rc3 Available for Download + +This is the third release candidate of the upcoming Samba 4.17 release series. + + +The uncompressed tarball has been signed using GnuPG (ID AA99442FB680B620). +The source code can be https://download.samba.org/pub/samba/rc/samba-4.17.0rc3.tar.gz;>downloaded now. +See https://download.samba.org/pub/samba/rc/samba-4.17.0rc3.WHATSNEW.txt;>the release notes for more info. + + diff --git a/posted_news/20220823-144837.4.17.0rc3.headline.html b/posted_news/20220823-144837.4.17.0rc3.headline.html new file mode 100644 index 000..ddc1ac9 --- /dev/null +++ b/posted_news/20220823-144837.4.17.0rc3.headline.html @@ -0,0 +1,3 @@ + + 23 August 2022 Samba 4.17.0rc3 Available for Download + -- Samba Website Repository
[SCM] Samba Shared Repository - annotated tag samba-4.17.0rc3 created
The annotated tag, samba-4.17.0rc3 has been created
at e2b81826998035a76065776e0354b56790fd1032 (tag)
tagging c15dfcca9f52230ea200e6b13b9391f0f78c40e4 (commit)
replaces samba-4.17.0rc2
tagged by Jule Anger
on Tue Aug 23 16:47:51 2022 +0200
- Log -
samba: tag release samba-4.17.0rc3
-BEGIN PGP SIGNATURE-
iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmME6JcACgkQqplEL7aA
tiB31A//VtVqUHM8g6vylKxkLgyQNTlBmwSo5bd/hO7eqqafC1NkND23k6w7LiPZ
raxCVVvJAaUcAI8OJVIXiJsC6w7uoihGnmRgjdsdao9V5ugxcYFZioS+DoqqnHMV
ZqLnCPEHZExMTGddDKrVBxirt+wTpzSg1n4ro2+crTGcCTPUrWGM0yMehQIK0Fpf
VJytUlkzQBPO/TuJm4NAwoVjJHwNUVW0WRPKMh6O8rOdHVoINVDrnEUADfb/YSLv
kPQXPLrEVi0JFtKItiMWc/xtf1OM8xgkikFb9i+MnMpUnws0bUMoYmEwAnc8GT96
iTV3PoFBeYWYp28iwpx6nfTMmYYafIxr58Wylnnc9HMi7U0OTeIR1kONEWrXDnUD
M3AbdLIYUzGaMZbDVxL8Oozu8tTTvSDwjJE0GQpQMOvK6A4YLSjfxEDjvneGoBQg
fV0UUoEa15Z5EzjUCgQLJZOtGpbBsIvuXrmJrfFOZ0VOiwg2dRcRacx27/hs8v8P
yPzSz5c7yNFLhMSvkNj9y07Dq/FIPzkdrXutxz8tdjJpp8j7bKd5OEy1/Eu5iBN/
ttUOZZfYDSawgEkPlZ81GnqV2eQQOzmhmGl/TStDUW7I8MVxf+krf80FDQTHsxQe
+DCYqfa3lbHxEtcE5/ioys0y5AOncIV8oFOzmbgfibmRx9TLznc=
=ylcM
-END PGP SIGNATURE-
Andreas Schneider (1):
waf: Fix SO version number of libsamba-errors
Christian Ambach (2):
s3:utils remove documentation of -l as alias for --long
WHATSNEW: document new volume serial number smb.conf parameter
Jeremy Allison (5):
s3/smbd: Use after free when iterating smbd_server_connection->connections
s3/smbd: Use after free when iterating smbd_server_connection->connections
s3: smbd: Add "enum file_close_type close_type" parameter to close_cnum().
s3: smbd: Add "enum file_close_type close_type" parameter to
file_close_conn().
s3: smbd: Plumb close_type parameter through close_file_in_loop(),
file_close_conn()
Joseph Sutton (2):
libcli/smb: Ensure we call tevent_req_nterror() on failure
libcli/smb: Set error status if 'iov' pointer is NULL
Jule Anger (3):
VERSION: Bump version up to Samba 4.17.0rc3...
WHATSNEW: Add release notes for Samba 4.17.0rc3.
VERSION: Disable GIT_SNAPSHOT for the 4.17.0rc3 release.
Ralph Boehme (18):
smdb: use fsp_is_alternate_stream() in open_file()
vfs_xattr_tdb: move close_xattr_db()
vfs_xattr_tdb: add a module config
vfs_xattr_tdb: add "xattr_tdb:ignore_user_xattr" option
CI: add a test trying to delete a stream on a pathref ("stat open") handle
smbd: use metadata_fsp() with SMB_VFS_FGET_NT_ACL()
smbd: use metadata_fsp() with SMB_VFS_FSET_NT_ACL()
smbd: use metadata_fsp() with SMB_VFS_FGET_DOS_ATTRIBUTES()
smbd: use metadata_fsp() with SMB_VFS_FSET_DOS_ATTRIBUTES()
smbd: ignore request to set the SPARSE attribute on streams
smbd: use metadata_fsp() in get_acl_group_bits()
smbd: skip access checks for stat-opens on streams in open_file()
vfs_streams_xattr: restrict which fcntl's are allowed on streams
vfs_default: assert all passed in fsp's and names are non-stream type
smbtorture: rename smb2.streams.attributes to smb2.streams.attributes1
smbtorture: add test smb2.stream.attributes2
smbd: add and use vfs_fget_dos_attributes()
smbd: directly pass fsp to SMB_VFS_FGETXATTR() in fget_ea_dos_attribute()
Stefan Metzmacher (12):
s3:smbd: share_mode_flags_set() takes SMB2_LEASE_* values
s4:torture/smb2: add smb2.lease.v[1,2]_bug_15148
s3:smbd: only clear LEASE_READ if there's no read lease is left
lib/util: add unlikely() to SMB_ASSERT()
s3:g_lock: add some const to the shared array passed via g_lock_dump*()
s3:g_lock: avoid useless talloc_array(0) in g_lock_dump()
s3:smbd: only run validate_oplock_types() with smbd:validate_oplock_types
= yes
s3:locking: pass lease_key explicitly to set_share_mode()
s3:locking: move get_existing_share_mode_lock() to share_mode_lock.[ch]
s3:smbd: inline fsp_lease_type_is_exclusive() logic into
contend_level2_oplocks_begin_default
s3:smbd: lease_match_break_fn() only needs leases_db_get() once
s3:smbd: let delay_for_oplock_fn() only call leases_db_get() once
---
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-17-test updated
The branch, v4-17-test has been updated via fbd69dab91c VERSION: Bump version up to Samba 4.17.0rc4... via c15dfcca9f5 VERSION: Disable GIT_SNAPSHOT for the 4.17.0rc3 release. via d9f7e8d41b7 WHATSNEW: Add release notes for Samba 4.17.0rc3. from 4d37152c666 smbd: directly pass fsp to SMB_VFS_FGETXATTR() in fget_ea_dos_attribute() https://git.samba.org/?p=samba.git;a=shortlog;h=v4-17-test - Log - commit fbd69dab91c932ef3dba06a9806d5f62b3ec66e4 Author: Jule Anger Date: Tue Aug 23 16:43:44 2022 +0200 VERSION: Bump version up to Samba 4.17.0rc4... and re-enable GIT_SNAPSHOT. Signed-off-by: Jule Anger commit c15dfcca9f52230ea200e6b13b9391f0f78c40e4 Author: Jule Anger Date: Tue Aug 23 16:43:12 2022 +0200 VERSION: Disable GIT_SNAPSHOT for the 4.17.0rc3 release. Signed-off-by: Jule Anger commit d9f7e8d41b749b2ab3b3e55452099a6f12e37280 Author: Jule Anger Date: Tue Aug 23 16:42:35 2022 +0200 WHATSNEW: Add release notes for Samba 4.17.0rc3. Signed-off-by: Jule Anger --- Summary of changes: VERSION | 2 +- WHATSNEW.txt | 28 +++- 2 files changed, 28 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/VERSION b/VERSION index fee8a12cd38..ec19b8c6862 100644 --- a/VERSION +++ b/VERSION @@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # -SAMBA_VERSION_RC_RELEASE=3 +SAMBA_VERSION_RC_RELEASE=4 # To mark SVN snapshots this should be set to 'yes'# diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 60e71d4f79e..63c5fe09a90 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,7 +1,7 @@ Release Announcements = -This is the second release candidate of Samba 4.17. This is *not* +This is the third release candidate of Samba 4.17. This is *not* intended for production environments and is designed for testing purposes only. Please report any defects via the Samba bug reporting system at https://bugzilla.samba.org/. @@ -206,6 +206,32 @@ smb.conf changes nt hash store New parameter always volume serial number New parameter -1 +CHANGES SINCE 4.17.0rc2 +=== + +o Jeremy Allison + * BUG 15128: Possible use after free of connection_struct when iterating + smbd_server_connection->connections. + +o Christian Ambach + * BUG 15145: `net usershare add` fails with flag works with --long but fails + with -l. + +o Ralph Boehme + * BUG 15126: acl_xattr VFS module may unintentionally use filesystem + permissions instead of ACL from xattr. + +o Stefan Metzmacher + * BUG 15125: Performance regression on contended path based operations. + * BUG 15148: Missing READ_LEASE break could cause data corruption. + +o Andreas Schneider + * BUG 15141: libsamba-errors uses a wrong version number. + +o Joseph Sutton + * BUG 15152: SMB1 negotiation can fail to handle connection errors. + + CHANGES SINCE 4.17.0rc1 === -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-17-test updated
The branch, v4-17-test has been updated
via 4d37152c666 smbd: directly pass fsp to SMB_VFS_FGETXATTR() in
fget_ea_dos_attribute()
via 25d6dcd8897 smbd: add and use vfs_fget_dos_attributes()
via 9df07ee0fa5 smbtorture: add test smb2.stream.attributes2
via 81be412fb01 smbtorture: rename smb2.streams.attributes to
smb2.streams.attributes1
via 0d0eff66058 vfs_default: assert all passed in fsp's and names are
non-stream type
via f2272106f36 vfs_streams_xattr: restrict which fcntl's are allowed
on streams
via aca819549c3 smbd: skip access checks for stat-opens on streams in
open_file()
via 7c713f386f3 smbd: use metadata_fsp() in get_acl_group_bits()
via 107af8fd98b smbd: ignore request to set the SPARSE attribute on
streams
via 69742bab667 smbd: use metadata_fsp() with
SMB_VFS_FSET_DOS_ATTRIBUTES()
via 814fd4e8e89 smbd: use metadata_fsp() with
SMB_VFS_FGET_DOS_ATTRIBUTES()
via 1434b66f2a1 smbd: use metadata_fsp() with SMB_VFS_FSET_NT_ACL()
via ba468a9b416 smbd: use metadata_fsp() with SMB_VFS_FGET_NT_ACL()
via ab76ab52c39 CI: add a test trying to delete a stream on a pathref
("stat open") handle
via 3994f71f039 vfs_xattr_tdb: add "xattr_tdb:ignore_user_xattr" option
via aa85dac1e95 vfs_xattr_tdb: add a module config
via bae285ed702 vfs_xattr_tdb: move close_xattr_db()
via f23ef830bc7 smdb: use fsp_is_alternate_stream() in open_file()
from 721ea813b54 waf: Fix SO version number of libsamba-errors
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-17-test
- Log -
commit 4d37152c666d84e7c76d4e0e976d051c4bbaa9df
Author: Ralph Boehme
Date: Sun Aug 14 16:39:37 2022 +0200
smbd: directly pass fsp to SMB_VFS_FGETXATTR() in fget_ea_dos_attribute()
We're now consistently passing the base_fsp to
SMB_VFS_FSET_DOS_ATTRIBUTES(), so
we don't need to check for a stream_fsp here anymore.
Additionally vfs_default will assert a non-stream fsp inside
vfswrap_fgetxattr(), so in case any caller wrongly passes a stream fsp,
this is
caught in vfs_default.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15126
MR: https://gitlab.com/samba-team/samba/-/merge_requests/2643
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
(cherry picked from commit 968a5ae89f0d0da219e7dd05dd1f7f7c96dbb910)
Autobuild-User(v4-17-test): Jule Anger
Autobuild-Date(v4-17-test): Tue Aug 23 14:26:49 UTC 2022 on sn-devel-184
commit 25d6dcd88975368e6eaa90257a2546b51d414f82
Author: Ralph Boehme
Date: Thu Aug 11 17:18:13 2022 +0200
smbd: add and use vfs_fget_dos_attributes()
Commit d71ef1365cdde47aeb3465699181656b0655fa04 caused a regression where
the
creation date on streams wasn't updated anymore on the stream fsp.
By adding a simple wrapper vfs_fget_dos_attributes() that takes care of
- passing only the base_fsp to the VFS, so the VFS can be completely
agnostic of
all the streams related complexity like fake fds,
- propagating any updated btime from the base_fsp->fsp_name to the
stream_fsp->fsp_name
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15126
MR: https://gitlab.com/samba-team/samba/-/merge_requests/2643
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
(cherry picked from commit 3f7d8db9945a325020e4d1574289dea9e8331c29)
commit 9df07ee0fa5dfc9bb45070078169890c339b8835
Author: Ralph Boehme
Date: Sat Aug 13 16:13:07 2022 +0200
smbtorture: add test smb2.stream.attributes2
Specifically torture the creation date is the same for the file and its
streams.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15126
MR: https://gitlab.com/samba-team/samba/-/merge_requests/2643
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
(cherry picked from commit e74b10e17ee5df0f77ac5349242841be8d71c4e8)
commit 81be412fb01a585337122e0a2fc58df338c322c9
Author: Ralph Boehme
Date: Sat Aug 13 17:04:50 2022 +0200
smbtorture: rename smb2.streams.attributes to smb2.streams.attributes1
A subsequent commit adds another streams test named "attributes2", this
change
avoids matching the new testname with the existing knownfail entries.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15126
MR: https://gitlab.com/samba-team/samba/-/merge_requests/2643
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
(cherry picked from commit b5848d391be4f7633745d9c36e432ac8b1c9dba2)
commit 0d0eff660583c7ec1675323a43c181205ea9b2ae
Author: Ralph Boehme
Date: Wed Jul 27 18:40:21 2022 +0200
vfs_default: assert all passed in fsp's and names are non-stream type
Enforce fsp is a non-stream one in as many VFS operations as possible in
vfs_default. We really
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6d493a9d568 smbd: implement access checks for SMB2-GETINFO as per
MS-SMB2 3.3.5.20.1
via 9b2d2815710 smbtorture: check required access for SMB2-GETINFO
via 66e40690bdd s4/libcli/smb2: avoid using
smb2_composite_setpathinfo() in smb2_util_setatr()
from 339e78f2075 gitlab-ci: Add a shellcheck runner
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6d493a9d568c08cfe5242821ccbd5a5ee1fe5284
Author: Ralph Boehme
Date: Sun Aug 14 18:46:24 2022 +0200
smbd: implement access checks for SMB2-GETINFO as per MS-SMB2 3.3.5.20.1
The spec lists the following as requiring special access:
- for requiring FILE_READ_ATTRIBUTES:
FileBasicInformation
FileAllInformation
FileNetworkOpenInformation
FileAttributeTagInformation
- for requiring FILE_READ_EA:
FileFullEaInformation
All other infolevels are unrestricted.
We ignore the IPC related infolevels:
FilePipeInformation
FilePipeLocalInformation
FilePipeRemoteInformation
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15153
RN: Missing SMB2-GETINFO access checks from MS-SMB2 3.3.5.20.1
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
Autobuild-User(master): Ralph Böhme
Autobuild-Date(master): Tue Aug 23 12:54:08 UTC 2022 on sn-devel-184
commit 9b2d28157107602fcbe659664cf9ca25f08bb30b
Author: Ralph Boehme
Date: Fri Aug 19 17:29:55 2022 +0200
smbtorture: check required access for SMB2-GETINFO
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15153
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
commit 66e40690bdd41800a01333ce4243bd62ee2b1894
Author: Ralph Boehme
Date: Sun Aug 14 18:51:30 2022 +0200
s4/libcli/smb2: avoid using smb2_composite_setpathinfo() in
smb2_util_setatr()
smb2_composite_setpathinfo() uses SEC_FLAG_MAXIMUM_ALLOWED which can
have unwanted side effects like breaking oplocks if the effective access
includes [READ|WRITE]_DATA.
For changing the DOS attributes we only need SEC_FILE_WRITE_ATTRIBUTE. With
this
change test_smb2_oplock_batch25() doesn't trigger an oplock break anymore.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15153
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
---
Summary of changes:
selftest/knownfail | 3 +-
source3/smbd/smb2_getinfo.c| 28
source4/libcli/smb2/util.c | 37 +--
source4/torture/smb2/getinfo.c | 147 +
source4/torture/smb2/oplock.c | 10 +--
5 files changed, 208 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index 0b4c5a44a7f..82dd7e1e8b4 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -176,6 +176,7 @@
^samba4.smb2.oplock.stream1 # samba 4 oplocks are a mess
^samba4.smb2.oplock.statopen1\(ad_dc_ntvfs\)$ # fails with ACCESS_DENIED on a
SYNCHRONIZE_ACCESS open
^samba4.smb2.getinfo.complex # streams on directories does not work
+^samba4.smb2.getinfo.getinfo_access\(ad_dc_ntvfs\) # Access checks not
implemented
^samba4.smb2.getinfo.qfs_buffercheck # S4 does not do the
INFO_LENGTH_MISMATCH/BUFFER_OVERFLOW thingy
^samba4.smb2.getinfo.qfile_buffercheck # S4 does not do the
INFO_LENGTH_MISMATCH/BUFFER_OVERFLOW thingy
^samba4.smb2.getinfo.qsec_buffercheck # S4 does not do the BUFFER_TOO_SMALL
thingy
@@ -207,10 +208,8 @@
^samba3.smb2.oplock.stream1
^samba3.smb2.streams.rename
^samba3.smb2.streams.rename2
-^samba3.smb2.streams.attributes1\(.*\)
^samba3.smb2.streams streams_xattr.rename\(nt4_dc\)
^samba3.smb2.streams streams_xattr.rename2\(nt4_dc\)
-^samba3.smb2.streams streams_xattr.attributes1\(nt4_dc\)
^samba3.smb2.getinfo.complex
^samba3.smb2.getinfo.fsinfo # quotas don't work yet
^samba3.smb2.setinfo.setinfo
diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 0320dcc5fde..23322e7b85f 100644
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -303,6 +303,34 @@ static struct tevent_req
*smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
ZERO_STRUCT(write_time_ts);
+ /*
+* MS-SMB2 3.3.5.20.1 "Handling SMB2_0_INFO_FILE"
+*
+* FileBasicInformation, FileAllInformation,
+* FileNetworkOpenInformation, FileAttributeTagInformation
+* require FILE_READ_ATTRIBUTES.
+*
+* FileFullEaInformation requires FILE_READ_EA.
+*/
+ switch (in_file_info_class) {
+ case FSCC_FILE_BASIC_INFORMATION:
+ case FSCC_FILE_ALL_INFORMATION:
[SCM] Samba Shared Repository - branch v4-17-test updated
The branch, v4-17-test has been updated
via 721ea813b54 waf: Fix SO version number of libsamba-errors
from fbcb8db069c WHATSNEW: document new volume serial number smb.conf
parameter
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-17-test
- Log -
commit 721ea813b542c7087fc5cdb1ad3e9513944ed975
Author: Andreas Schneider
Date: Wed Aug 10 13:55:48 2022 +0200
waf: Fix SO version number of libsamba-errors
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15141
Signed-off-by: Andreas Schneider
Reviewed-by: Alexander Bokovoy
(cherry picked from commit 563a2c8d7296e77ae12de1c5a1a3797e72294068)
Autobuild-User(v4-17-test): Jule Anger
Autobuild-Date(v4-17-test): Tue Aug 23 10:31:11 UTC 2022 on sn-devel-184
---
Summary of changes:
libcli/util/wscript_build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/libcli/util/wscript_build b/libcli/util/wscript_build
index 9c8fddca94b..4267cfeb57e 100644
--- a/libcli/util/wscript_build
+++ b/libcli/util/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('samba-errors',
deps='gnutls',
# private_library=True,
pc_files=[],
- vnum='1',
+ vnum='1.0.0',
)
bld.SAMBA_GENERATOR('ntstatus_generated',
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-17-test updated
The branch, v4-17-test has been updated via fbcb8db069c WHATSNEW: document new volume serial number smb.conf parameter via 0b15ebced78 s3:smbd: let delay_for_oplock_fn() only call leases_db_get() once via cb63afbda1b s3:smbd: lease_match_break_fn() only needs leases_db_get() once via e764e40ad55 s3:smbd: inline fsp_lease_type_is_exclusive() logic into contend_level2_oplocks_begin_default via fa8d19056bd s3:locking: move get_existing_share_mode_lock() to share_mode_lock.[ch] via 411af5fb48c s3:locking: pass lease_key explicitly to set_share_mode() via 6bf37ba4538 s3:smbd: only run validate_oplock_types() with smbd:validate_oplock_types = yes via f207ef33224 s3:g_lock: avoid useless talloc_array(0) in g_lock_dump() via e4538e70cbe s3:g_lock: add some const to the shared array passed via g_lock_dump*() via 208037a7eea lib/util: add unlikely() to SMB_ASSERT() via 76bff90824a s3: smbd: Plumb close_type parameter through close_file_in_loop(), file_close_conn() via 91273a969ab s3: smbd: Add "enum file_close_type close_type" parameter to file_close_conn(). via 5fc9bf0f63c s3: smbd: Add "enum file_close_type close_type" parameter to close_cnum(). via c47b7479e74 s3/smbd: Use after free when iterating smbd_server_connection->connections via 0b33961e71a s3/smbd: Use after free when iterating smbd_server_connection->connections via 0725e1ea851 s3:utils remove documentation of -l as alias for --long via c4c99397c56 s3:smbd: only clear LEASE_READ if there's no read lease is left via 0529214b3cc s4:torture/smb2: add smb2.lease.v[1,2]_bug_15148 via 6ac28f43868 s3:smbd: share_mode_flags_set() takes SMB2_LEASE_* values via e3ee5197a6d libcli/smb: Set error status if 'iov' pointer is NULL via dee2505716d libcli/smb: Ensure we call tevent_req_nterror() on failure from 877287e6b4e VERSION: Bump version up to Samba 4.17.0rc3... https://git.samba.org/?p=samba.git;a=shortlog;h=v4-17-test - Log - commit fbcb8db069c865cfa002d69b224bd3dfc6f9b840 Author: Christian Ambach Date: Wed Aug 17 13:17:29 2022 +0200 WHATSNEW: document new volume serial number smb.conf parameter Signed-off-by: Christian Ambach Autobuild-User(v4-17-test): Jule Anger Autobuild-Date(v4-17-test): Tue Aug 23 08:57:28 UTC 2022 on sn-devel-184 commit 0b15ebced782382bef77877524d45197332e4488 Author: Stefan Metzmacher Date: Mon Aug 15 09:56:15 2022 +0200 s3:smbd: let delay_for_oplock_fn() only call leases_db_get() once get_lease_type() will just call leases_db_get() again for leases, so only call it for oplocks. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125 Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Aug 19 19:39:18 UTC 2022 on sn-devel-184 (cherry picked from commit d4f18f99d3a40a8df00beb006e2731959aa6fad9) commit cb63afbda1b07b5fafe09a28a03aeedbd353346c Author: Stefan Metzmacher Date: Mon Aug 15 09:45:43 2022 +0200 s3:smbd: lease_match_break_fn() only needs leases_db_get() once get_lease_type() will just call leases_db_get() again... BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125 Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison (cherry picked from commit 60ae7a5a2ed9a03d8693b9b455b7b3696386aeb1) commit e764e40ad5569b2976d7a891d868a30281e73f44 Author: Stefan Metzmacher Date: Thu Aug 18 12:52:54 2022 +0200 s3:smbd: inline fsp_lease_type_is_exclusive() logic into contend_level2_oplocks_begin_default SMB2_LEASE_WRITE is the indication for an exclusive lease, the fact that a SMB2_LEASE_WRITE can't exists without SMB2_LEASE_READ is not important here. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125 Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison (cherry picked from commit 76da56aa65bb9fe7f2f8c4a2e30e278a61db1ff5) commit fa8d19056bd71d0581a5a66d2ea9bab38b8af768 Author: Stefan Metzmacher Date: Thu Aug 18 14:14:20 2022 +0200 s3:locking: move get_existing_share_mode_lock() to share_mode_lock.[ch] This should be where get_share_mode_lock() is located. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125 Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison (cherry picked from commit bf8f2258497f7d2a5a5f8d1cacf1a30899ed455c) commit 411af5fb48c076500be41b795b7627edf3554b8e Author: Stefan Metzmacher Date: Wed Aug 10 08:27:15 2022 + s3:locking: pass lease_key explicitly to set_share_mode() We should avoid accessing fsp->lease if possible. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125 Signed-off-by:
[SCM] Samba Shared Repository - branch v4-16-test updated
The branch, v4-16-test has been updated via df7d6f0c486 lib:replace: Only include on non-Linux systems via ce464a83c76 s3: smbd: Plumb close_type parameter through close_file_in_loop(), file_close_conn() via a5cf33d4041 s3: smbd: Add "enum file_close_type close_type" parameter to file_close_conn(). via 706c64c6f0e s3: smbd: Add "enum file_close_type close_type" parameter to close_cnum(). via d1bc0d0b51b s3/smbd: Use after free when iterating smbd_server_connection->connections via 56e1a9fc623 s3/smbd: Use after free when iterating smbd_server_connection->connections via 9cb40437278 s3:smbd: only clear LEASE_READ if there's no read lease is left via b910d9f6e00 s4:torture/smb2: add smb2.lease.v[1,2]_bug_15148 via 19f285e0809 s3:smbd: share_mode_flags_set() takes SMB2_LEASE_* values via f6afc5b35e7 libcli/smb: Set error status if 'iov' pointer is NULL via f33ad1c1725 libcli/smb: Ensure we call tevent_req_nterror() on failure from b75b5f60ba3 s3/util/py_net.c: fix samba-tool domain join segfault https://git.samba.org/?p=samba.git;a=shortlog;h=v4-16-test - Log - commit df7d6f0c48612feea428643006d32c2292c662e2 Author: Andreas Schneider Date: Tue Aug 2 07:55:46 2022 +0200 lib:replace: Only include on non-Linux systems Details at: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132 Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme (cherry picked from commit 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0) Autobuild-User(v4-16-test): Jule Anger Autobuild-Date(v4-16-test): Tue Aug 23 08:53:41 UTC 2022 on sn-devel-184 commit ce464a83c76ce612171f3df4933058695210915e Author: Jeremy Allison Date: Wed Aug 17 11:43:47 2022 -0700 s3: smbd: Plumb close_type parameter through close_file_in_loop(), file_close_conn() Allows close_file_in_loop() to differentiate between SHUTDOWN_CLOSE (previously it only used this close type) and ERROR_CLOSE - called on error from smbXsrv_tcon_disconnect() in the error path. In that case we want to close the fd, but not run any delete-on-close actions. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15128 Signed-off-by: Jeremy Allison Reivewed-by: Noel Power Autobuild-User(master): Noel Power Autobuild-Date(master): Thu Aug 18 14:10:18 UTC 2022 on sn-devel-184 (cherry picked from commit cf5f7b1489930f6d64c3e3512f116ccf286d4605) commit a5cf33d4041d44f1f8a80563b81f3bc6893bc7ce Author: Jeremy Allison Date: Wed Aug 17 11:39:36 2022 -0700 s3: smbd: Add "enum file_close_type close_type" parameter to file_close_conn(). Not yet used. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15128 Signed-off-by: Jeremy Allison Reviewed-by: Noel Power (cherry picked from commit 7005a6354df5522d9f665fb30052c458dfc93124) [npo...@samba.org Adjusted for 4.15 filename change smb2-service.c -> service.c] commit 706c64c6f0ee8cca24715cf4d591ed504432ce0f Author: Jeremy Allison Date: Wed Aug 17 11:35:29 2022 -0700 s3: smbd: Add "enum file_close_type close_type" parameter to close_cnum(). Not yet used, but needed so we can differentiate between SHUTDOWN_CLOSE and ERROR_CLOSE in smbXsrv_tcon_disconnect() if we fail to chdir. In that case we want to close the fd, but not run any delete-on-close actions. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15128 Signed-off-by: Jeremy Allison Reviewed-by: Noel Power (cherry picked from commit 9203d17106c0e55a30813ff1ed76869c7581a343) [npo...@samba.org Adjusted for 4.15 filename change smb2-service.c -> service.c] commit d1bc0d0b51bb8145c4d1597a39f72d85b28f8b35 Author: Jeremy Allison Date: Fri Jul 22 16:28:03 2022 +0100 s3/smbd: Use after free when iterating smbd_server_connection->connections Change conn_free() to just use a destructor. We now catch any other places where we may have forgetten to call conn_free() - it's implicit on talloc_free(conn). BUG: https://bugzilla.samba.org/show_bug.cgi?id=15128 Based on code from Noel Power . Signed-off-by: Jeremy Allison Reviewed-by: Noel Power Autobuild-User(master): Noel Power Autobuild-Date(master): Wed Aug 17 09:54:06 UTC 2022 on sn-devel-184 (cherry picked from commit f92bacbe216d2d74ea3ccf3fe0df5c1cc9860996) commit 56e1a9fc623ae184fefcf3214a6b1801b37e5fff Author: Jeremy Allison Date: Tue Aug 16 13:51:27 2022 -0700 s3/smbd: Use after free when iterating smbd_server_connection->connections In SMB2 smbd_smb2_tree_connect() we create a new conn struct inside make_connection_smb2()
[SCM] Samba Shared Repository - branch v4-15-test updated
The branch, v4-15-test has been updated via f6bb11dbaac lib:replace: Only include on non-Linux systems via 907e4ce03ab s3: smbd: Plumb close_type parameter through close_file_in_loop(), file_close_conn() via 4c436dfe8cc s3: smbd: Add "enum file_close_type close_type" parameter to file_close_conn(). via 6cd04ec396c s3: smbd: Add "enum file_close_type close_type" parameter to close_cnum(). via 659dfb93c2a s3/smbd: Use after free when iterating smbd_server_connection->connections via 6b54bb8abea s3/smbd: Use after free when iterating smbd_server_connection->connections via 89110595b44 s3:smbd: only clear LEASE_READ if there's no read lease is left via ec1ad34f288 s4:torture/smb2: add smb2.lease.v[1,2]_bug_15148 via 93febc222bf s3:smbd: share_mode_flags_set() takes SMB2_LEASE_* values via bb66bbfa4e7 libcli/smb: Set error status if 'iov' pointer is NULL via 6b711620fe4 libcli/smb: Ensure we call tevent_req_nterror() on failure from 94bdda617e0 s3/util/py_net.c: fix samba-tool domain join segfault https://git.samba.org/?p=samba.git;a=shortlog;h=v4-15-test - Log - commit f6bb11dbaacaa03ca1991e7b1aa11b6699c15b84 Author: Andreas Schneider Date: Tue Aug 2 07:55:46 2022 +0200 lib:replace: Only include on non-Linux systems Details at: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132 Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme (cherry picked from commit 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0) Autobuild-User(v4-15-test): Jule Anger Autobuild-Date(v4-15-test): Tue Aug 23 07:34:22 UTC 2022 on sn-devel-184 commit 907e4ce03ab6809dd00d984c78ff1c006d925f97 Author: Jeremy Allison Date: Wed Aug 17 11:43:47 2022 -0700 s3: smbd: Plumb close_type parameter through close_file_in_loop(), file_close_conn() Allows close_file_in_loop() to differentiate between SHUTDOWN_CLOSE (previously it only used this close type) and ERROR_CLOSE - called on error from smbXsrv_tcon_disconnect() in the error path. In that case we want to close the fd, but not run any delete-on-close actions. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15128 Signed-off-by: Jeremy Allison Reivewed-by: Noel Power Autobuild-User(master): Noel Power Autobuild-Date(master): Thu Aug 18 14:10:18 UTC 2022 on sn-devel-184 (cherry picked from commit cf5f7b1489930f6d64c3e3512f116ccf286d4605) [npo...@samba.org Adjusted for 4.15 only file_close_conn needs to differentiate between SHUTDOWN_CLOSE & ERROR_CLOSE] commit 4c436dfe8cca162f086bd49f4032bdd3eb77553b Author: Jeremy Allison Date: Wed Aug 17 11:39:36 2022 -0700 s3: smbd: Add "enum file_close_type close_type" parameter to file_close_conn(). Not yet used. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15128 Signed-off-by: Jeremy Allison Reviewed-by: Noel Power (cherry picked from commit 7005a6354df5522d9f665fb30052c458dfc93124) [npo...@samba.org Adjusted for 4.15 filename change smb2-service.c -> service.c] commit 6cd04ec396cf101fb86c1cc2c17f5547d2e2e154 Author: Jeremy Allison Date: Wed Aug 17 11:35:29 2022 -0700 s3: smbd: Add "enum file_close_type close_type" parameter to close_cnum(). Not yet used, but needed so we can differentiate between SHUTDOWN_CLOSE and ERROR_CLOSE in smbXsrv_tcon_disconnect() if we fail to chdir. In that case we want to close the fd, but not run any delete-on-close actions. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15128 Signed-off-by: Jeremy Allison Reviewed-by: Noel Power (cherry picked from commit 9203d17106c0e55a30813ff1ed76869c7581a343) [npo...@samba.org Adjusted for 4.15 filename change smb2-service.c -> service.c] commit 659dfb93c2acbd038aa5465abae89cc12e394ad4 Author: Jeremy Allison Date: Fri Jul 22 16:28:03 2022 +0100 s3/smbd: Use after free when iterating smbd_server_connection->connections Change conn_free() to just use a destructor. We now catch any other places where we may have forgetten to call conn_free() - it's implicit on talloc_free(conn). BUG: https://bugzilla.samba.org/show_bug.cgi?id=15128 Based on code from Noel Power . Signed-off-by: Jeremy Allison Reviewed-by: Noel Power Autobuild-User(master): Noel Power Autobuild-Date(master): Wed Aug 17 09:54:06 UTC 2022 on sn-devel-184 (cherry picked from commit f92bacbe216d2d74ea3ccf3fe0df5c1cc9860996) commit 6b54bb8abead164487d6c061f729ac3dc25580b9 Author: Jeremy Allison Date: Tue Aug 16 13:51:27 2022 -0700 s3/smbd: Use after free when iterating
