Attachment 15145 Details for Bug 13940 – Cherry-pick of fix for 4.8, 4.9, and 4.10.next

[patch] Cherry-pick of fix for 4.8, 4.9, and 4.10.next

0001-vfs_ceph-fix-cephwrap_flistxattr-debug-message.patch (text/plain), 1.44 KB, created by David Disseldorp on 2019-05-13 10:34:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2019-05-13 10:34:40 UTC

Size: 1.44 KB

patch

obsolete

>From a4da776181413632a556c8c6855ef41dfbec0792 Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@samba.org>
>Date: Fri, 10 May 2019 13:18:49 +0200
>Subject: [PATCH] vfs_ceph: fix cephwrap_flistxattr() debug message
>
>The @list buffer may be uninitialised prior to ceph_flistxattr()
>invocation, so only log the address.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=13940
>
>Signed-off-by: David Disseldorp <ddiss@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): David Disseldorp <ddiss@samba.org>
>Autobuild-Date(master): Fri May 10 12:59:05 UTC 2019 on sn-devel-184
>
>(cherry picked from commit 21dc6f8e8d82f84e4afda355a48fbbd39c7fe800)
>---
> source3/modules/vfs_ceph.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
>index 5d67142997d..a08be029114 100644
>--- a/source3/modules/vfs_ceph.c
>+++ b/source3/modules/vfs_ceph.c
>@@ -1409,7 +1409,8 @@ static ssize_t cephwrap_listxattr(struct vfs_handle_struct *handle,
> static ssize_t cephwrap_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size)
> {
> 	int ret;
>-	DBG_DEBUG("[CEPH] flistxattr(%p, %p, %s, %llu)\n", handle, fsp, list, llu(size));
>+	DBG_DEBUG("[CEPH] flistxattr(%p, %p, %p, %llu)\n",
>+		  handle, fsp, list, llu(size));
> #if LIBCEPHFS_VERSION_CODE >= LIBCEPHFS_VERSION(0, 94, 0)
> 	ret = ceph_flistxattr(handle->data, fsp->fh->fd, list, size);
> #else
>-- 
>2.16.4
>

Flags:

asn: review+

Actions: View

Attachments on bug 13940: 15141 | 15145