bcac8bff90
Switch order of operations to avoid creating a short XDR buffer:
e.g., buflen = 12, old xdrlen = 12, new xdrlen = 20.
Having a short XDR buffer leads to lxa_maxcount be a few bytes
less than what is needed to retrieve the whole list when using
a buflen as returned by a call with size = 0:
buflen = listxattr(path, NULL, 0);
buf = malloc(buflen);
buflen = listxattr(path, buf, buflen);
For a file with one attribute (name = '123456'), the first call
with size = 0 will return buflen = 12 ('user.123456\x00').
The second call with size = 12, sends LISTXATTRS with
lxa_maxcount = 12 + 8 (cookie) + 4 (array count) = 24. The
XDR buffer needs 8 (cookie) + 4 (array count) + 4 (name count)
+ 6 (name len) + 2 (padding) + 4 (eof) = 28 which is 4 bytes
shorter than the lxa_maxcount provided in the call.
Fixes: 04a5da690e ("NFSv4.2: define limits and sizes for user xattr handling")
Signed-off-by: Jorge Mora <mora@netapp.com>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
69 lines
2.4 KiB
C
69 lines
2.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (c) 2014 Anna Schumaker <Anna.Schumaker@Netapp.com>
|
|
*/
|
|
|
|
#ifndef __LINUX_FS_NFS_NFS4_2_H
|
|
#define __LINUX_FS_NFS_NFS4_2_H
|
|
|
|
#include <linux/xattr.h>
|
|
|
|
/*
|
|
* FIXME: four LAYOUTSTATS calls per compound at most! Do we need to support
|
|
* more? Need to consider not to pre-alloc too much for a compound.
|
|
*/
|
|
#define PNFS_LAYOUTSTATS_MAXDEV (4)
|
|
#define READ_PLUS_SCRATCH_SIZE (16)
|
|
|
|
/* nfs4.2proc.c */
|
|
#ifdef CONFIG_NFS_V4_2
|
|
int nfs42_proc_allocate(struct file *, loff_t, loff_t);
|
|
ssize_t nfs42_proc_copy(struct file *, loff_t, struct file *, loff_t, size_t,
|
|
struct nl4_server *, nfs4_stateid *, bool);
|
|
int nfs42_proc_deallocate(struct file *, loff_t, loff_t);
|
|
loff_t nfs42_proc_llseek(struct file *, loff_t, int);
|
|
int nfs42_proc_layoutstats_generic(struct nfs_server *,
|
|
struct nfs42_layoutstat_data *);
|
|
int nfs42_proc_clone(struct file *, struct file *, loff_t, loff_t, loff_t);
|
|
int nfs42_proc_layouterror(struct pnfs_layout_segment *lseg,
|
|
const struct nfs42_layout_error *errors,
|
|
size_t n);
|
|
int nfs42_proc_copy_notify(struct file *, struct file *,
|
|
struct nfs42_copy_notify_res *);
|
|
static inline bool nfs42_files_from_same_server(struct file *in,
|
|
struct file *out)
|
|
{
|
|
struct nfs_client *c_in = (NFS_SERVER(file_inode(in)))->nfs_client;
|
|
struct nfs_client *c_out = (NFS_SERVER(file_inode(out)))->nfs_client;
|
|
|
|
return nfs4_check_serverowner_major_id(c_in->cl_serverowner,
|
|
c_out->cl_serverowner);
|
|
}
|
|
|
|
ssize_t nfs42_proc_getxattr(struct inode *inode, const char *name,
|
|
void *buf, size_t buflen);
|
|
int nfs42_proc_setxattr(struct inode *inode, const char *name,
|
|
const void *buf, size_t buflen, int flags);
|
|
ssize_t nfs42_proc_listxattrs(struct inode *inode, void *buf,
|
|
size_t buflen, u64 *cookiep, bool *eofp);
|
|
int nfs42_proc_removexattr(struct inode *inode, const char *name);
|
|
|
|
/*
|
|
* Maximum XDR buffer size needed for a listxattr buffer of buflen size.
|
|
*
|
|
* The upper boundary is a buffer with all 1-byte sized attribute names.
|
|
* They would be 7 bytes long in the eventual buffer ("user.x\0"), and
|
|
* 8 bytes long XDR-encoded.
|
|
*
|
|
* Include the trailing eof word as well and make the result a multiple
|
|
* of 4 bytes.
|
|
*/
|
|
static inline u32 nfs42_listxattr_xdrsize(u32 buflen)
|
|
{
|
|
u32 size = 8 * buflen / (XATTR_USER_PREFIX_LEN + 2) + 4;
|
|
|
|
return (size + 3) & ~3;
|
|
}
|
|
#endif /* CONFIG_NFS_V4_2 */
|
|
#endif /* __LINUX_FS_NFS_NFS4_2_H */
|