From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 26 Aug 2022 09:17:51 +0000 (+0200)
Subject: s3:locking: let is_delete_on_close_set() use share_mode_lock_access_private_data()
X-Git-Tag: talloc-2.4.0~886
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee78d948129bca8650bf1729b7d15826f2e564cd;p=thirdparty%2Fsamba.git

s3:locking: let is_delete_on_close_set() use share_mode_lock_access_private_data()

We should avoid dereference 'struct share_mode_lock' as much as possible.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index f4ed19bb35f..e90ede5f411 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1034,7 +1034,22 @@ bool get_delete_on_close_token(struct share_mode_lock *lck,
 
 bool is_delete_on_close_set(struct share_mode_lock *lck, uint32_t name_hash)
 {
-	return find_delete_on_close_token(lck->data, name_hash) != NULL;
+	struct share_mode_data *d = NULL;
+	NTSTATUS status;
+
+	status = share_mode_lock_access_private_data(lck, &d);
+	if (!NT_STATUS_IS_OK(status)) {
+		struct file_id id = share_mode_lock_file_id(lck);
+		struct file_id_buf id_buf;
+		/* Any error recovery possible here ? */
+		DBG_ERR("share_mode_lock_access_private_data() failed for "
+			"%s name_hash=%"PRIu32" - %s\n",
+			file_id_str_buf(id, &id_buf), name_hash,
+			nt_errstr(status));
+		return false;
+	}
+
+	return find_delete_on_close_token(d, name_hash) != NULL;
 }
 
 bool set_sticky_write_time(struct file_id fileid, struct timespec write_time)