[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Fri Sep 23 06:51:01 UTC 2022


The branch, master has been updated
       via  f6b391e04a4 vfs_gpfs: Protect against timestamps before the Unix epoch
      from  d9dda4b7af2 ctdb-scripts: Add debugging variable CTDB_KILLTCP_DEBUGLEVEL

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f6b391e04a4d5974b908f4f375bd2876083aa7b2
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Aug 22 15:24:01 2022 +0200

    vfs_gpfs: Protect against timestamps before the Unix epoch
    
    In addition to b954d181cd2 we should also protect against timestamps
    before the epoch.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=15151
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Sep 23 06:50:17 UTC 2022 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_gpfs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 1f3d803e1c5..779627f8115 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1679,10 +1679,10 @@ static int timespec_to_gpfs_time(
 		return 0;
 	}
 
-	if (ts.tv_sec > UINT32_MAX) {
-		DBG_WARNING("GPFS uses 32-bit unsigned timestamps, "
-			    "%ju is too large\n",
-			    (uintmax_t)ts.tv_sec);
+	if (ts.tv_sec < 0 || ts.tv_sec > UINT32_MAX) {
+		DBG_NOTICE("GPFS uses 32-bit unsigned timestamps "
+			   "and cannot handle %jd.\n",
+			   (intmax_t)ts.tv_sec);
 		errno = ERANGE;
 		return -1;
 	}


-- 
Samba Shared Repository



More information about the samba-cvs mailing list