Page MenuHomeFreeBSD
Files F153359981

D13487.diff
No OneTemporary
Actions

D13487.diff
View Options

Index: fs/fuse/fuse_vnops.c
===================================================================
--- fs/fuse/fuse_vnops.c
+++ fs/fuse/fuse_vnops.c
@@ -1988,21 +1988,21 @@
{
struct vnode *vp = ap->a_vp;
struct uio *uio = ap->a_uio;
- struct fuse_dispatcher fdi = {0};
+ struct fuse_dispatcher fdi;
struct fuse_getxattr_in *get_xattr_in;
struct fuse_getxattr_out *get_xattr_out;
struct mount *mp = vnode_mount(vp);
- char *prefix;
- size_t len;
- char *attr_str;
struct thread *td = ap->a_td;
struct ucred *cred = ap->a_cred;
- int err = 0;
+ char *prefix;
+ char *attr_str;
+ size_t len;
+ int err;
fuse_trace_printf_vnop();
if (fuse_isdeadfs(vp))
- return ENXIO;
+ return (ENXIO);
/* Default to looking for user attributes. */
if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM)
@@ -2023,7 +2023,7 @@
* fuse_getxattr_out. If we pass in a non-zero size, we get back
* that much data, without the struct fuse_getxattr_out header.
*/
- if (ap->a_size != NULL)
+ if (uio == NULL)
get_xattr_in->size = 0;
else
get_xattr_in->size = uio->uio_resid;
@@ -2033,7 +2033,6 @@
ap->a_name);
err = fdisp_wait_answ(&fdi);
-
if (err != 0) {
if (err == ENOSYS)
fsess_set_notimpl(mp, FUSE_GETXATTR);
@@ -2043,23 +2042,15 @@
/*
* If we get to this point (i.e. no error), we should have a valid
- * answer of some sort. i.e. non-zero iosize and a valid pointer.
+ * answer of some sort. i.e. non-zero iosize and a valid pointer.
*/
- if ((fdi.answ == NULL) || (fdi.iosize == 0)) {
- debug_printf("getxattr: err = 0, but answ = %p, iosize = %zu\n",
- fdi.answ, fdi.iosize);
- err = EINVAL;
- goto out;
- }
get_xattr_out = fdi.answ;
- if (ap->a_size != NULL) {
+ if (ap->a_size != NULL)
*ap->a_size = get_xattr_out->size;
- } else if (fdi.iosize > 0) {
+
+ if (uio != NULL)
err = uiomove(fdi.answ, fdi.iosize, uio);
- } else {
- err = EINVAL;
- }
out:
fdisp_destroy(&fdi);
@@ -2082,20 +2073,20 @@
{
struct vnode *vp = ap->a_vp;
struct uio *uio = ap->a_uio;
- struct fuse_dispatcher fdi = {0};
+ struct fuse_dispatcher fdi;
struct fuse_setxattr_in *set_xattr_in;
struct mount *mp = vnode_mount(vp);
+ struct thread *td = ap->a_td;
+ struct ucred *cred = ap->a_cred;
char *prefix;
size_t len;
char *attr_str;
- struct thread *td = ap->a_td;
- struct ucred *cred = ap->a_cred;
- int err = 0;
-
+ int err;
+
fuse_trace_printf_vnop();
if (fuse_isdeadfs(vp))
- return ENXIO;
+ return (ENXIO);
/* Default to looking for user attributes. */
if (ap->a_attrnamespace == EXTATTR_NAMESPACE_SYSTEM)
@@ -2208,23 +2199,24 @@
{
struct vnode *vp = ap->a_vp;
struct uio *uio = ap->a_uio;
- struct fuse_dispatcher fdi = {0};
+ struct fuse_dispatcher fdi;
struct fuse_getxattr_in *get_xattr_in;
struct fuse_getxattr_out *get_xattr_out;
struct mount *mp = vnode_mount(vp);
+ struct thread *td = ap->a_td;
+ struct ucred *cred = ap->a_cred;
size_t len;
char *prefix;
char *attr_str;
char *bsd_list = NULL;
int bsd_list_len;
- struct thread *td = ap->a_td;
- struct ucred *cred = ap->a_cred;
- int err = 0;
+ int linux_list_len;
+ int err;
fuse_trace_printf_vnop();
if (fuse_isdeadfs(vp))
- return ENXIO;
+ return (ENXIO);
/*
* Add space for a NUL and the period separator if enabled.
@@ -2240,50 +2232,57 @@
fdisp_init(&fdi, sizeof(*get_xattr_in) + len);
fdisp_make_vp(&fdi, FUSE_LISTXATTR, vp, td, cred);
+ /*
+ * Retrieve Linux / FUSE compatible list size.
+ */
get_xattr_in = fdi.indata;
- if (ap->a_size != NULL)
- get_xattr_in->size = 0;
- else
- get_xattr_in->size = uio->uio_resid + sizeof(*get_xattr_out);
-
-
- attr_str = (char *)fdi.indata + sizeof(*get_xattr_in);
+ get_xattr_in->size = 0;
+ attr_str = (char *)fdi.indata + sizeof(struct fuse_getxattr_in);
snprintf(attr_str, len, "%s%c", prefix, extattr_namespace_separator);
-
err = fdisp_wait_answ(&fdi);
if (err != 0) {
if (err == ENOSYS)
fsess_set_notimpl(mp, FUSE_LISTXATTR);
- debug_printf("listextattr: got err=%d from daemon\n", err);
goto out;
}
- if ((fdi.answ == NULL) || (fdi.iosize == 0)) {
- err = EINVAL;
+ get_xattr_out = fdi.answ;
+ linux_list_len = get_xattr_out->size;
+ if (linux_list_len == 0) {
+ if (ap->a_size != NULL)
+ *ap->a_size = linux_list_len;
goto out;
}
- get_xattr_out = fdi.answ;
- if (ap->a_size != NULL) {
- *ap->a_size = get_xattr_out->size;
- } else if (fdi.iosize > 0) {
- /*
- * The Linux / FUSE attribute list format isn't the same
- * as FreeBSD's format. So we need to transform it into
- * FreeBSD's format before giving it to the user.
- */
- bsd_list = malloc(fdi.iosize, M_TEMP, M_WAITOK);
- err = fuse_xattrlist_convert(prefix, fdi.answ, fdi.iosize,
- bsd_list, &bsd_list_len);
- if (err != 0)
- goto out;
+ /*
+ * Retrieve Linux / FUSE compatible list values.
+ */
+ fdisp_make_vp(&fdi, FUSE_LISTXATTR, vp, td, cred);
+ get_xattr_in->size = linux_list_len + sizeof(struct fuse_getxattr_out);
+ err = fdisp_wait_answ(&fdi);
+ if (err != 0) {
+ if (err == ENOSYS)
+ fsess_set_notimpl(mp, FUSE_LISTXATTR);
+ goto out;
+ }
+
+ /*
+ * Retrieve the BSD compatible list values.
+ * The Linux / FUSE attribute list format isn't the same
+ * as FreeBSD's format. So we need to transform it into
+ * FreeBSD's format before giving it to the user.
+ */
+ bsd_list = malloc(linux_list_len, M_TEMP, M_WAITOK);
+ err = fuse_xattrlist_convert(prefix, fdi.answ, fdi.iosize,
+ bsd_list, &bsd_list_len);
+ if (err != 0)
+ goto out;
+ if (ap->a_size != NULL)
+ *ap->a_size = bsd_list_len;
+
+ if (uio != NULL)
err = uiomove(bsd_list, bsd_list_len, uio);
- } else {
- debug_printf("listextattr: returned iosize %zu for %s attribute list is "
- "too small\n", fdi.iosize, prefix);
- err = EINVAL;
- }
out:
free(bsd_list, M_TEMP);
@@ -2305,13 +2304,13 @@
fuse_vnop_deleteextattr(struct vop_deleteextattr_args *ap)
{
struct vnode *vp = ap->a_vp;
- struct fuse_dispatcher fdi = {0};
+ struct fuse_dispatcher fdi;
struct mount *mp = vnode_mount(vp);
+ struct thread *td = ap->a_td;
+ struct ucred *cred = ap->a_cred;
char *prefix;
size_t len;
char *attr_str;
- struct thread *td = ap->a_td;
- struct ucred *cred = ap->a_cred;
int err;
fuse_trace_printf_vnop();

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 5:09 PM (6 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31922427
Default Alt Text
D13487.diff (6 KB)

Event Timeline