[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1905c77a080 lib:replace: Fix NULL issue reported by covscan
via ac3c8c536d5 lib:replace: Fix trailing whitespace in os2_delete.c
from 95c7d23462b vfs: Simplify fake_acls_stat() with an early return
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1905c77a080710dc06c9422e2654a6080d21daa5
Author: Pavel Filipenský
Date: Thu Jan 27 09:40:28 2022 +0100
lib:replace: Fix NULL issue reported by covscan
Found by covscan. Coding style kept as in the rest of the file.
Signed-off-by: Pavel Filipenský
Reviewed-by: Andreas Schneider
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Tue Feb 1 21:09:21 UTC 2022 on sn-devel-184
commit ac3c8c536d5462de85bd90db4df73d8517a1051a
Author: Pavel Filipenský
Date: Thu Jan 27 09:39:29 2022 +0100
lib:replace: Fix trailing whitespace in os2_delete.c
Signed-off-by: Pavel Filipenský
Reviewed-by: Andreas Schneider
Reviewed-by: Jeremy Allison
---
Summary of changes:
lib/replace/tests/os2_delete.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/tests/os2_delete.c b/lib/replace/tests/os2_delete.c
index df8a8f59ec2..a3e45f7bff3 100644
--- a/lib/replace/tests/os2_delete.c
+++ b/lib/replace/tests/os2_delete.c
@@ -66,8 +66,8 @@ static int os2_delete(DIR *d)
char names[READDIR_SIZE][256];
/* scan, remembering offsets */
- for (i=0, de=readdir(d);
-de && i < READDIR_SIZE;
+ for (i=0, de=readdir(d);
+de && i < READDIR_SIZE;
de=readdir(d), i++) {
offsets[i] = telldir(d);
/* strlcpy not available here */
@@ -106,7 +106,7 @@ int test_readdir_os2_delete(void)
d = opendir(TESTDIR "/test0.txt");
if (d != NULL) FAILED("opendir() on file succeed");
if (errno != ENOTDIR) FAILED("opendir() on file didn't give ENOTDIR");
- closedir(d);
+ if (d != NULL) closedir(d);
d = opendir(TESTDIR);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 95c7d23462b vfs: Simplify fake_acls_stat() with an early return
via e93f46357fd smbd: Simplify reopen_from_fsp() with an early return
via 1d6762d86b9 smbd: copy_access_posix_acl() just needs fsps these days
via a1d5ae30ed9 smbd: chmod_acl_internals() does not need
connection_struct anymore
via ea8a6537543 smbd: Make directory_has_default_posix_acl() just take
"dirfsp"
via 191c15f5ef7 smbd: Modernize a debug statement
via 888275eee2d torture: Align an integer type
via 69f2352c494 mdssvc: Align an integer type
from 2b2b41c8682 s3: smbd: Add two new functions in a new file,
smb2_posix.c: smb2_posix_cc_info(), store_smb2_posix_info()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 95c7d23462b5b69ff852182a4922119279f3432d
Author: Volker Lendecke
Date: Tue Jan 18 17:55:04 2022 +0100
vfs: Simplify fake_acls_stat() with an early return
Review with "git di -b"
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Tue Feb 1 20:04:44 UTC 2022 on sn-devel-184
commit e93f46357fd047c492e2582ee0bab2a0731e7bde
Author: Volker Lendecke
Date: Thu Dec 30 15:59:33 2021 +0100
smbd: Simplify reopen_from_fsp() with an early return
Review with git show -b
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 1d6762d86b9e4cdfbdd85657038a332392cd29ce
Author: Volker Lendecke
Date: Mon Jan 24 17:37:37 2022 +0100
smbd: copy_access_posix_acl() just needs fsps these days
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit a1d5ae30ed9f38118077e9b208ccc2d1cc7918d1
Author: Volker Lendecke
Date: Mon Jan 24 17:34:23 2022 +0100
smbd: chmod_acl_internals() does not need connection_struct anymore
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit ea8a653754350f7a3e28dd3c62fc1796017b125f
Author: Volker Lendecke
Date: Mon Jan 24 17:32:08 2022 +0100
smbd: Make directory_has_default_posix_acl() just take "dirfsp"
conn is not referenced anymore, and we only need the files_struct
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 191c15f5ef77ca3d1ea3ac0e0b6ccc3085c8735d
Author: Volker Lendecke
Date: Thu Jan 27 20:34:28 2022 +0100
smbd: Modernize a debug statement
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 888275eee2d582af4d42e86b62ce8ffda3e014bd
Author: Volker Lendecke
Date: Thu Jan 27 21:52:31 2022 +0100
torture: Align an integer type
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 69f2352c4942a761ae5c61589ac7ce93ebfc8f93
Author: Volker Lendecke
Date: Mon Jan 31 08:57:41 2022 +0100
mdssvc: Align an integer type
In libjansson 2.13.1 json_array_size() returns a size_t
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
---
Summary of changes:
source3/modules/vfs_fake_acls.c | 164 +-
source3/rpc_server/mdssvc/mdssvc_es.c | 4 +-
source3/smbd/open.c | 32 +++
source3/smbd/posix_acls.c | 39
source3/smbd/smb2_server.c| 6 +-
source4/torture/smb2/create.c | 6 +-
6 files changed, 127 insertions(+), 124 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_fake_acls.c b/source3/modules/vfs_fake_acls.c
index 441e22ea3f6..25dc12f2c4c 100644
--- a/source3/modules/vfs_fake_acls.c
+++ b/source3/modules/vfs_fake_acls.c
@@ -80,6 +80,8 @@ static int fake_acls_stat(vfs_handle_struct *handle,
{
int ret = -1;
struct in_pathref_data *prd = NULL;
+ struct smb_filename *smb_fname_cp = NULL;
+ struct files_struct *fsp = NULL;
SMB_VFS_HANDLE_GET_DATA(handle,
prd,
@@ -87,99 +89,97 @@ static int fake_acls_stat(vfs_handle_struct *handle,
return -1);
ret = SMB_VFS_NEXT_STAT(handle, smb_fname);
- if (ret == 0) {
- struct smb_filename *smb_fname_cp = NULL;
- struct files_struct *fsp = NULL;
-
- if (smb_fname->fsp != NULL) {
- fsp = smb_fname->fsp;
- if (fsp->base_fsp != NULL) {
- /*
-* This is a stream pathname. Use
-* the base_fsp to get the xattr.
-*/
- fsp = fsp->base_fsp;
- }
- } else {
- NTSTATUS status;
+ if (ret != 0) {
+ return
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2b2b41c8682 s3: smbd: Add two new functions in a new file, smb2_posix.c: smb2_posix_cc_info(), store_smb2_posix_info() via 85c6711104e s3: smbd: smbd_smb2_request_process_negprot() - Allow SMB2 unix extensions to be negotiated. Currently not allowed. via f68fffa85d1 s3: smbd: Plumb in POSIX lock requests through SMB2 lock calls if done on a POSIX handle. Currently not allowed. via fadb2d60ae3 s3: smbd: Update widelinks_warning() to cope with SMB1 and SMB2 unix extensions. via 7a5fea262f2 s3: smbd: lp_widelinks(). Turn off widelinks if either SMB1 or SMB2 unix extensions are turned on. via 955f08866d5 s3: smbd: Add lp_smb2_unix_extensions() function. Always returns false for now. via 2e72b9cd2d2 s3: smbd: Add the definition for SMB2_FIND_POSIX_INFORMATION info level. via 0711040dd58 s3: smbd: Add the definition for SMB2_FILE_POSIX_INFORMATION info level. via 722d0d3c55d libcli: Add SMB2 posix negotiate context flag. via e9ad1896946 s3: smbd: Add an SMB2 server flag posix_extensions_negotiated. from e4e5539e402 CVE-2021-44141: s3: smbd: Inside rename_internals_fsp(), we must use vfs_stat() for existence, not SMB_VFS_STAT(). https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2b2b41c8682d0830786e3d69a9875af8b0c98175 Author: Jeremy Allison Date: Thu Jan 27 14:17:36 2022 -0800 s3: smbd: Add two new functions in a new file, smb2_posix.c: smb2_posix_cc_info(), store_smb2_posix_info() Not yet used. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Tue Feb 1 17:25:45 UTC 2022 on sn-devel-184 commit 85c6711104e411c20077b69bf33748d6444abe61 Author: Jeremy Allison Date: Thu Jan 27 11:36:19 2022 -0800 s3: smbd: smbd_smb2_request_process_negprot() - Allow SMB2 unix extensions to be negotiated. Currently not allowed. As lp_smb2_unix_extensions() currently always returns false, this code path cannot be executed. This will change once the whole client and server fixes are in place and tests are passing. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider commit f68fffa85d1de992384a210bb0b9261cda3fb168 Author: Jeremy Allison Date: Thu Jan 27 09:49:45 2022 -0800 s3: smbd: Plumb in POSIX lock requests through SMB2 lock calls if done on a POSIX handle. Currently not allowed. Note there is currently no way to create a POSIX file handle in SMB2 so this code can't be accessed. This will remain so until client and server code are ready to turn on SMB2 POSIX extensions and the tests are in place. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider commit fadb2d60ae389b77a302402bd05f636262e178b5 Author: Jeremy Allison Date: Thu Jan 27 10:11:58 2022 -0800 s3: smbd: Update widelinks_warning() to cope with SMB1 and SMB2 unix extensions. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider commit 7a5fea262f2456dcedf701bd743e59295044be4e Author: Jeremy Allison Date: Thu Jan 27 10:07:07 2022 -0800 s3: smbd: lp_widelinks(). Turn off widelinks if either SMB1 or SMB2 unix extensions are turned on. NB. Currently it's impossible to turn on SMB2 unix extensions. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider commit 955f08866d56fe2c232a2b7b2ca69b4421c8092b Author: Jeremy Allison Date: Thu Jan 27 10:03:36 2022 -0800 s3: smbd: Add lp_smb2_unix_extensions() function. Always returns false for now. For now *always* returns false. This allows me to add code into smbd contingent on lp_smb2_unix_extensions() which I know will not be executed until all the parts are in place. Then the real parameter can be added (default to off) and testing added. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider commit 2e72b9cd2d29da953a92c21204e79913ab83b99e Author: Jeremy Allison Date: Thu Jan 27 14:46:01 2022 -0800 s3: smbd: Add the definition for SMB2_FIND_POSIX_INFORMATION info level. Will be used by smb2_query_directory. Not yet used or available. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider commit 0711040dd584ac373c208656ea76b95dbd3ad078 Author: Jeremy Allison Date: Thu Jan 27 14:43:27 2022 -0800 s3: smbd: Add the definition for SMB2_FILE_POSIX_INFORMATION info level. Will be used by smb2_getinfo. Not yet used or available. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider commit 722d0d3c55d76a4f59834722afebd71b6076cf5f Author: Jeremy Allison Date: Thu Jan 27 10:18:32 2022 -0800 libcli: Add SMB2 posix negotiate context flag. Signed-off-by: Jeremy Allison
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via e34ef99 CVE-2021-44142.html: fix CVE version from f5017ed Add credits to the CVE-2021-44142 advisory https://git.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit e34ef99fc28950a69d6be7f26061e4c7945c0203 Author: Ralph Boehme Date: Tue Feb 1 17:12:47 2022 +0100 CVE-2021-44142.html: fix CVE version Signed-off-by: Ralph Boehme --- Summary of changes: security/CVE-2021-44142.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/security/CVE-2021-44142.html b/security/CVE-2021-44142.html index 7e972e5..d2fe264 100644 --- a/security/CVE-2021-44142.html +++ b/security/CVE-2021-44142.html @@ -8,7 +8,7 @@ - CVE-2022-44142.html: + CVE-2021-44142.html: -- Samba Website Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via f5017ed Add credits to the CVE-2021-44142 advisory from 0c959c8 NEWS[4.16.0rc2]: Samba 4.16.0rc2 Available for Download https://git.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit f5017ed77c193406fb2adb68cd685b06297c8b71 Author: Ralph Boehme Date: Tue Feb 1 15:07:49 2022 +0100 Add credits to the CVE-2021-44142 advisory Signed-off-by: Ralph Boehme --- Summary of changes: security/CVE-2021-44142.html | 2 ++ 1 file changed, 2 insertions(+) Changeset truncated at 500 lines: diff --git a/security/CVE-2021-44142.html b/security/CVE-2021-44142.html index 8c7e491..7e972e5 100644 --- a/security/CVE-2021-44142.html +++ b/security/CVE-2021-44142.html @@ -85,6 +85,8 @@ Credits === Originally reported by Orange Tsai from DEVCORE. +Nguyen Hoang Thach and Billy Jheng Bing-Jhong of STAR Labs working with Trend Micro Zero Day Initiative +Lucas Leong of Trend Micro Zero Day Initiative Patches provided by Ralph Bhme of the Samba team. -- Samba Website Repository
