Attachment 15719 Details for Bug 14216 – upstream fix, backported for v4-11-test

[patch] upstream fix, backported for v4-11-test

0001-vfs_ceph_snapshots-fix-root-relative-path-handling.patch (text/plain), 1.82 KB, created by David Disseldorp on 2019-12-20 17:37:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2019-12-20 17:37:24 UTC

Size: 1.82 KB

patch

obsolete

>From 3f5f48d8ffc2e1fc456b85df5e9e2344299021ab Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@samba.org>
>Date: Thu, 12 Dec 2019 22:14:50 +0100
>Subject: [PATCH] vfs_ceph_snapshots: fix root relative path handling
>
>For file paths relative to root, ceph_snap_get_parent_path() may return
>an empty parent dir string, in which case the CephFS snashot path should
>be ".snap".
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=14216
>
>Signed-off-by: David Disseldorp <ddiss@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 54293f92cd83efc3a5a78fc29a85643921da9d32)
>---
> source3/modules/vfs_ceph_snapshots.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
>diff --git a/source3/modules/vfs_ceph_snapshots.c b/source3/modules/vfs_ceph_snapshots.c
>index 4d935a55a1a..0b5f7ab59a5 100644
>--- a/source3/modules/vfs_ceph_snapshots.c
>+++ b/source3/modules/vfs_ceph_snapshots.c
>@@ -390,8 +390,12 @@ static int ceph_snap_get_shadow_copy_data(struct vfs_handle_struct *handle,
> 		parent_dir = tmp;
> 	}
> 
>-	ret = snprintf(snaps_path, sizeof(snaps_path), "%s/%s",
>-		       parent_dir, snapdir);
>+	if (strlen(parent_dir) == 0) {
>+		ret = strlcpy(snaps_path, snapdir, sizeof(snaps_path));
>+	} else {
>+		ret = snprintf(snaps_path, sizeof(snaps_path), "%s/%s",
>+			       parent_dir, snapdir);
>+	}
> 	if (ret >= sizeof(snaps_path)) {
> 		ret = -EINVAL;
> 		goto err_out;
>@@ -534,7 +538,11 @@ static int ceph_snap_gmt_convert_dir(struct vfs_handle_struct *handle,
> 	/*
> 	 * Temporally use the caller's return buffer for this.
> 	 */
>-	ret = snprintf(_converted_buf, buflen, "%s/%s", name, snapdir);
>+	if (strlen(name) == 0) {
>+		ret = strlcpy(_converted_buf, snapdir, buflen);
>+	} else {
>+		ret = snprintf(_converted_buf, buflen, "%s/%s", name, snapdir);
>+	}
> 	if (ret >= buflen) {
> 		ret = -EINVAL;
> 		goto err_out;
>-- 
>2.16.4
>

Flags:

jra: review+

Actions: View

Attachments on bug 14216: 15682 | 15719