2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* Server-side XDR for NFSv4
|
|
|
|
*
|
|
|
|
* Copyright (c) 2002 The Regents of the University of Michigan.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Kendrick Smith <kmsmith@umich.edu>
|
|
|
|
* Andy Adamson <andros@umich.edu>
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. Neither the name of the University nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived
|
|
|
|
* from this software without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
|
|
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
|
|
|
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
|
|
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
|
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
2015-06-18 22:45:01 +08:00
|
|
|
#include <linux/file.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/namei.h>
|
2009-12-04 02:29:12 +08:00
|
|
|
#include <linux/statfs.h>
|
2009-04-03 13:28:01 +08:00
|
|
|
#include <linux/utsname.h>
|
2011-07-13 22:50:48 +08:00
|
|
|
#include <linux/pagemap.h>
|
2007-07-17 19:04:51 +08:00
|
|
|
#include <linux/sunrpc/svcauth_gss.h>
|
2019-09-14 02:00:57 +08:00
|
|
|
#include <linux/sunrpc/addr.h>
|
2020-06-24 06:39:26 +08:00
|
|
|
#include <linux/xattr.h>
|
2022-09-03 06:18:16 +08:00
|
|
|
#include <linux/vmalloc.h>
|
|
|
|
|
2020-06-24 06:39:26 +08:00
|
|
|
#include <uapi/linux/xattr.h>
|
2009-12-04 02:30:56 +08:00
|
|
|
|
2011-01-05 06:37:15 +08:00
|
|
|
#include "idmap.h"
|
|
|
|
#include "acl.h"
|
2009-12-04 02:30:56 +08:00
|
|
|
#include "xdr4.h"
|
2009-11-05 07:12:35 +08:00
|
|
|
#include "vfs.h"
|
2011-07-13 22:50:48 +08:00
|
|
|
#include "state.h"
|
2011-01-25 01:11:02 +08:00
|
|
|
#include "cache.h"
|
2012-11-27 19:11:44 +08:00
|
|
|
#include "netns.h"
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#include "pnfs.h"
|
2019-08-19 02:18:54 +08:00
|
|
|
#include "filecache.h"
|
2011-01-05 06:37:15 +08:00
|
|
|
|
2020-11-22 00:36:42 +08:00
|
|
|
#include "trace.h"
|
|
|
|
|
2013-05-03 01:19:10 +08:00
|
|
|
#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
|
|
|
|
#include <linux/security.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#define NFSDDBG_FACILITY NFSDDBG_XDR
|
|
|
|
|
2017-01-12 09:40:36 +08:00
|
|
|
const u32 nfsd_suppattrs[3][3] = {
|
2016-10-19 02:18:40 +08:00
|
|
|
{NFSD4_SUPPORTED_ATTRS_WORD0,
|
|
|
|
NFSD4_SUPPORTED_ATTRS_WORD1,
|
|
|
|
NFSD4_SUPPORTED_ATTRS_WORD2},
|
|
|
|
|
|
|
|
{NFSD4_1_SUPPORTED_ATTRS_WORD0,
|
|
|
|
NFSD4_1_SUPPORTED_ATTRS_WORD1,
|
|
|
|
NFSD4_1_SUPPORTED_ATTRS_WORD2},
|
|
|
|
|
|
|
|
{NFSD4_1_SUPPORTED_ATTRS_WORD0,
|
|
|
|
NFSD4_1_SUPPORTED_ATTRS_WORD1,
|
|
|
|
NFSD4_2_SUPPORTED_ATTRS_WORD2},
|
|
|
|
};
|
|
|
|
|
2006-10-04 17:16:20 +08:00
|
|
|
/*
|
|
|
|
* As per referral draft, the fsid for a referral MUST be different from the fsid of the containing
|
|
|
|
* directory in order to indicate to the client that a filesystem boundary is present
|
|
|
|
* We use a fixed fsid for a referral
|
|
|
|
*/
|
|
|
|
#define NFS4_REFERRAL_FSID_MAJOR 0x8000000ULL
|
|
|
|
#define NFS4_REFERRAL_FSID_MINOR 0x8000000ULL
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
2012-11-26 05:31:00 +08:00
|
|
|
check_filename(char *str, int len)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (len == 0)
|
|
|
|
return nfserr_inval;
|
2020-11-04 02:24:10 +08:00
|
|
|
if (len > NFS4_MAXNAMLEN)
|
|
|
|
return nfserr_nametoolong;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (isdotent(str, len))
|
2012-11-26 05:31:00 +08:00
|
|
|
return nfserr_badname;
|
2005-04-17 06:20:36 +08:00
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
if (str[i] == '/')
|
2012-11-26 05:31:00 +08:00
|
|
|
return nfserr_badname;
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-04-03 13:28:50 +08:00
|
|
|
static int zero_clientid(clientid_t *clid)
|
|
|
|
{
|
|
|
|
return (clid->cl_boot == 0) && (clid->cl_id == 0);
|
|
|
|
}
|
|
|
|
|
2013-11-20 16:24:11 +08:00
|
|
|
/**
|
2014-06-25 05:43:45 +08:00
|
|
|
* svcxdr_tmpalloc - allocate memory to be freed after compound processing
|
2014-06-25 04:51:12 +08:00
|
|
|
* @argp: NFSv4 compound argument structure
|
2019-08-19 02:18:59 +08:00
|
|
|
* @len: length of buffer to allocate
|
2013-11-20 16:24:11 +08:00
|
|
|
*
|
2019-08-19 02:18:59 +08:00
|
|
|
* Allocates a buffer of size @len to be freed when processing the compound
|
|
|
|
* operation described in @argp finishes.
|
2013-11-20 16:24:11 +08:00
|
|
|
*/
|
2014-06-25 05:43:45 +08:00
|
|
|
static void *
|
|
|
|
svcxdr_tmpalloc(struct nfsd4_compoundargs *argp, u32 len)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2014-06-25 05:43:45 +08:00
|
|
|
struct svcxdr_tmpbuf *tb;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-06-25 05:43:45 +08:00
|
|
|
tb = kmalloc(sizeof(*tb) + len, GFP_KERNEL);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!tb)
|
2014-06-25 05:43:45 +08:00
|
|
|
return NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
tb->next = argp->to_free;
|
|
|
|
argp->to_free = tb;
|
2014-06-25 05:43:45 +08:00
|
|
|
return tb->buf;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2014-06-25 05:06:51 +08:00
|
|
|
/*
|
|
|
|
* For xdr strings that need to be passed to other kernel api's
|
|
|
|
* as null-terminated strings.
|
|
|
|
*
|
|
|
|
* Note null-terminating in place usually isn't safe since the
|
|
|
|
* buffer might end on a page boundary.
|
|
|
|
*/
|
|
|
|
static char *
|
|
|
|
svcxdr_dupstr(struct nfsd4_compoundargs *argp, void *buf, u32 len)
|
|
|
|
{
|
2014-06-25 05:43:45 +08:00
|
|
|
char *p = svcxdr_tmpalloc(argp, len + 1);
|
2014-06-25 05:06:51 +08:00
|
|
|
|
|
|
|
if (!p)
|
|
|
|
return NULL;
|
|
|
|
memcpy(p, buf, len);
|
|
|
|
p[len] = '\0';
|
|
|
|
return p;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2020-12-19 01:28:58 +08:00
|
|
|
static void *
|
|
|
|
svcxdr_savemem(struct nfsd4_compoundargs *argp, __be32 *p, u32 len)
|
|
|
|
{
|
|
|
|
__be32 *tmp;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The location of the decoded data item is stable,
|
|
|
|
* so @p is OK to use. This is the common case.
|
|
|
|
*/
|
|
|
|
if (p != argp->xdr->scratch.iov_base)
|
|
|
|
return p;
|
|
|
|
|
|
|
|
tmp = svcxdr_tmpalloc(argp, len);
|
|
|
|
if (!tmp)
|
|
|
|
return NULL;
|
|
|
|
memcpy(tmp, p, len);
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
2020-11-05 00:41:55 +08:00
|
|
|
/*
|
|
|
|
* NFSv4 basic data type decoders
|
|
|
|
*/
|
|
|
|
|
2020-11-04 02:09:34 +08:00
|
|
|
/*
|
|
|
|
* This helper handles variable-length opaques which belong to protocol
|
|
|
|
* elements that this implementation does not support.
|
|
|
|
*/
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_ignored_string(struct nfsd4_compoundargs *argp, u32 maxlen)
|
|
|
|
{
|
|
|
|
u32 len;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &len) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (maxlen && len > maxlen)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (!xdr_inline_decode(argp->xdr, len))
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-05 00:41:55 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_opaque(struct nfsd4_compoundargs *argp, struct xdr_netobj *o)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
u32 len;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &len) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (len == 0 || len > NFS4_OPAQUE_LIMIT)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, len);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
2020-12-19 01:28:58 +08:00
|
|
|
o->data = svcxdr_savemem(argp, p, len);
|
2020-11-05 00:41:55 +08:00
|
|
|
if (!o->data)
|
|
|
|
return nfserr_jukebox;
|
|
|
|
o->len = len;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-04 02:24:10 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_component4(struct nfsd4_compoundargs *argp, char **namp, u32 *lenp)
|
|
|
|
{
|
|
|
|
__be32 *p, status;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, lenp) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, *lenp);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = check_filename((char *)p, *lenp);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2020-12-19 01:28:58 +08:00
|
|
|
*namp = svcxdr_savemem(argp, p, *lenp);
|
2020-11-04 02:24:10 +08:00
|
|
|
if (!*namp)
|
|
|
|
return nfserr_jukebox;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-20 03:01:08 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_nfstime4(struct nfsd4_compoundargs *argp, struct timespec64 *tv)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(argp->xdr, XDR_UNIT * 3);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_decode_hyper(p, &tv->tv_sec);
|
|
|
|
tv->tv_nsec = be32_to_cpup(p++);
|
|
|
|
if (tv->tv_nsec >= (u32)1000000000)
|
|
|
|
return nfserr_inval;
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-17 06:34:01 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_verifier4(struct nfsd4_compoundargs *argp, nfs4_verifier *verf)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(argp->xdr, NFS4_VERIFIER_SIZE);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
memcpy(verf->data, p, sizeof(verf->data));
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-04 01:56:05 +08:00
|
|
|
/**
|
|
|
|
* nfsd4_decode_bitmap4 - Decode an NFSv4 bitmap4
|
|
|
|
* @argp: NFSv4 compound argument structure
|
|
|
|
* @bmval: pointer to an array of u32's to decode into
|
|
|
|
* @bmlen: size of the @bmval array
|
|
|
|
*
|
|
|
|
* The server needs to return nfs_ok rather than nfserr_bad_xdr when
|
|
|
|
* encountering bitmaps containing bits it does not recognize. This
|
|
|
|
* includes bits in bitmap words past WORDn, where WORDn is the last
|
|
|
|
* bitmap WORD the implementation currently supports. Thus we are
|
|
|
|
* careful here to simply ignore bits in bitmap words that this
|
|
|
|
* implementation has yet to support explicitly.
|
|
|
|
*
|
|
|
|
* Return values:
|
|
|
|
* %nfs_ok: @bmval populated successfully
|
|
|
|
* %nfserr_bad_xdr: the encoded bitmap was invalid
|
|
|
|
*/
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_bitmap4(struct nfsd4_compoundargs *argp, u32 *bmval, u32 bmlen)
|
|
|
|
{
|
2021-12-13 23:20:45 +08:00
|
|
|
ssize_t status;
|
2020-11-04 01:56:05 +08:00
|
|
|
|
2021-12-13 23:20:45 +08:00
|
|
|
status = xdr_stream_decode_uint32_array(argp->xdr, bmval, bmlen);
|
|
|
|
return status == -EBADMSG ? nfserr_bad_xdr : nfs_ok;
|
2020-11-04 01:56:05 +08:00
|
|
|
}
|
|
|
|
|
2020-11-20 02:02:54 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_nfsace4(struct nfsd4_compoundargs *argp, struct nfs4_ace *ace)
|
|
|
|
{
|
|
|
|
__be32 *p, status;
|
|
|
|
u32 length;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &ace->type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &ace->flag) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &ace->access_mask) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, length);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
ace->whotype = nfs4_acl_get_whotype((char *)p, length);
|
|
|
|
if (ace->whotype != NFS4_ACL_WHO_NAMED)
|
|
|
|
status = nfs_ok;
|
|
|
|
else if (ace->flag & NFS4_ACE_IDENTIFIER_GROUP)
|
|
|
|
status = nfsd_map_name_to_gid(argp->rqstp,
|
|
|
|
(char *)p, length, &ace->who_gid);
|
|
|
|
else
|
|
|
|
status = nfsd_map_name_to_uid(argp->rqstp,
|
|
|
|
(char *)p, length, &ace->who_uid);
|
|
|
|
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* A counted array of nfsace4's */
|
|
|
|
static noinline __be32
|
|
|
|
nfsd4_decode_acl(struct nfsd4_compoundargs *argp, struct nfs4_acl **acl)
|
|
|
|
{
|
|
|
|
struct nfs4_ace *ace;
|
|
|
|
__be32 status;
|
|
|
|
u32 count;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &count) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
if (count > xdr_stream_remaining(argp->xdr) / 20)
|
|
|
|
/*
|
|
|
|
* Even with 4-byte names there wouldn't be
|
|
|
|
* space for that many aces; something fishy is
|
|
|
|
* going on:
|
|
|
|
*/
|
|
|
|
return nfserr_fbig;
|
|
|
|
|
|
|
|
*acl = svcxdr_tmpalloc(argp, nfs4_acl_bytes(count));
|
|
|
|
if (*acl == NULL)
|
|
|
|
return nfserr_jukebox;
|
|
|
|
|
|
|
|
(*acl)->naces = count;
|
|
|
|
for (ace = (*acl)->aces; ace < (*acl)->aces + count; ace++) {
|
|
|
|
status = nfsd4_decode_nfsace4(argp, ace);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-20 03:05:51 +08:00
|
|
|
static noinline __be32
|
|
|
|
nfsd4_decode_security_label(struct nfsd4_compoundargs *argp,
|
|
|
|
struct xdr_netobj *label)
|
|
|
|
{
|
|
|
|
u32 lfs, pi, length;
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lfs) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &pi) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (length > NFS4_MAXLABELLEN)
|
|
|
|
return nfserr_badlabel;
|
|
|
|
p = xdr_inline_decode(argp->xdr, length);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
label->len = length;
|
|
|
|
label->data = svcxdr_dupstr(argp, p, length);
|
|
|
|
if (!label->data)
|
|
|
|
return nfserr_jukebox;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
2020-11-04 01:56:05 +08:00
|
|
|
nfsd4_decode_fattr4(struct nfsd4_compoundargs *argp, u32 *bmval, u32 bmlen,
|
|
|
|
struct iattr *iattr, struct nfs4_acl **acl,
|
|
|
|
struct xdr_netobj *label, int *umask)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2020-11-20 02:09:13 +08:00
|
|
|
unsigned int starting_pos;
|
|
|
|
u32 attrlist4_count;
|
2020-11-04 01:56:05 +08:00
|
|
|
__be32 *p, status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
iattr->ia_valid = 0;
|
2020-11-04 01:56:05 +08:00
|
|
|
status = nfsd4_decode_bitmap4(argp, bmval, bmlen);
|
|
|
|
if (status)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2016-06-11 04:56:05 +08:00
|
|
|
if (bmval[0] & ~NFSD_WRITEABLE_ATTRS_WORD0
|
|
|
|
|| bmval[1] & ~NFSD_WRITEABLE_ATTRS_WORD1
|
|
|
|
|| bmval[2] & ~NFSD_WRITEABLE_ATTRS_WORD2) {
|
|
|
|
if (nfsd_attrs_supported(argp->minorversion, bmval))
|
|
|
|
return nfserr_inval;
|
|
|
|
return nfserr_attrnotsupp;
|
|
|
|
}
|
|
|
|
|
2020-11-20 02:09:13 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &attrlist4_count) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
starting_pos = xdr_stream_pos(argp->xdr);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (bmval[0] & FATTR4_WORD0_SIZE) {
|
2020-11-20 02:47:16 +08:00
|
|
|
u64 size;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &size) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
iattr->ia_size = size;
|
2005-04-17 06:20:36 +08:00
|
|
|
iattr->ia_valid |= ATTR_SIZE;
|
|
|
|
}
|
|
|
|
if (bmval[0] & FATTR4_WORD0_ACL) {
|
2020-11-20 02:02:54 +08:00
|
|
|
status = nfsd4_decode_acl(argp, acl);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else
|
|
|
|
*acl = NULL;
|
|
|
|
if (bmval[1] & FATTR4_WORD1_MODE) {
|
2020-11-20 02:54:26 +08:00
|
|
|
u32 mode;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &mode) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
iattr->ia_mode = mode;
|
2005-04-17 06:20:36 +08:00
|
|
|
iattr->ia_mode &= (S_IFMT | S_IALLUGO);
|
|
|
|
iattr->ia_valid |= ATTR_MODE;
|
|
|
|
}
|
|
|
|
if (bmval[1] & FATTR4_WORD1_OWNER) {
|
2020-11-20 02:56:42 +08:00
|
|
|
u32 length;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, length);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd_map_name_to_uid(argp->rqstp, (char *)p, length,
|
|
|
|
&iattr->ia_uid);
|
|
|
|
if (status)
|
2011-02-16 10:08:35 +08:00
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
iattr->ia_valid |= ATTR_UID;
|
|
|
|
}
|
|
|
|
if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) {
|
2020-11-20 02:58:18 +08:00
|
|
|
u32 length;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, length);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd_map_name_to_gid(argp->rqstp, (char *)p, length,
|
|
|
|
&iattr->ia_gid);
|
|
|
|
if (status)
|
2011-02-16 10:08:35 +08:00
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
iattr->ia_valid |= ATTR_GID;
|
|
|
|
}
|
|
|
|
if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) {
|
2020-11-20 03:01:08 +08:00
|
|
|
u32 set_it;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &set_it) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
switch (set_it) {
|
2005-04-17 06:20:36 +08:00
|
|
|
case NFS4_SET_TO_CLIENT_TIME:
|
2020-11-20 03:01:08 +08:00
|
|
|
status = nfsd4_decode_nfstime4(argp, &iattr->ia_atime);
|
2015-01-22 19:09:50 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
iattr->ia_valid |= (ATTR_ATIME | ATTR_ATIME_SET);
|
|
|
|
break;
|
|
|
|
case NFS4_SET_TO_SERVER_TIME:
|
|
|
|
iattr->ia_valid |= ATTR_ATIME;
|
|
|
|
break;
|
|
|
|
default:
|
2020-11-20 03:01:08 +08:00
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
2022-07-11 02:46:04 +08:00
|
|
|
if (bmval[1] & FATTR4_WORD1_TIME_CREATE) {
|
|
|
|
struct timespec64 ts;
|
|
|
|
|
|
|
|
/* No Linux filesystem supports setting this attribute. */
|
|
|
|
bmval[1] &= ~FATTR4_WORD1_TIME_CREATE;
|
|
|
|
status = nfsd4_decode_nfstime4(argp, &ts);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
if (bmval[1] & FATTR4_WORD1_TIME_MODIFY_SET) {
|
2020-11-20 03:01:08 +08:00
|
|
|
u32 set_it;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &set_it) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
switch (set_it) {
|
2005-04-17 06:20:36 +08:00
|
|
|
case NFS4_SET_TO_CLIENT_TIME:
|
2020-11-20 03:01:08 +08:00
|
|
|
status = nfsd4_decode_nfstime4(argp, &iattr->ia_mtime);
|
2015-01-22 19:09:50 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
iattr->ia_valid |= (ATTR_MTIME | ATTR_MTIME_SET);
|
|
|
|
break;
|
|
|
|
case NFS4_SET_TO_SERVER_TIME:
|
|
|
|
iattr->ia_valid |= ATTR_MTIME;
|
|
|
|
break;
|
|
|
|
default:
|
2020-11-20 03:01:08 +08:00
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
2013-05-03 01:19:10 +08:00
|
|
|
label->len = 0;
|
2018-01-23 05:09:12 +08:00
|
|
|
if (IS_ENABLED(CONFIG_NFSD_V4_SECURITY_LABEL) &&
|
|
|
|
bmval[2] & FATTR4_WORD2_SECURITY_LABEL) {
|
2020-11-20 03:05:51 +08:00
|
|
|
status = nfsd4_decode_security_label(argp, label);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2013-05-03 01:19:10 +08:00
|
|
|
}
|
2016-01-13 03:24:14 +08:00
|
|
|
if (bmval[2] & FATTR4_WORD2_MODE_UMASK) {
|
2020-11-20 03:07:43 +08:00
|
|
|
u32 mode, mask;
|
|
|
|
|
2016-01-13 03:24:14 +08:00
|
|
|
if (!umask)
|
2020-11-20 03:07:43 +08:00
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &mode) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
iattr->ia_mode = mode & (S_IFMT | S_IALLUGO);
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &mask) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
*umask = mask & S_IRWXUGO;
|
2016-01-13 03:24:14 +08:00
|
|
|
iattr->ia_valid |= ATTR_MODE;
|
|
|
|
}
|
2020-11-20 02:09:13 +08:00
|
|
|
|
|
|
|
/* request sanity: did attrlist4 contain the expected number of words? */
|
|
|
|
if (attrlist4_count != xdr_stream_pos(argp->xdr) - starting_pos)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 01:56:05 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2020-11-04 02:18:23 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_stateid4(struct nfsd4_compoundargs *argp, stateid_t *sid)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(argp->xdr, NFS4_STATEID_SIZE);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
sid->si_generation = be32_to_cpup(p++);
|
|
|
|
memcpy(&sid->si_opaque, p, sizeof(sid->si_opaque));
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-17 06:25:02 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_clientid4(struct nfsd4_compoundargs *argp, clientid_t *clientid)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(argp->xdr, sizeof(__be64));
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
memcpy(clientid, p, sizeof(*clientid));
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_state_owner4(struct nfsd4_compoundargs *argp,
|
|
|
|
clientid_t *clientid, struct xdr_netobj *owner)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
status = nfsd4_decode_clientid4(argp, clientid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
return nfsd4_decode_opaque(argp, owner);
|
|
|
|
}
|
|
|
|
|
2020-11-04 04:03:50 +08:00
|
|
|
#ifdef CONFIG_NFSD_PNFS
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_deviceid4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_deviceid *devid)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(argp->xdr, NFS4_DEVICEID4_SIZE);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
memcpy(devid, p, sizeof(*devid));
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
2020-11-04 23:40:07 +08:00
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_layoutupdate4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_layoutcommit *lcp)
|
|
|
|
{
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lcp->lc_layout_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (lcp->lc_layout_type < LAYOUT_NFSV4_1_FILES)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (lcp->lc_layout_type >= LAYOUT_TYPE_MAX)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lcp->lc_up_len) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (lcp->lc_up_len > 0) {
|
|
|
|
lcp->lc_up_layout = xdr_inline_decode(argp->xdr, lcp->lc_up_len);
|
|
|
|
if (!lcp->lc_up_layout)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-04 23:42:25 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_layoutreturn4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_layoutreturn *lrp)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lrp->lr_return_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
switch (lrp->lr_return_type) {
|
|
|
|
case RETURN_FILE:
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lrp->lr_seg.offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lrp->lr_seg.length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_stateid4(argp, &lrp->lr_sid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lrp->lrf_body_len) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (lrp->lrf_body_len > 0) {
|
|
|
|
lrp->lrf_body = xdr_inline_decode(argp->xdr, lrp->lrf_body_len);
|
|
|
|
if (!lrp->lrf_body)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case RETURN_FSID:
|
|
|
|
case RETURN_ALL:
|
|
|
|
lrp->lr_seg.offset = 0;
|
|
|
|
lrp->lr_seg.length = NFS4_MAX_UINT64;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-04 04:03:50 +08:00
|
|
|
#endif /* CONFIG_NFSD_PNFS */
|
|
|
|
|
2020-11-04 02:16:23 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_sessionid4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfs4_sessionid *sessionid)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(argp->xdr, NFS4_MAX_SESSIONID_LEN);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
memcpy(sessionid->data, p, sizeof(sessionid->data));
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-04 02:09:34 +08:00
|
|
|
/* Defined in Appendix A of RFC 5531 */
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_authsys_parms(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_cb_sec *cbs)
|
2012-03-28 02:50:26 +08:00
|
|
|
{
|
2020-11-04 02:09:34 +08:00
|
|
|
u32 stamp, gidcount, uid, gid;
|
|
|
|
__be32 *p, status;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &stamp) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
/* machine name */
|
|
|
|
status = nfsd4_decode_ignored_string(argp, 255);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &uid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &gid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &gidcount) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (gidcount > 16)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, gidcount << 2);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (cbs->flavor == (u32)(-1)) {
|
|
|
|
struct user_namespace *userns = nfsd_user_namespace(argp->rqstp);
|
|
|
|
|
|
|
|
kuid_t kuid = make_kuid(userns, uid);
|
|
|
|
kgid_t kgid = make_kgid(userns, gid);
|
|
|
|
if (uid_valid(kuid) && gid_valid(kgid)) {
|
|
|
|
cbs->uid = kuid;
|
|
|
|
cbs->gid = kgid;
|
|
|
|
cbs->flavor = RPC_AUTH_UNIX;
|
|
|
|
} else {
|
|
|
|
dprintk("RPC_AUTH_UNIX with invalid uid or gid, ignoring!\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_gss_cb_handles4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_cb_sec *cbs)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
u32 service;
|
|
|
|
|
|
|
|
dprintk("RPC_AUTH_GSS callback secflavor not supported!\n");
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &service) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (service < RPC_GSS_SVC_NONE || service > RPC_GSS_SVC_PRIVACY)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
/* gcbp_handle_from_server */
|
|
|
|
status = nfsd4_decode_ignored_string(argp, 0);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
/* gcbp_handle_from_client */
|
|
|
|
status = nfsd4_decode_ignored_string(argp, 0);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* a counted array of callback_sec_parms4 items */
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_cb_sec(struct nfsd4_compoundargs *argp, struct nfsd4_cb_sec *cbs)
|
|
|
|
{
|
|
|
|
u32 i, secflavor, nr_secflavs;
|
|
|
|
__be32 status;
|
2012-03-28 02:50:26 +08:00
|
|
|
|
|
|
|
/* callback_sec_params4 */
|
2020-11-04 02:09:34 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &nr_secflavs) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2013-05-18 04:25:32 +08:00
|
|
|
if (nr_secflavs)
|
|
|
|
cbs->flavor = (u32)(-1);
|
|
|
|
else
|
|
|
|
/* Is this legal? Be generous, take it to mean AUTH_NONE: */
|
|
|
|
cbs->flavor = 0;
|
2020-11-04 02:09:34 +08:00
|
|
|
|
2012-03-28 02:50:26 +08:00
|
|
|
for (i = 0; i < nr_secflavs; ++i) {
|
2020-11-04 02:09:34 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &secflavor) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
switch (secflavor) {
|
2012-03-28 02:50:26 +08:00
|
|
|
case RPC_AUTH_NULL:
|
2020-11-04 02:09:34 +08:00
|
|
|
/* void */
|
2012-11-06 05:01:48 +08:00
|
|
|
if (cbs->flavor == (u32)(-1))
|
|
|
|
cbs->flavor = RPC_AUTH_NULL;
|
2012-03-28 02:50:26 +08:00
|
|
|
break;
|
|
|
|
case RPC_AUTH_UNIX:
|
2020-11-04 02:09:34 +08:00
|
|
|
status = nfsd4_decode_authsys_parms(argp, cbs);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2012-03-28 02:50:26 +08:00
|
|
|
break;
|
|
|
|
case RPC_AUTH_GSS:
|
2020-11-04 02:09:34 +08:00
|
|
|
status = nfsd4_decode_gss_cb_handles4(argp, cbs);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2012-03-28 02:50:26 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return nfserr_inval;
|
|
|
|
}
|
|
|
|
}
|
2020-11-04 02:09:34 +08:00
|
|
|
|
|
|
|
return nfs_ok;
|
2012-03-28 02:50:26 +08:00
|
|
|
}
|
|
|
|
|
2020-11-04 02:09:34 +08:00
|
|
|
|
2020-11-04 02:12:27 +08:00
|
|
|
/*
|
|
|
|
* NFSv4 operation argument decoders
|
|
|
|
*/
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_access(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-11-04 02:12:27 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_access *access = &u->access;
|
2020-11-04 02:12:27 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &access->ac_req_access) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_close(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_close *close = &u->close;
|
2020-11-04 02:18:23 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &close->cl_seqid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
return nfsd4_decode_stateid4(argp, &close->cl_stateid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_commit(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_commit *commit = &u->commit;
|
2020-11-04 02:19:51 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &commit->co_offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &commit->co_count) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(&commit->co_verf, 0, sizeof(commit->co_verf));
|
2020-11-04 02:19:51 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_create(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_create *create = &u->create;
|
2020-11-04 02:24:10 +08:00
|
|
|
__be32 *p, status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(create, 0, sizeof(*create));
|
2020-11-04 02:24:10 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &create->cr_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
switch (create->cr_type) {
|
|
|
|
case NF4LNK:
|
2020-11-04 02:24:10 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &create->cr_datalen) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, create->cr_datalen);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
2014-06-25 05:06:51 +08:00
|
|
|
create->cr_data = svcxdr_dupstr(argp, p, create->cr_datalen);
|
2014-06-25 03:06:41 +08:00
|
|
|
if (!create->cr_data)
|
2014-06-20 04:44:48 +08:00
|
|
|
return nfserr_jukebox;
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
case NF4BLK:
|
|
|
|
case NF4CHR:
|
2020-11-04 02:24:10 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &create->cr_specdata1) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &create->cr_specdata2) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
case NF4SOCK:
|
|
|
|
case NF4FIFO:
|
|
|
|
case NF4DIR:
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2020-11-04 02:24:10 +08:00
|
|
|
status = nfsd4_decode_component4(argp, &create->cr_name,
|
|
|
|
&create->cr_namelen);
|
|
|
|
if (status)
|
2005-04-17 06:20:36 +08:00
|
|
|
return status;
|
2020-11-04 01:56:05 +08:00
|
|
|
status = nfsd4_decode_fattr4(argp, create->cr_bmval,
|
|
|
|
ARRAY_SIZE(create->cr_bmval),
|
|
|
|
&create->cr_iattr, &create->cr_acl,
|
|
|
|
&create->cr_label, &create->cr_umask);
|
2009-04-03 13:29:05 +08:00
|
|
|
if (status)
|
2020-11-04 02:24:10 +08:00
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 02:24:10 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static inline __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_delegreturn(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_delegreturn *dr = &u->delegreturn;
|
2020-11-22 03:11:58 +08:00
|
|
|
return nfsd4_decode_stateid4(argp, &dr->dr_stateid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static inline __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_getattr(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_getattr *getattr = &u->getattr;
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(getattr, 0, sizeof(*getattr));
|
2020-11-20 03:40:20 +08:00
|
|
|
return nfsd4_decode_bitmap4(argp, getattr->ga_bmval,
|
|
|
|
ARRAY_SIZE(getattr->ga_bmval));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_link(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_link *link = &u->link;
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(link, 0, sizeof(*link));
|
2020-11-05 04:01:24 +08:00
|
|
|
return nfsd4_decode_component4(argp, &link->li_name, &link->li_namelen);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2020-11-17 06:16:52 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_open_to_lock_owner4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_lock *lock)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lock->lk_new_open_seqid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_stateid4(argp, &lock->lk_new_open_stateid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lock->lk_new_lock_seqid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
return nfsd4_decode_state_owner4(argp, &lock->lk_new_clientid,
|
|
|
|
&lock->lk_new_owner);
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_exist_lock_owner4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_lock *lock)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
status = nfsd4_decode_stateid4(argp, &lock->lk_old_lock_stateid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lock->lk_old_lock_seqid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_locker4(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock)
|
|
|
|
{
|
|
|
|
if (xdr_stream_decode_bool(argp->xdr, &lock->lk_is_new) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (lock->lk_is_new)
|
|
|
|
return nfsd4_decode_open_to_lock_owner4(argp, lock);
|
|
|
|
return nfsd4_decode_exist_lock_owner4(argp, lock);
|
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_lock(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_lock *lock = &u->lock;
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(lock, 0, sizeof(*lock));
|
2020-11-04 02:29:27 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lock->lk_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
if ((lock->lk_type < NFS4_READ_LT) || (lock->lk_type > NFS4_WRITEW_LT))
|
2020-11-04 02:29:27 +08:00
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_bool(argp->xdr, &lock->lk_reclaim) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lock->lk_offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lock->lk_length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
return nfsd4_decode_locker4(argp, lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_lockt(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_lockt *lockt = &u->lockt;
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(lockt, 0, sizeof(*lockt));
|
2020-11-04 02:31:44 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lockt->lt_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if ((lockt->lt_type < NFS4_READ_LT) || (lockt->lt_type > NFS4_WRITEW_LT))
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lockt->lt_offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lockt->lt_length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
return nfsd4_decode_state_owner4(argp, &lockt->lt_clientid,
|
|
|
|
&lockt->lt_owner);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_locku(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_locku *locku = &u->locku;
|
2020-11-04 02:33:28 +08:00
|
|
|
__be32 status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 02:33:28 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &locku->lu_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
if ((locku->lu_type < NFS4_READ_LT) || (locku->lu_type > NFS4_WRITEW_LT))
|
2020-11-04 02:33:28 +08:00
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &locku->lu_seqid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_stateid4(argp, &locku->lu_stateid);
|
2008-08-13 01:46:18 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 02:33:28 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &locku->lu_offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &locku->lu_length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 02:33:28 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_lookup(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_lookup *lookup = &u->lookup;
|
2020-11-05 04:02:40 +08:00
|
|
|
return nfsd4_decode_component4(argp, &lookup->lo_name, &lookup->lo_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2020-11-17 06:37:42 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_createhow4(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &open->op_createmode) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
switch (open->op_createmode) {
|
|
|
|
case NFS4_CREATE_UNCHECKED:
|
|
|
|
case NFS4_CREATE_GUARDED:
|
|
|
|
status = nfsd4_decode_fattr4(argp, open->op_bmval,
|
|
|
|
ARRAY_SIZE(open->op_bmval),
|
|
|
|
&open->op_iattr, &open->op_acl,
|
|
|
|
&open->op_label, &open->op_umask);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
break;
|
|
|
|
case NFS4_CREATE_EXCLUSIVE:
|
|
|
|
status = nfsd4_decode_verifier4(argp, &open->op_verf);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
break;
|
|
|
|
case NFS4_CREATE_EXCLUSIVE4_1:
|
|
|
|
if (argp->minorversion < 1)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_verifier4(argp, &open->op_verf);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
status = nfsd4_decode_fattr4(argp, open->op_bmval,
|
|
|
|
ARRAY_SIZE(open->op_bmval),
|
|
|
|
&open->op_iattr, &open->op_acl,
|
|
|
|
&open->op_label, &open->op_umask);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-17 06:41:21 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_openflag4(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &open->op_create) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
switch (open->op_create) {
|
|
|
|
case NFS4_OPEN_NOCREATE:
|
|
|
|
break;
|
|
|
|
case NFS4_OPEN_CREATE:
|
|
|
|
status = nfsd4_decode_createhow4(argp, open);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2012-02-17 02:57:09 +08:00
|
|
|
static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *share_access, u32 *deleg_want, u32 *deleg_when)
|
2011-10-11 02:37:13 +08:00
|
|
|
{
|
|
|
|
u32 w;
|
|
|
|
|
2020-11-17 06:54:48 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &w) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2012-02-17 02:57:09 +08:00
|
|
|
*share_access = w & NFS4_SHARE_ACCESS_MASK;
|
|
|
|
*deleg_want = w & NFS4_SHARE_WANT_MASK;
|
|
|
|
if (deleg_when)
|
|
|
|
*deleg_when = w & NFS4_SHARE_WHEN_MASK;
|
|
|
|
|
2011-10-11 02:37:13 +08:00
|
|
|
switch (w & NFS4_SHARE_ACCESS_MASK) {
|
|
|
|
case NFS4_SHARE_ACCESS_READ:
|
|
|
|
case NFS4_SHARE_ACCESS_WRITE:
|
|
|
|
case NFS4_SHARE_ACCESS_BOTH:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
2011-10-28 02:43:01 +08:00
|
|
|
w &= ~NFS4_SHARE_ACCESS_MASK;
|
2011-10-11 02:37:13 +08:00
|
|
|
if (!w)
|
|
|
|
return nfs_ok;
|
|
|
|
if (!argp->minorversion)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
switch (w & NFS4_SHARE_WANT_MASK) {
|
|
|
|
case NFS4_SHARE_WANT_NO_PREFERENCE:
|
|
|
|
case NFS4_SHARE_WANT_READ_DELEG:
|
|
|
|
case NFS4_SHARE_WANT_WRITE_DELEG:
|
|
|
|
case NFS4_SHARE_WANT_ANY_DELEG:
|
|
|
|
case NFS4_SHARE_WANT_NO_DELEG:
|
|
|
|
case NFS4_SHARE_WANT_CANCEL:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
2011-10-20 10:13:29 +08:00
|
|
|
w &= ~NFS4_SHARE_WANT_MASK;
|
2011-10-11 02:37:13 +08:00
|
|
|
if (!w)
|
|
|
|
return nfs_ok;
|
2012-02-17 02:57:09 +08:00
|
|
|
|
|
|
|
if (!deleg_when) /* open_downgrade */
|
|
|
|
return nfserr_inval;
|
2011-10-11 02:37:13 +08:00
|
|
|
switch (w) {
|
|
|
|
case NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL:
|
|
|
|
case NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED:
|
2011-10-20 10:13:13 +08:00
|
|
|
case (NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL |
|
|
|
|
NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED):
|
2011-10-11 02:37:13 +08:00
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32 nfsd4_decode_share_deny(struct nfsd4_compoundargs *argp, u32 *x)
|
|
|
|
{
|
2020-11-17 06:56:17 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, x) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
/* Note: unlike access bits, deny bits may be zero. */
|
2011-10-17 15:41:17 +08:00
|
|
|
if (*x & ~NFS4_SHARE_DENY_BOTH)
|
2011-10-11 02:37:13 +08:00
|
|
|
return nfserr_bad_xdr;
|
2020-11-17 06:56:17 +08:00
|
|
|
|
2011-10-11 02:37:13 +08:00
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-17 06:45:04 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_open_claim4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_open *open)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &open->op_claim_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
switch (open->op_claim_type) {
|
|
|
|
case NFS4_OPEN_CLAIM_NULL:
|
|
|
|
case NFS4_OPEN_CLAIM_DELEGATE_PREV:
|
|
|
|
status = nfsd4_decode_component4(argp, &open->op_fname,
|
|
|
|
&open->op_fnamelen);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
break;
|
|
|
|
case NFS4_OPEN_CLAIM_PREVIOUS:
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &open->op_delegate_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
break;
|
|
|
|
case NFS4_OPEN_CLAIM_DELEGATE_CUR:
|
|
|
|
status = nfsd4_decode_stateid4(argp, &open->op_delegate_stateid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
status = nfsd4_decode_component4(argp, &open->op_fname,
|
|
|
|
&open->op_fnamelen);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
break;
|
|
|
|
case NFS4_OPEN_CLAIM_FH:
|
|
|
|
case NFS4_OPEN_CLAIM_DELEG_PREV_FH:
|
|
|
|
if (argp->minorversion < 1)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
/* void */
|
|
|
|
break;
|
|
|
|
case NFS4_OPEN_CLAIM_DELEG_CUR_FH:
|
|
|
|
if (argp->minorversion < 1)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_stateid4(argp, &open->op_delegate_stateid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_open(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_open *open = &u->open;
|
2020-11-02 01:04:06 +08:00
|
|
|
__be32 status;
|
2012-02-17 02:57:09 +08:00
|
|
|
u32 dummy;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(open, 0, sizeof(*open));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-02 01:04:06 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &open->op_seqid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
/* deleg_want is ignored */
|
2012-02-17 02:57:09 +08:00
|
|
|
status = nfsd4_decode_share_access(argp, &open->op_share_access,
|
|
|
|
&open->op_deleg_want, &dummy);
|
2011-10-11 02:37:13 +08:00
|
|
|
if (status)
|
2020-11-02 01:04:06 +08:00
|
|
|
return status;
|
2011-10-11 02:37:13 +08:00
|
|
|
status = nfsd4_decode_share_deny(argp, &open->op_share_deny);
|
|
|
|
if (status)
|
2020-11-02 01:04:06 +08:00
|
|
|
return status;
|
|
|
|
status = nfsd4_decode_state_owner4(argp, &open->op_clientid,
|
|
|
|
&open->op_owner);
|
2011-10-11 03:07:40 +08:00
|
|
|
if (status)
|
2020-11-02 01:04:06 +08:00
|
|
|
return status;
|
2020-11-17 06:41:21 +08:00
|
|
|
status = nfsd4_decode_openflag4(argp, open);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-02 01:04:06 +08:00
|
|
|
return nfsd4_decode_open_claim4(argp, open);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_open_confirm(struct nfsd4_compoundargs *argp,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_open_confirm *open_conf = &u->open_confirm;
|
2020-11-04 03:18:57 +08:00
|
|
|
__be32 status;
|
2013-10-30 22:00:20 +08:00
|
|
|
|
|
|
|
if (argp->minorversion >= 1)
|
|
|
|
return nfserr_notsupp;
|
|
|
|
|
2020-11-04 03:18:57 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, &open_conf->oc_req_stateid);
|
2008-08-13 01:46:18 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 03:18:57 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &open_conf->oc_seqid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2013-10-30 22:00:20 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(&open_conf->oc_resp_stateid, 0,
|
|
|
|
sizeof(open_conf->oc_resp_stateid));
|
2020-11-04 03:18:57 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_open_downgrade(struct nfsd4_compoundargs *argp,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_open_downgrade *open_down = &u->open_downgrade;
|
2020-11-04 03:21:01 +08:00
|
|
|
__be32 status;
|
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(open_down, 0, sizeof(*open_down));
|
2020-11-04 03:21:01 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, &open_down->od_stateid);
|
2008-08-13 01:46:18 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 03:21:01 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &open_down->od_seqid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
/* deleg_want is ignored */
|
2012-02-17 02:57:09 +08:00
|
|
|
status = nfsd4_decode_share_access(argp, &open_down->od_share_access,
|
|
|
|
&open_down->od_deleg_want, NULL);
|
2011-10-11 02:37:13 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 03:21:01 +08:00
|
|
|
return nfsd4_decode_share_deny(argp, &open_down->od_share_deny);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_putfh(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_putfh *putfh = &u->putfh;
|
2020-11-04 03:23:02 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 03:23:02 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &putfh->pf_fhlen) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (putfh->pf_fhlen > NFS4_FHSIZE)
|
2020-11-04 03:23:02 +08:00
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, putfh->pf_fhlen);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
2020-12-19 01:28:58 +08:00
|
|
|
putfh->pf_fhval = svcxdr_savemem(argp, p, putfh->pf_fhlen);
|
2020-11-04 03:23:02 +08:00
|
|
|
if (!putfh->pf_fhval)
|
|
|
|
return nfserr_jukebox;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
putfh->no_verify = false;
|
2020-11-04 03:23:02 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2013-10-30 22:00:20 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_putpubfh(struct nfsd4_compoundargs *argp, union nfsd4_op_u *p)
|
2013-10-30 22:00:20 +08:00
|
|
|
{
|
|
|
|
if (argp->minorversion == 0)
|
|
|
|
return nfs_ok;
|
|
|
|
return nfserr_notsupp;
|
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_read(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_read *read = &u->read;
|
2020-11-04 03:28:24 +08:00
|
|
|
__be32 status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(read, 0, sizeof(*read));
|
2020-11-04 03:28:24 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, &read->rd_stateid);
|
2008-08-13 01:46:18 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 03:28:24 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &read->rd_offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &read->rd_length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 03:28:24 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_readdir(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_readdir *readdir = &u->readdir;
|
2020-11-04 03:30:59 +08:00
|
|
|
__be32 status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(readdir, 0, sizeof(*readdir));
|
2020-11-04 03:30:59 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &readdir->rd_cookie) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_verifier4(argp, &readdir->rd_verf);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &readdir->rd_dircount) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &readdir->rd_maxcount) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_uint32_array(argp->xdr, readdir->rd_bmval,
|
|
|
|
ARRAY_SIZE(readdir->rd_bmval)) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 03:30:59 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_remove(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_remove *remove = &u->remove;
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(&remove->rm_cinfo, 0, sizeof(remove->rm_cinfo));
|
2020-11-05 04:04:36 +08:00
|
|
|
return nfsd4_decode_component4(argp, &remove->rm_name, &remove->rm_namelen);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_rename(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_rename *rename = &u->rename;
|
2020-11-05 04:05:58 +08:00
|
|
|
__be32 status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(rename, 0, sizeof(*rename));
|
2020-11-05 04:05:58 +08:00
|
|
|
status = nfsd4_decode_component4(argp, &rename->rn_sname, &rename->rn_snamelen);
|
|
|
|
if (status)
|
2005-04-17 06:20:36 +08:00
|
|
|
return status;
|
2020-11-05 04:05:58 +08:00
|
|
|
return nfsd4_decode_component4(argp, &rename->rn_tname, &rename->rn_tnamelen);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_renew(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
clientid_t *clientid = &u->renew;
|
2020-11-05 04:08:50 +08:00
|
|
|
return nfsd4_decode_clientid4(argp, clientid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2007-07-17 19:04:51 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_secinfo(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2007-07-17 19:04:51 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_secinfo *secinfo = &u->secinfo;
|
2022-09-13 05:22:44 +08:00
|
|
|
secinfo->si_exp = NULL;
|
2020-11-05 04:09:42 +08:00
|
|
|
return nfsd4_decode_component4(argp, &secinfo->si_name, &secinfo->si_namelen);
|
2007-07-17 19:04:51 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_setattr(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_setattr *setattr = &u->setattr;
|
2008-08-13 01:46:18 +08:00
|
|
|
__be32 status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(setattr, 0, sizeof(*setattr));
|
2020-11-22 03:14:59 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, &setattr->sa_stateid);
|
2008-08-13 01:46:18 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 01:56:05 +08:00
|
|
|
return nfsd4_decode_fattr4(argp, setattr->sa_bmval,
|
|
|
|
ARRAY_SIZE(setattr->sa_bmval),
|
|
|
|
&setattr->sa_iattr, &setattr->sa_acl,
|
|
|
|
&setattr->sa_label, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_setclientid(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_setclientid *setclientid = &u->setclientid;
|
2020-11-04 03:35:02 +08:00
|
|
|
__be32 *p, status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(setclientid, 0, sizeof(*setclientid));
|
|
|
|
|
2013-10-30 22:00:20 +08:00
|
|
|
if (argp->minorversion >= 1)
|
|
|
|
return nfserr_notsupp;
|
|
|
|
|
2020-11-04 03:35:02 +08:00
|
|
|
status = nfsd4_decode_verifier4(argp, &setclientid->se_verf);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2011-10-11 03:07:40 +08:00
|
|
|
status = nfsd4_decode_opaque(argp, &setclientid->se_name);
|
|
|
|
if (status)
|
2020-11-04 03:35:02 +08:00
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &setclientid->se_callback_prog) < 0)
|
2011-10-11 03:07:40 +08:00
|
|
|
return nfserr_bad_xdr;
|
2020-11-04 03:35:02 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &setclientid->se_callback_netid_len) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, setclientid->se_callback_netid_len);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
2020-12-19 01:28:58 +08:00
|
|
|
setclientid->se_callback_netid_val = svcxdr_savemem(argp, p,
|
2020-11-04 03:35:02 +08:00
|
|
|
setclientid->se_callback_netid_len);
|
|
|
|
if (!setclientid->se_callback_netid_val)
|
|
|
|
return nfserr_jukebox;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 03:35:02 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &setclientid->se_callback_addr_len) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, setclientid->se_callback_addr_len);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
2020-12-19 01:28:58 +08:00
|
|
|
setclientid->se_callback_addr_val = svcxdr_savemem(argp, p,
|
2020-11-04 03:35:02 +08:00
|
|
|
setclientid->se_callback_addr_len);
|
|
|
|
if (!setclientid->se_callback_addr_val)
|
|
|
|
return nfserr_jukebox;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &setclientid->se_callback_ident) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 03:35:02 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_setclientid_confirm(struct nfsd4_compoundargs *argp,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_setclientid_confirm *scd_c = &u->setclientid_confirm;
|
2020-11-05 04:12:33 +08:00
|
|
|
__be32 status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-10-30 22:00:20 +08:00
|
|
|
if (argp->minorversion >= 1)
|
|
|
|
return nfserr_notsupp;
|
|
|
|
|
2020-11-05 04:12:33 +08:00
|
|
|
status = nfsd4_decode_clientid4(argp, &scd_c->sc_clientid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
return nfsd4_decode_verifier4(argp, &scd_c->sc_confirm);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Also used for NVERIFY */
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_verify(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_verify *verify = &u->verify;
|
2020-11-04 03:40:32 +08:00
|
|
|
__be32 *p, status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(verify, 0, sizeof(*verify));
|
|
|
|
|
2020-11-04 03:40:32 +08:00
|
|
|
status = nfsd4_decode_bitmap4(argp, verify->ve_bmval,
|
|
|
|
ARRAY_SIZE(verify->ve_bmval));
|
|
|
|
if (status)
|
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* For convenience's sake, we compare raw xdr'd attributes in
|
2012-12-01 06:24:18 +08:00
|
|
|
* nfsd4_proc_verify */
|
|
|
|
|
2020-11-04 03:40:32 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &verify->ve_attrlen) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, verify->ve_attrlen);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
2020-12-19 01:28:58 +08:00
|
|
|
verify->ve_attrval = svcxdr_savemem(argp, p, verify->ve_attrlen);
|
2020-11-04 03:40:32 +08:00
|
|
|
if (!verify->ve_attrval)
|
|
|
|
return nfserr_jukebox;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 03:40:32 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_write(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_write *write = &u->write;
|
2020-11-04 03:44:28 +08:00
|
|
|
__be32 status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-04 03:44:28 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, &write->wr_stateid);
|
2008-08-13 01:46:18 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 03:44:28 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &write->wr_offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &write->wr_stable_how) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2016-12-31 20:59:53 +08:00
|
|
|
if (write->wr_stable_how > NFS_FILE_SYNC)
|
2020-11-04 03:44:28 +08:00
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &write->wr_buflen) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2020-11-04 00:54:23 +08:00
|
|
|
if (!xdr_stream_subsegment(argp->xdr, &write->wr_payload, write->wr_buflen))
|
2020-11-04 03:44:28 +08:00
|
|
|
return nfserr_bad_xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
write->wr_bytes_written = 0;
|
|
|
|
write->wr_how_written = 0;
|
|
|
|
memset(&write->wr_verifier, 0, sizeof(write->wr_verifier));
|
2020-11-04 03:44:28 +08:00
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_release_lockowner(struct nfsd4_compoundargs *argp,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_release_lockowner *rlockowner = &u->release_lockowner;
|
2020-11-05 02:42:25 +08:00
|
|
|
__be32 status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-10-30 22:00:20 +08:00
|
|
|
if (argp->minorversion >= 1)
|
|
|
|
return nfserr_notsupp;
|
|
|
|
|
2020-11-05 02:42:25 +08:00
|
|
|
status = nfsd4_decode_state_owner4(argp, &rlockowner->rl_clientid,
|
|
|
|
&rlockowner->rl_owner);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-04-03 13:28:50 +08:00
|
|
|
if (argp->minorversion && !zero_clientid(&rlockowner->rl_clientid))
|
|
|
|
return nfserr_inval;
|
2020-11-05 02:42:25 +08:00
|
|
|
|
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
static __be32 nfsd4_decode_backchannel_ctl(struct nfsd4_compoundargs *argp,
|
|
|
|
union nfsd4_op_u *u)
|
2020-11-04 02:14:35 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_backchannel_ctl *bc = &u->backchannel_ctl;
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(bc, 0, sizeof(*bc));
|
2020-11-04 02:14:35 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &bc->bc_cb_program) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
return nfsd4_decode_cb_sec(argp, &bc->bc_cb_sec);
|
|
|
|
}
|
|
|
|
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
static __be32 nfsd4_decode_bind_conn_to_session(struct nfsd4_compoundargs *argp,
|
|
|
|
union nfsd4_op_u *u)
|
2020-11-04 02:16:23 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_bind_conn_to_session *bcts = &u->bind_conn_to_session;
|
2020-11-04 02:16:23 +08:00
|
|
|
u32 use_conn_in_rdma_mode;
|
|
|
|
__be32 status;
|
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(bcts, 0, sizeof(*bcts));
|
2020-11-04 02:16:23 +08:00
|
|
|
status = nfsd4_decode_sessionid4(argp, &bcts->sessionid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &bcts->dir) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &use_conn_in_rdma_mode) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-04 00:13:00 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_state_protect_ops(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_exchange_id *exid)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
status = nfsd4_decode_bitmap4(argp, exid->spo_must_enforce,
|
|
|
|
ARRAY_SIZE(exid->spo_must_enforce));
|
|
|
|
if (status)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_bitmap4(argp, exid->spo_must_allow,
|
|
|
|
ARRAY_SIZE(exid->spo_must_allow));
|
|
|
|
if (status)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-04 00:17:50 +08:00
|
|
|
/*
|
|
|
|
* This implementation currently does not support SP4_SSV.
|
|
|
|
* This decoder simply skips over these arguments.
|
|
|
|
*/
|
|
|
|
static noinline __be32
|
|
|
|
nfsd4_decode_ssv_sp_parms(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_exchange_id *exid)
|
|
|
|
{
|
|
|
|
u32 count, window, num_gss_handles;
|
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
/* ssp_ops */
|
|
|
|
status = nfsd4_decode_state_protect_ops(argp, exid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
|
|
|
|
/* ssp_hash_algs<> */
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &count) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
while (count--) {
|
|
|
|
status = nfsd4_decode_ignored_string(argp, 0);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ssp_encr_algs<> */
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &count) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
while (count--) {
|
|
|
|
status = nfsd4_decode_ignored_string(argp, 0);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &window) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &num_gss_handles) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2009-04-03 13:27:55 +08:00
|
|
|
static __be32
|
2020-11-03 04:19:12 +08:00
|
|
|
nfsd4_decode_state_protect4_a(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_exchange_id *exid)
|
2009-04-03 13:27:55 +08:00
|
|
|
{
|
2020-11-03 04:19:12 +08:00
|
|
|
__be32 status;
|
2009-04-03 13:28:01 +08:00
|
|
|
|
2020-11-03 04:19:12 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &exid->spa_how) < 0)
|
2011-10-11 03:07:40 +08:00
|
|
|
return nfserr_bad_xdr;
|
2009-04-03 13:28:01 +08:00
|
|
|
switch (exid->spa_how) {
|
|
|
|
case SP4_NONE:
|
|
|
|
break;
|
|
|
|
case SP4_MACH_CRED:
|
2020-11-04 00:13:00 +08:00
|
|
|
status = nfsd4_decode_state_protect_ops(argp, exid);
|
2016-06-16 00:52:09 +08:00
|
|
|
if (status)
|
2020-11-04 00:13:00 +08:00
|
|
|
return status;
|
2009-04-03 13:28:01 +08:00
|
|
|
break;
|
|
|
|
case SP4_SSV:
|
2020-11-04 00:17:50 +08:00
|
|
|
status = nfsd4_decode_ssv_sp_parms(argp, exid);
|
2020-11-04 00:13:00 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2009-04-03 13:28:01 +08:00
|
|
|
break;
|
|
|
|
default:
|
2020-11-03 04:19:12 +08:00
|
|
|
return nfserr_bad_xdr;
|
2009-04-03 13:28:01 +08:00
|
|
|
}
|
|
|
|
|
2020-11-03 04:19:12 +08:00
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-17 04:21:55 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_nfs_impl_id4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_exchange_id *exid)
|
|
|
|
{
|
|
|
|
__be32 status;
|
|
|
|
u32 count;
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &count) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
switch (count) {
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
/* Note that RFC 8881 places no length limit on
|
|
|
|
* nii_domain, but this implementation permits no
|
|
|
|
* more than NFS4_OPAQUE_LIMIT bytes */
|
|
|
|
status = nfsd4_decode_opaque(argp, &exid->nii_domain);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
/* Note that RFC 8881 places no length limit on
|
|
|
|
* nii_name, but this implementation permits no
|
|
|
|
* more than NFS4_OPAQUE_LIMIT bytes */
|
|
|
|
status = nfsd4_decode_opaque(argp, &exid->nii_name);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
status = nfsd4_decode_nfstime4(argp, &exid->nii_time);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-03 04:19:12 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-11-03 04:19:12 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_exchange_id *exid = &u->exchange_id;
|
2020-11-17 04:21:55 +08:00
|
|
|
__be32 status;
|
2020-11-03 04:19:12 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(exid, 0, sizeof(*exid));
|
2020-11-03 04:19:12 +08:00
|
|
|
status = nfsd4_decode_verifier4(argp, &exid->verifier);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
status = nfsd4_decode_opaque(argp, &exid->clname);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &exid->flags) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_state_protect4_a(argp, exid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-17 04:21:55 +08:00
|
|
|
return nfsd4_decode_nfs_impl_id4(argp, exid);
|
2009-04-03 13:27:55 +08:00
|
|
|
}
|
|
|
|
|
2020-11-17 04:35:05 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_channel_attrs4(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nfsd4_channel_attrs *ca)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(argp->xdr, XDR_UNIT * 7);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
/* headerpadsz is ignored */
|
|
|
|
p++;
|
|
|
|
ca->maxreq_sz = be32_to_cpup(p++);
|
|
|
|
ca->maxresp_sz = be32_to_cpup(p++);
|
|
|
|
ca->maxresp_cached = be32_to_cpup(p++);
|
|
|
|
ca->maxops = be32_to_cpup(p++);
|
|
|
|
ca->maxreqs = be32_to_cpup(p++);
|
|
|
|
ca->nr_rdma_attrs = be32_to_cpup(p);
|
|
|
|
switch (ca->nr_rdma_attrs) {
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &ca->rdma_attrs) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2009-04-03 13:27:55 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2009-04-03 13:27:55 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_create_session *sess = &u->create_session;
|
2020-11-04 03:52:44 +08:00
|
|
|
__be32 status;
|
2009-04-03 13:28:28 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(sess, 0, sizeof(*sess));
|
2020-11-04 03:52:44 +08:00
|
|
|
status = nfsd4_decode_clientid4(argp, &sess->clientid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &sess->seqid) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &sess->flags) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2020-11-17 04:35:05 +08:00
|
|
|
status = nfsd4_decode_channel_attrs4(argp, &sess->fore_channel);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
status = nfsd4_decode_channel_attrs4(argp, &sess->back_channel);
|
2020-11-04 03:52:44 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &sess->callback_prog) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2022-09-13 05:22:44 +08:00
|
|
|
return nfsd4_decode_cb_sec(argp, &sess->cb_sec);
|
2009-04-03 13:27:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_destroy_session(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2009-04-03 13:27:55 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_destroy_session *destroy_session = &u->destroy_session;
|
2020-11-05 02:50:55 +08:00
|
|
|
return nfsd4_decode_sessionid4(argp, &destroy_session->sessionid);
|
2009-04-03 13:27:55 +08:00
|
|
|
}
|
|
|
|
|
2011-07-13 23:04:21 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_free_stateid(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2011-07-13 23:04:21 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_free_stateid *free_stateid = &u->free_stateid;
|
2020-11-02 02:38:27 +08:00
|
|
|
return nfsd4_decode_stateid4(argp, &free_stateid->fr_stateid);
|
2011-07-13 23:04:21 +08:00
|
|
|
}
|
|
|
|
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#ifdef CONFIG_NFSD_PNFS
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_getdeviceinfo(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_getdeviceinfo *gdev = &u->getdeviceinfo;
|
2020-11-04 04:03:50 +08:00
|
|
|
__be32 status;
|
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(gdev, 0, sizeof(*gdev));
|
2020-11-04 04:03:50 +08:00
|
|
|
status = nfsd4_decode_deviceid4(argp, &gdev->gd_devid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &gdev->gd_layout_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &gdev->gd_maxcount) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_uint32_array(argp->xdr,
|
|
|
|
&gdev->gd_notify_types, 1) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
return nfs_ok;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
}
|
|
|
|
|
2020-11-04 23:40:07 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_layoutcommit(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-11-04 23:40:07 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_layoutcommit *lcp = &u->layoutcommit;
|
2020-11-04 23:40:07 +08:00
|
|
|
__be32 *p, status;
|
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(lcp, 0, sizeof(*lcp));
|
2020-11-04 23:40:07 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lcp->lc_seg.offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lcp->lc_seg.length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_bool(argp->xdr, &lcp->lc_reclaim) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_stateid4(argp, &lcp->lc_sid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lcp->lc_newoffset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (lcp->lc_newoffset) {
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lcp->lc_last_wr) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
} else
|
|
|
|
lcp->lc_last_wr = 0;
|
|
|
|
p = xdr_inline_decode(argp->xdr, XDR_UNIT);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_item_is_present(p)) {
|
|
|
|
status = nfsd4_decode_nfstime4(argp, &lcp->lc_mtime);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
} else {
|
|
|
|
lcp->lc_mtime.tv_nsec = UTIME_NOW;
|
|
|
|
}
|
|
|
|
return nfsd4_decode_layoutupdate4(argp, lcp);
|
|
|
|
}
|
|
|
|
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_layoutget(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_layoutget *lgp = &u->layoutget;
|
2020-11-04 04:06:04 +08:00
|
|
|
__be32 status;
|
2015-03-19 19:04:41 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(lgp, 0, sizeof(*lgp));
|
2020-11-04 04:06:04 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lgp->lg_signal) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lgp->lg_layout_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lgp->lg_seg.iomode) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lgp->lg_seg.offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lgp->lg_seg.length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &lgp->lg_minlength) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
status = nfsd4_decode_stateid4(argp, &lgp->lg_sid);
|
2015-03-19 19:04:41 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 04:06:04 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lgp->lg_maxcount) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2015-03-19 19:04:41 +08:00
|
|
|
|
2020-11-04 04:06:04 +08:00
|
|
|
return nfs_ok;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_layoutreturn(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_layoutreturn *lrp = &u->layoutreturn;
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(lrp, 0, sizeof(*lrp));
|
2020-11-04 23:42:25 +08:00
|
|
|
if (xdr_stream_decode_bool(argp->xdr, &lrp->lr_reclaim) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lrp->lr_layout_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &lrp->lr_seg.iomode) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
return nfsd4_decode_layoutreturn4(argp, lrp);
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
}
|
|
|
|
#endif /* CONFIG_NFSD_PNFS */
|
|
|
|
|
2020-11-04 03:33:12 +08:00
|
|
|
static __be32 nfsd4_decode_secinfo_no_name(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-11-04 03:33:12 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_secinfo_no_name *sin = &u->secinfo_no_name;
|
2020-11-04 03:33:12 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &sin->sin_style) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2022-09-13 05:22:44 +08:00
|
|
|
|
|
|
|
sin->sin_exp = NULL;
|
2020-11-04 03:33:12 +08:00
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-04 03:55:19 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_sequence(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-11-04 03:55:19 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_sequence *seq = &u->sequence;
|
2020-11-04 03:55:19 +08:00
|
|
|
__be32 *p, status;
|
|
|
|
|
|
|
|
status = nfsd4_decode_sessionid4(argp, &seq->sessionid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
p = xdr_inline_decode(argp->xdr, XDR_UNIT * 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
seq->seqid = be32_to_cpup(p++);
|
|
|
|
seq->slotid = be32_to_cpup(p++);
|
|
|
|
seq->maxslots = be32_to_cpup(p++);
|
|
|
|
seq->cachethis = be32_to_cpup(p);
|
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
seq->status_flags = 0;
|
2020-11-04 03:55:19 +08:00
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-04 03:57:44 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_test_stateid(struct nfsd4_compoundargs *argp,
|
|
|
|
union nfsd4_op_u *u)
|
2020-11-04 03:57:44 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_test_stateid *test_stateid = &u->test_stateid;
|
2020-11-04 03:57:44 +08:00
|
|
|
struct nfsd4_test_stateid_id *stateid;
|
|
|
|
__be32 status;
|
|
|
|
u32 i;
|
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(test_stateid, 0, sizeof(*test_stateid));
|
2020-11-04 03:57:44 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &test_stateid->ts_num_ids) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&test_stateid->ts_stateid_list);
|
|
|
|
for (i = 0; i < test_stateid->ts_num_ids; i++) {
|
|
|
|
stateid = svcxdr_tmpalloc(argp, sizeof(*stateid));
|
|
|
|
if (!stateid)
|
2022-07-28 02:40:09 +08:00
|
|
|
return nfserr_jukebox;
|
2020-11-04 03:57:44 +08:00
|
|
|
INIT_LIST_HEAD(&stateid->ts_id_list);
|
|
|
|
list_add_tail(&stateid->ts_id_list, &test_stateid->ts_stateid_list);
|
|
|
|
status = nfsd4_decode_stateid4(argp, &stateid->ts_id_stateid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-11-05 04:15:09 +08:00
|
|
|
static __be32 nfsd4_decode_destroy_clientid(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-11-05 04:15:09 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_destroy_clientid *dc = &u->destroy_clientid;
|
2020-11-05 04:15:09 +08:00
|
|
|
return nfsd4_decode_clientid4(argp, &dc->clientid);
|
|
|
|
}
|
|
|
|
|
2020-11-04 04:02:11 +08:00
|
|
|
static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-11-04 04:02:11 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_reclaim_complete *rc = &u->reclaim_complete;
|
2020-11-04 04:02:11 +08:00
|
|
|
if (xdr_stream_decode_bool(argp->xdr, &rc->rca_one_fs) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2014-11-08 03:44:26 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_fallocate(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2014-11-08 03:44:26 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_fallocate *fallocate = &u->allocate;
|
2020-11-04 23:44:05 +08:00
|
|
|
__be32 status;
|
2014-11-08 03:44:26 +08:00
|
|
|
|
2020-11-04 23:44:05 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, &fallocate->falloc_stateid);
|
2014-11-08 03:44:26 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 23:44:05 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &fallocate->falloc_offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &fallocate->falloc_length) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2014-11-08 03:44:26 +08:00
|
|
|
|
2020-11-04 23:44:05 +08:00
|
|
|
return nfs_ok;
|
2014-11-08 03:44:26 +08:00
|
|
|
}
|
|
|
|
|
2019-09-14 02:00:57 +08:00
|
|
|
static __be32 nfsd4_decode_nl4_server(struct nfsd4_compoundargs *argp,
|
|
|
|
struct nl4_server *ns)
|
|
|
|
{
|
|
|
|
struct nfs42_netaddr *naddr;
|
2020-11-17 07:05:06 +08:00
|
|
|
__be32 *p;
|
2019-09-14 02:00:57 +08:00
|
|
|
|
2020-11-17 07:05:06 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &ns->nl4_type) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2019-09-14 02:00:57 +08:00
|
|
|
|
|
|
|
/* currently support for 1 inter-server source server */
|
|
|
|
switch (ns->nl4_type) {
|
|
|
|
case NL4_NETADDR:
|
|
|
|
naddr = &ns->u.nl4_addr;
|
|
|
|
|
2020-11-17 07:05:06 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &naddr->netid_len) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2019-09-14 02:00:57 +08:00
|
|
|
if (naddr->netid_len > RPCBIND_MAXNETIDLEN)
|
2020-11-17 07:05:06 +08:00
|
|
|
return nfserr_bad_xdr;
|
2019-09-14 02:00:57 +08:00
|
|
|
|
2020-11-17 07:05:06 +08:00
|
|
|
p = xdr_inline_decode(argp->xdr, naddr->netid_len);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
memcpy(naddr->netid, p, naddr->netid_len);
|
2019-09-14 02:00:57 +08:00
|
|
|
|
2020-11-17 07:05:06 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &naddr->addr_len) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2019-09-14 02:00:57 +08:00
|
|
|
if (naddr->addr_len > RPCBIND_MAXUADDRLEN)
|
2020-11-17 07:05:06 +08:00
|
|
|
return nfserr_bad_xdr;
|
2019-09-14 02:00:57 +08:00
|
|
|
|
2020-11-17 07:05:06 +08:00
|
|
|
p = xdr_inline_decode(argp->xdr, naddr->addr_len);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
memcpy(naddr->addr, p, naddr->addr_len);
|
2019-09-14 02:00:57 +08:00
|
|
|
break;
|
|
|
|
default:
|
2020-11-17 07:05:06 +08:00
|
|
|
return nfserr_bad_xdr;
|
2019-09-14 02:00:57 +08:00
|
|
|
}
|
2020-11-17 07:05:06 +08:00
|
|
|
|
|
|
|
return nfs_ok;
|
2019-09-14 02:00:57 +08:00
|
|
|
}
|
|
|
|
|
2016-09-08 03:57:30 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_copy(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2016-09-08 03:57:30 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_copy *copy = &u->copy;
|
2022-07-28 02:40:41 +08:00
|
|
|
u32 consecutive, i, count, sync;
|
2019-09-14 02:00:57 +08:00
|
|
|
struct nl4_server *ns_dummy;
|
2020-11-04 23:49:37 +08:00
|
|
|
__be32 status;
|
2016-09-08 03:57:30 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(copy, 0, sizeof(*copy));
|
2020-11-04 23:49:37 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, ©->cp_src_stateid);
|
2016-09-08 03:57:30 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 23:49:37 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, ©->cp_dst_stateid);
|
2016-09-08 03:57:30 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 23:49:37 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, ©->cp_src_pos) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, ©->cp_dst_pos) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, ©->cp_count) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
/* ca_consecutive: we always do consecutive copies */
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &consecutive) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2022-07-28 02:40:41 +08:00
|
|
|
if (xdr_stream_decode_bool(argp->xdr, &sync) < 0)
|
2020-11-04 23:49:37 +08:00
|
|
|
return nfserr_bad_xdr;
|
2022-07-28 02:40:41 +08:00
|
|
|
nfsd4_copy_set_sync(copy, sync);
|
2016-09-08 03:57:30 +08:00
|
|
|
|
2020-11-04 23:49:37 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &count) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2022-07-28 02:40:22 +08:00
|
|
|
copy->cp_src = svcxdr_tmpalloc(argp, sizeof(*copy->cp_src));
|
|
|
|
if (copy->cp_src == NULL)
|
|
|
|
return nfserr_jukebox;
|
2019-09-14 02:00:57 +08:00
|
|
|
if (count == 0) { /* intra-server copy */
|
2022-07-28 02:40:41 +08:00
|
|
|
__set_bit(NFSD4_COPY_F_INTRA, ©->cp_flags);
|
2020-11-04 23:49:37 +08:00
|
|
|
return nfs_ok;
|
2019-09-14 02:00:57 +08:00
|
|
|
}
|
|
|
|
|
2020-11-04 23:49:37 +08:00
|
|
|
/* decode all the supplied server addresses but use only the first */
|
2022-07-28 02:40:22 +08:00
|
|
|
status = nfsd4_decode_nl4_server(argp, copy->cp_src);
|
2019-09-14 02:00:57 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
|
|
|
|
ns_dummy = kmalloc(sizeof(struct nl4_server), GFP_KERNEL);
|
|
|
|
if (ns_dummy == NULL)
|
2022-07-28 02:40:09 +08:00
|
|
|
return nfserr_jukebox;
|
2019-09-14 02:00:57 +08:00
|
|
|
for (i = 0; i < count - 1; i++) {
|
|
|
|
status = nfsd4_decode_nl4_server(argp, ns_dummy);
|
|
|
|
if (status) {
|
|
|
|
kfree(ns_dummy);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
kfree(ns_dummy);
|
2016-09-08 03:57:30 +08:00
|
|
|
|
2020-11-04 23:49:37 +08:00
|
|
|
return nfs_ok;
|
2016-09-08 03:57:30 +08:00
|
|
|
}
|
|
|
|
|
2019-08-08 23:14:59 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_copy_notify(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2019-08-08 23:14:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_copy_notify *cn = &u->copy_notify;
|
2020-09-12 02:47:59 +08:00
|
|
|
__be32 status;
|
2019-08-08 23:14:59 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(cn, 0, sizeof(*cn));
|
2022-07-28 02:40:16 +08:00
|
|
|
cn->cpn_src = svcxdr_tmpalloc(argp, sizeof(*cn->cpn_src));
|
|
|
|
if (cn->cpn_src == NULL)
|
|
|
|
return nfserr_jukebox;
|
|
|
|
cn->cpn_dst = svcxdr_tmpalloc(argp, sizeof(*cn->cpn_dst));
|
|
|
|
if (cn->cpn_dst == NULL)
|
|
|
|
return nfserr_jukebox;
|
|
|
|
|
2020-11-22 03:19:24 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, &cn->cpn_src_stateid);
|
2019-08-08 23:14:59 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2022-07-28 02:40:16 +08:00
|
|
|
return nfsd4_decode_nl4_server(argp, cn->cpn_dst);
|
2019-08-08 23:14:59 +08:00
|
|
|
}
|
|
|
|
|
2020-11-22 03:19:24 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_decode_offload_status(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-11-22 03:19:24 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_offload_status *os = &u->offload_status;
|
2022-09-13 05:22:44 +08:00
|
|
|
os->count = 0;
|
|
|
|
os->status = 0;
|
2020-11-22 03:21:25 +08:00
|
|
|
return nfsd4_decode_stateid4(argp, &os->stateid);
|
2020-11-22 03:19:24 +08:00
|
|
|
}
|
|
|
|
|
2014-09-27 01:58:27 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_seek(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2014-09-27 01:58:27 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_seek *seek = &u->seek;
|
2020-11-04 23:54:47 +08:00
|
|
|
__be32 status;
|
2014-09-27 01:58:27 +08:00
|
|
|
|
2020-11-04 23:54:47 +08:00
|
|
|
status = nfsd4_decode_stateid4(argp, &seek->seek_stateid);
|
2014-09-27 01:58:27 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2020-11-04 23:54:47 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &seek->seek_offset) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &seek->seek_whence) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2014-09-27 01:58:27 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
seek->seek_eof = 0;
|
|
|
|
seek->seek_pos = 0;
|
2020-11-04 23:54:47 +08:00
|
|
|
return nfs_ok;
|
2014-09-27 01:58:27 +08:00
|
|
|
}
|
|
|
|
|
2020-11-04 23:46:46 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_clone(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
|
2020-11-04 23:46:46 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_clone *clone = &u->clone;
|
2020-11-04 23:46:46 +08:00
|
|
|
__be32 status;
|
|
|
|
|
|
|
|
status = nfsd4_decode_stateid4(argp, &clone->cl_src_stateid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
status = nfsd4_decode_stateid4(argp, &clone->cl_dst_stateid);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &clone->cl_src_pos) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &clone->cl_dst_pos) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &clone->cl_count) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-06-24 06:39:26 +08:00
|
|
|
/*
|
|
|
|
* XDR data that is more than PAGE_SIZE in size is normally part of a
|
|
|
|
* read or write. However, the size of extended attributes is limited
|
|
|
|
* by the maximum request size, and then further limited by the underlying
|
|
|
|
* filesystem limits. This can exceed PAGE_SIZE (currently, XATTR_SIZE_MAX
|
|
|
|
* is 64k). Since there is no kvec- or page-based interface to xattrs,
|
|
|
|
* and we're not dealing with contiguous pages, we need to do some copying.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
2020-11-04 00:54:23 +08:00
|
|
|
* Decode data into buffer.
|
2020-06-24 06:39:26 +08:00
|
|
|
*/
|
|
|
|
static __be32
|
2020-11-04 00:54:23 +08:00
|
|
|
nfsd4_vbuf_from_vector(struct nfsd4_compoundargs *argp, struct xdr_buf *xdr,
|
|
|
|
char **bufp, u32 buflen)
|
2020-06-24 06:39:26 +08:00
|
|
|
{
|
2020-11-04 00:54:23 +08:00
|
|
|
struct page **pages = xdr->pages;
|
|
|
|
struct kvec *head = xdr->head;
|
2020-06-24 06:39:26 +08:00
|
|
|
char *tmp, *dp;
|
|
|
|
u32 len;
|
|
|
|
|
|
|
|
if (buflen <= head->iov_len) {
|
|
|
|
/*
|
|
|
|
* We're in luck, the head has enough space. Just return
|
|
|
|
* the head, no need for copying.
|
|
|
|
*/
|
|
|
|
*bufp = head->iov_base;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = svcxdr_tmpalloc(argp, buflen);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return nfserr_jukebox;
|
|
|
|
|
|
|
|
dp = tmp;
|
|
|
|
memcpy(dp, head->iov_base, head->iov_len);
|
|
|
|
buflen -= head->iov_len;
|
|
|
|
dp += head->iov_len;
|
|
|
|
|
|
|
|
while (buflen > 0) {
|
|
|
|
len = min_t(u32, buflen, PAGE_SIZE);
|
|
|
|
memcpy(dp, page_address(*pages), len);
|
|
|
|
|
|
|
|
buflen -= len;
|
|
|
|
dp += len;
|
|
|
|
pages++;
|
|
|
|
}
|
|
|
|
|
|
|
|
*bufp = tmp;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get a user extended attribute name from the XDR buffer.
|
|
|
|
* It will not have the "user." prefix, so prepend it.
|
|
|
|
* Lastly, check for nul characters in the name.
|
|
|
|
*/
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_xattr_name(struct nfsd4_compoundargs *argp, char **namep)
|
|
|
|
{
|
|
|
|
char *name, *sp, *dp;
|
|
|
|
u32 namelen, cnt;
|
2020-11-04 23:56:52 +08:00
|
|
|
__be32 *p;
|
2020-06-24 06:39:26 +08:00
|
|
|
|
2020-11-04 23:56:52 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &namelen) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
if (namelen > (XATTR_NAME_MAX - XATTR_USER_PREFIX_LEN))
|
|
|
|
return nfserr_nametoolong;
|
|
|
|
if (namelen == 0)
|
2020-11-04 23:56:52 +08:00
|
|
|
return nfserr_bad_xdr;
|
|
|
|
p = xdr_inline_decode(argp->xdr, namelen);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_bad_xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
name = svcxdr_tmpalloc(argp, namelen + XATTR_USER_PREFIX_LEN + 1);
|
|
|
|
if (!name)
|
|
|
|
return nfserr_jukebox;
|
|
|
|
memcpy(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy the extended attribute name over while checking for 0
|
|
|
|
* characters.
|
|
|
|
*/
|
|
|
|
sp = (char *)p;
|
|
|
|
dp = name + XATTR_USER_PREFIX_LEN;
|
|
|
|
cnt = namelen;
|
|
|
|
|
|
|
|
while (cnt-- > 0) {
|
|
|
|
if (*sp == '\0')
|
2020-11-04 23:56:52 +08:00
|
|
|
return nfserr_bad_xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
*dp++ = *sp++;
|
|
|
|
}
|
|
|
|
*dp = '\0';
|
|
|
|
|
|
|
|
*namep = name;
|
|
|
|
|
2020-11-04 23:56:52 +08:00
|
|
|
return nfs_ok;
|
2020-06-24 06:39:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* A GETXATTR op request comes without a length specifier. We just set the
|
|
|
|
* maximum length for the reply based on XATTR_SIZE_MAX and the maximum
|
|
|
|
* channel reply size. nfsd_getxattr will probe the length of the xattr,
|
|
|
|
* check it against getxa_len, and allocate + return the value.
|
|
|
|
*/
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_getxattr(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-06-24 06:39:26 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_getxattr *getxattr = &u->getxattr;
|
2020-06-24 06:39:26 +08:00
|
|
|
__be32 status;
|
|
|
|
u32 maxcount;
|
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(getxattr, 0, sizeof(*getxattr));
|
2020-06-24 06:39:26 +08:00
|
|
|
status = nfsd4_decode_xattr_name(argp, &getxattr->getxa_name);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
|
|
|
|
maxcount = svc_max_payload(argp->rqstp);
|
|
|
|
maxcount = min_t(u32, XATTR_SIZE_MAX, maxcount);
|
|
|
|
|
|
|
|
getxattr->getxa_len = maxcount;
|
2022-09-13 05:22:44 +08:00
|
|
|
return nfs_ok;
|
2020-06-24 06:39:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_setxattr(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-06-24 06:39:26 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_setxattr *setxattr = &u->setxattr;
|
2020-06-24 06:39:26 +08:00
|
|
|
u32 flags, maxcount, size;
|
2020-11-04 23:59:57 +08:00
|
|
|
__be32 status;
|
2020-06-24 06:39:26 +08:00
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(setxattr, 0, sizeof(*setxattr));
|
|
|
|
|
2020-11-04 23:59:57 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &flags) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
|
|
|
|
if (flags > SETXATTR4_REPLACE)
|
|
|
|
return nfserr_inval;
|
|
|
|
setxattr->setxa_flags = flags;
|
|
|
|
|
|
|
|
status = nfsd4_decode_xattr_name(argp, &setxattr->setxa_name);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
|
|
|
|
maxcount = svc_max_payload(argp->rqstp);
|
|
|
|
maxcount = min_t(u32, XATTR_SIZE_MAX, maxcount);
|
|
|
|
|
2020-11-04 23:59:57 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &size) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
if (size > maxcount)
|
|
|
|
return nfserr_xattr2big;
|
|
|
|
|
|
|
|
setxattr->setxa_len = size;
|
|
|
|
if (size > 0) {
|
2020-11-04 00:54:23 +08:00
|
|
|
struct xdr_buf payload;
|
2020-06-24 06:39:26 +08:00
|
|
|
|
2020-11-04 00:54:23 +08:00
|
|
|
if (!xdr_stream_subsegment(argp->xdr, &payload, size))
|
2020-11-04 23:59:57 +08:00
|
|
|
return nfserr_bad_xdr;
|
2020-11-04 00:54:23 +08:00
|
|
|
status = nfsd4_vbuf_from_vector(argp, &payload,
|
|
|
|
&setxattr->setxa_buf, size);
|
2020-06-24 06:39:26 +08:00
|
|
|
}
|
|
|
|
|
2020-11-04 23:59:57 +08:00
|
|
|
return nfs_ok;
|
2020-06-24 06:39:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_listxattrs(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-06-24 06:39:26 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_listxattrs *listxattrs = &u->listxattrs;
|
2020-06-24 06:39:26 +08:00
|
|
|
u32 maxcount;
|
|
|
|
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(listxattrs, 0, sizeof(*listxattrs));
|
|
|
|
|
2020-11-05 00:04:02 +08:00
|
|
|
if (xdr_stream_decode_u64(argp->xdr, &listxattrs->lsxa_cookie) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the cookie is too large to have even one user.x attribute
|
|
|
|
* plus trailing '\0' left in a maximum size buffer, it's invalid.
|
|
|
|
*/
|
|
|
|
if (listxattrs->lsxa_cookie >=
|
|
|
|
(XATTR_LIST_MAX / (XATTR_USER_PREFIX_LEN + 2)))
|
|
|
|
return nfserr_badcookie;
|
|
|
|
|
2020-11-05 00:04:02 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &maxcount) < 0)
|
|
|
|
return nfserr_bad_xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
if (maxcount < 8)
|
|
|
|
/* Always need at least 2 words (length and one character) */
|
|
|
|
return nfserr_inval;
|
|
|
|
|
|
|
|
maxcount = min(maxcount, svc_max_payload(argp->rqstp));
|
|
|
|
listxattrs->lsxa_maxcount = maxcount;
|
|
|
|
|
2020-11-05 00:04:02 +08:00
|
|
|
return nfs_ok;
|
2020-06-24 06:39:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_decode_removexattr(struct nfsd4_compoundargs *argp,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-06-24 06:39:26 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_removexattr *removexattr = &u->removexattr;
|
2022-09-13 05:22:44 +08:00
|
|
|
memset(removexattr, 0, sizeof(*removexattr));
|
2020-06-24 06:39:26 +08:00
|
|
|
return nfsd4_decode_xattr_name(argp, &removexattr->rmxa_name);
|
|
|
|
}
|
|
|
|
|
2008-07-02 16:13:41 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_noop(struct nfsd4_compoundargs *argp, union nfsd4_op_u *p)
|
2008-07-02 16:13:41 +08:00
|
|
|
{
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2008-07-02 16:14:01 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, union nfsd4_op_u *p)
|
2008-07-02 16:14:01 +08:00
|
|
|
{
|
2009-03-05 05:06:06 +08:00
|
|
|
return nfserr_notsupp;
|
2008-07-02 16:14:01 +08:00
|
|
|
}
|
|
|
|
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u);
|
2008-07-02 16:13:41 +08:00
|
|
|
|
2017-08-01 23:59:58 +08:00
|
|
|
static const nfsd4_dec nfsd4_dec_ops[] = {
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_ACCESS] = nfsd4_decode_access,
|
|
|
|
[OP_CLOSE] = nfsd4_decode_close,
|
|
|
|
[OP_COMMIT] = nfsd4_decode_commit,
|
|
|
|
[OP_CREATE] = nfsd4_decode_create,
|
|
|
|
[OP_DELEGPURGE] = nfsd4_decode_notsupp,
|
|
|
|
[OP_DELEGRETURN] = nfsd4_decode_delegreturn,
|
|
|
|
[OP_GETATTR] = nfsd4_decode_getattr,
|
|
|
|
[OP_GETFH] = nfsd4_decode_noop,
|
|
|
|
[OP_LINK] = nfsd4_decode_link,
|
|
|
|
[OP_LOCK] = nfsd4_decode_lock,
|
|
|
|
[OP_LOCKT] = nfsd4_decode_lockt,
|
|
|
|
[OP_LOCKU] = nfsd4_decode_locku,
|
|
|
|
[OP_LOOKUP] = nfsd4_decode_lookup,
|
|
|
|
[OP_LOOKUPP] = nfsd4_decode_noop,
|
|
|
|
[OP_NVERIFY] = nfsd4_decode_verify,
|
|
|
|
[OP_OPEN] = nfsd4_decode_open,
|
|
|
|
[OP_OPENATTR] = nfsd4_decode_notsupp,
|
|
|
|
[OP_OPEN_CONFIRM] = nfsd4_decode_open_confirm,
|
|
|
|
[OP_OPEN_DOWNGRADE] = nfsd4_decode_open_downgrade,
|
|
|
|
[OP_PUTFH] = nfsd4_decode_putfh,
|
|
|
|
[OP_PUTPUBFH] = nfsd4_decode_putpubfh,
|
|
|
|
[OP_PUTROOTFH] = nfsd4_decode_noop,
|
|
|
|
[OP_READ] = nfsd4_decode_read,
|
|
|
|
[OP_READDIR] = nfsd4_decode_readdir,
|
|
|
|
[OP_READLINK] = nfsd4_decode_noop,
|
|
|
|
[OP_REMOVE] = nfsd4_decode_remove,
|
|
|
|
[OP_RENAME] = nfsd4_decode_rename,
|
|
|
|
[OP_RENEW] = nfsd4_decode_renew,
|
|
|
|
[OP_RESTOREFH] = nfsd4_decode_noop,
|
|
|
|
[OP_SAVEFH] = nfsd4_decode_noop,
|
|
|
|
[OP_SECINFO] = nfsd4_decode_secinfo,
|
|
|
|
[OP_SETATTR] = nfsd4_decode_setattr,
|
|
|
|
[OP_SETCLIENTID] = nfsd4_decode_setclientid,
|
|
|
|
[OP_SETCLIENTID_CONFIRM] = nfsd4_decode_setclientid_confirm,
|
|
|
|
[OP_VERIFY] = nfsd4_decode_verify,
|
|
|
|
[OP_WRITE] = nfsd4_decode_write,
|
|
|
|
[OP_RELEASE_LOCKOWNER] = nfsd4_decode_release_lockowner,
|
2009-04-03 13:27:55 +08:00
|
|
|
|
|
|
|
/* new operations for NFSv4.1 */
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_BACKCHANNEL_CTL] = nfsd4_decode_backchannel_ctl,
|
|
|
|
[OP_BIND_CONN_TO_SESSION] = nfsd4_decode_bind_conn_to_session,
|
|
|
|
[OP_EXCHANGE_ID] = nfsd4_decode_exchange_id,
|
|
|
|
[OP_CREATE_SESSION] = nfsd4_decode_create_session,
|
|
|
|
[OP_DESTROY_SESSION] = nfsd4_decode_destroy_session,
|
|
|
|
[OP_FREE_STATEID] = nfsd4_decode_free_stateid,
|
|
|
|
[OP_GET_DIR_DELEGATION] = nfsd4_decode_notsupp,
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#ifdef CONFIG_NFSD_PNFS
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_GETDEVICEINFO] = nfsd4_decode_getdeviceinfo,
|
|
|
|
[OP_GETDEVICELIST] = nfsd4_decode_notsupp,
|
|
|
|
[OP_LAYOUTCOMMIT] = nfsd4_decode_layoutcommit,
|
|
|
|
[OP_LAYOUTGET] = nfsd4_decode_layoutget,
|
|
|
|
[OP_LAYOUTRETURN] = nfsd4_decode_layoutreturn,
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#else
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_GETDEVICEINFO] = nfsd4_decode_notsupp,
|
|
|
|
[OP_GETDEVICELIST] = nfsd4_decode_notsupp,
|
|
|
|
[OP_LAYOUTCOMMIT] = nfsd4_decode_notsupp,
|
|
|
|
[OP_LAYOUTGET] = nfsd4_decode_notsupp,
|
|
|
|
[OP_LAYOUTRETURN] = nfsd4_decode_notsupp,
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#endif
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_SECINFO_NO_NAME] = nfsd4_decode_secinfo_no_name,
|
|
|
|
[OP_SEQUENCE] = nfsd4_decode_sequence,
|
|
|
|
[OP_SET_SSV] = nfsd4_decode_notsupp,
|
|
|
|
[OP_TEST_STATEID] = nfsd4_decode_test_stateid,
|
|
|
|
[OP_WANT_DELEGATION] = nfsd4_decode_notsupp,
|
|
|
|
[OP_DESTROY_CLIENTID] = nfsd4_decode_destroy_clientid,
|
|
|
|
[OP_RECLAIM_COMPLETE] = nfsd4_decode_reclaim_complete,
|
2014-09-27 01:58:26 +08:00
|
|
|
|
|
|
|
/* new operations for NFSv4.2 */
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_ALLOCATE] = nfsd4_decode_fallocate,
|
|
|
|
[OP_COPY] = nfsd4_decode_copy,
|
|
|
|
[OP_COPY_NOTIFY] = nfsd4_decode_copy_notify,
|
|
|
|
[OP_DEALLOCATE] = nfsd4_decode_fallocate,
|
|
|
|
[OP_IO_ADVISE] = nfsd4_decode_notsupp,
|
|
|
|
[OP_LAYOUTERROR] = nfsd4_decode_notsupp,
|
|
|
|
[OP_LAYOUTSTATS] = nfsd4_decode_notsupp,
|
|
|
|
[OP_OFFLOAD_CANCEL] = nfsd4_decode_offload_status,
|
|
|
|
[OP_OFFLOAD_STATUS] = nfsd4_decode_offload_status,
|
|
|
|
[OP_READ_PLUS] = nfsd4_decode_read,
|
|
|
|
[OP_SEEK] = nfsd4_decode_seek,
|
|
|
|
[OP_WRITE_SAME] = nfsd4_decode_notsupp,
|
|
|
|
[OP_CLONE] = nfsd4_decode_clone,
|
2020-06-24 06:39:26 +08:00
|
|
|
/* RFC 8276 extended atributes operations */
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_GETXATTR] = nfsd4_decode_getxattr,
|
|
|
|
[OP_SETXATTR] = nfsd4_decode_setxattr,
|
|
|
|
[OP_LISTXATTRS] = nfsd4_decode_listxattrs,
|
|
|
|
[OP_REMOVEXATTR] = nfsd4_decode_removexattr,
|
2009-04-03 13:27:55 +08:00
|
|
|
};
|
|
|
|
|
2013-10-30 22:00:20 +08:00
|
|
|
static inline bool
|
|
|
|
nfsd4_opnum_in_range(struct nfsd4_compoundargs *argp, struct nfsd4_op *op)
|
|
|
|
{
|
2013-10-31 01:38:13 +08:00
|
|
|
if (op->opnum < FIRST_NFS4_OP)
|
2013-10-30 22:00:20 +08:00
|
|
|
return false;
|
2013-10-31 01:38:13 +08:00
|
|
|
else if (argp->minorversion == 0 && op->opnum > LAST_NFS40_OP)
|
2013-10-30 22:00:20 +08:00
|
|
|
return false;
|
2013-10-31 01:38:13 +08:00
|
|
|
else if (argp->minorversion == 1 && op->opnum > LAST_NFS41_OP)
|
|
|
|
return false;
|
|
|
|
else if (argp->minorversion == 2 && op->opnum > LAST_NFS42_OP)
|
2013-10-30 22:00:20 +08:00
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
2008-07-02 16:14:22 +08:00
|
|
|
|
2021-10-12 23:57:28 +08:00
|
|
|
static bool
|
2005-04-17 06:20:36 +08:00
|
|
|
nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
|
|
|
|
{
|
|
|
|
struct nfsd4_op *op;
|
2011-01-25 01:11:02 +08:00
|
|
|
bool cachethis = false;
|
2014-05-13 06:10:58 +08:00
|
|
|
int auth_slack= argp->rqstp->rq_auth_slack;
|
|
|
|
int max_reply = auth_slack + 8; /* opcnt, status */
|
2014-02-04 23:36:59 +08:00
|
|
|
int readcount = 0;
|
|
|
|
int readbytes = 0;
|
2020-11-05 00:07:06 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
int i;
|
|
|
|
|
2020-11-05 00:07:06 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &argp->taglen) < 0)
|
2021-10-12 23:57:28 +08:00
|
|
|
return false;
|
2020-11-05 00:07:06 +08:00
|
|
|
max_reply += XDR_UNIT;
|
|
|
|
argp->tag = NULL;
|
|
|
|
if (unlikely(argp->taglen)) {
|
|
|
|
if (argp->taglen > NFSD4_MAX_TAGLEN)
|
2021-10-12 23:57:28 +08:00
|
|
|
return false;
|
2020-11-05 00:07:06 +08:00
|
|
|
p = xdr_inline_decode(argp->xdr, argp->taglen);
|
|
|
|
if (!p)
|
2021-10-12 23:57:28 +08:00
|
|
|
return false;
|
2020-12-19 01:28:58 +08:00
|
|
|
argp->tag = svcxdr_savemem(argp, p, argp->taglen);
|
2020-11-05 00:07:06 +08:00
|
|
|
if (!argp->tag)
|
2021-10-12 23:57:28 +08:00
|
|
|
return false;
|
2020-11-05 00:07:06 +08:00
|
|
|
max_reply += xdr_align_size(argp->taglen);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &argp->minorversion) < 0)
|
2021-10-12 23:57:28 +08:00
|
|
|
return false;
|
2022-09-06 03:33:32 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &argp->client_opcnt) < 0)
|
2021-10-12 23:57:28 +08:00
|
|
|
return false;
|
2022-09-06 03:33:32 +08:00
|
|
|
argp->opcnt = min_t(u32, argp->client_opcnt,
|
|
|
|
NFSD_MAX_OPS_PER_COMPOUND);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-03-24 19:15:34 +08:00
|
|
|
if (argp->opcnt > ARRAY_SIZE(argp->iops)) {
|
2022-09-03 06:18:16 +08:00
|
|
|
argp->ops = vcalloc(argp->opcnt, sizeof(*argp->ops));
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!argp->ops) {
|
|
|
|
argp->ops = argp->iops;
|
2021-10-12 23:57:28 +08:00
|
|
|
return false;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-30 22:00:20 +08:00
|
|
|
if (argp->minorversion > NFSD_SUPPORTED_MINOR_VERSION)
|
2008-07-02 16:13:18 +08:00
|
|
|
argp->opcnt = 0;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
for (i = 0; i < argp->opcnt; i++) {
|
|
|
|
op = &argp->ops[i];
|
|
|
|
op->replay = NULL;
|
2023-04-01 04:31:19 +08:00
|
|
|
op->opdesc = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2020-11-23 01:49:52 +08:00
|
|
|
if (xdr_stream_decode_u32(argp->xdr, &op->opnum) < 0)
|
2021-10-12 23:57:28 +08:00
|
|
|
return false;
|
2020-11-22 00:36:42 +08:00
|
|
|
if (nfsd4_opnum_in_range(argp, op)) {
|
2023-04-01 04:31:19 +08:00
|
|
|
op->opdesc = OPDESC(op);
|
2013-10-30 22:00:20 +08:00
|
|
|
op->status = nfsd4_dec_ops[op->opnum](argp, &op->u);
|
2020-11-22 00:36:42 +08:00
|
|
|
if (op->status != nfs_ok)
|
|
|
|
trace_nfsd_compound_decode_err(argp->rqstp,
|
|
|
|
argp->opcnt, i,
|
|
|
|
op->opnum,
|
|
|
|
op->status);
|
|
|
|
} else {
|
2005-04-17 06:20:36 +08:00
|
|
|
op->opnum = OP_ILLEGAL;
|
|
|
|
op->status = nfserr_op_illegal;
|
|
|
|
}
|
2023-04-01 04:31:19 +08:00
|
|
|
|
2011-01-25 01:11:02 +08:00
|
|
|
/*
|
|
|
|
* We'll try to cache the result in the DRC if any one
|
|
|
|
* op in the compound wants to be cached:
|
|
|
|
*/
|
|
|
|
cachethis |= nfsd4_cache_this_op(op);
|
2013-11-06 04:07:16 +08:00
|
|
|
|
2020-09-29 01:08:58 +08:00
|
|
|
if (op->opnum == OP_READ || op->opnum == OP_READ_PLUS) {
|
2014-02-04 23:36:59 +08:00
|
|
|
readcount++;
|
|
|
|
readbytes += nfsd4_max_reply(argp->rqstp, op);
|
|
|
|
} else
|
|
|
|
max_reply += nfsd4_max_reply(argp->rqstp, op);
|
2014-08-12 23:41:40 +08:00
|
|
|
/*
|
2017-02-03 22:51:46 +08:00
|
|
|
* OP_LOCK and OP_LOCKT may return a conflicting lock.
|
|
|
|
* (Special case because it will just skip encoding this
|
|
|
|
* if it runs out of xdr buffer space, and it is the only
|
|
|
|
* operation that behaves this way.)
|
2014-08-12 23:41:40 +08:00
|
|
|
*/
|
2017-02-03 22:51:46 +08:00
|
|
|
if (op->opnum == OP_LOCK || op->opnum == OP_LOCKT)
|
2014-08-12 23:41:40 +08:00
|
|
|
max_reply += NFS4_OPAQUE_LIMIT;
|
2014-05-20 00:27:11 +08:00
|
|
|
|
|
|
|
if (op->status) {
|
|
|
|
argp->opcnt = i+1;
|
|
|
|
break;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2011-01-25 01:11:02 +08:00
|
|
|
/* Sessions make the DRC unnecessary: */
|
|
|
|
if (argp->minorversion)
|
|
|
|
cachethis = false;
|
2014-02-04 23:36:59 +08:00
|
|
|
svc_reserve(argp->rqstp, max_reply + readbytes);
|
2011-01-25 01:11:02 +08:00
|
|
|
argp->rqstp->rq_cachetype = cachethis ? RC_REPLBUFF : RC_NOCACHE;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-05-13 06:10:58 +08:00
|
|
|
if (readcount > 1 || max_reply > PAGE_SIZE - auth_slack)
|
2023-01-07 01:43:37 +08:00
|
|
|
clear_bit(RQ_SPLICE_OK, &argp->rqstp->rq_flags);
|
2014-02-04 23:36:59 +08:00
|
|
|
|
2021-10-12 23:57:28 +08:00
|
|
|
return true;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2017-01-30 14:17:00 +08:00
|
|
|
static __be32 *encode_change(__be32 *p, struct kstat *stat, struct inode *inode,
|
|
|
|
struct svc_export *exp)
|
2009-04-17 05:33:25 +08:00
|
|
|
{
|
2017-01-30 14:17:00 +08:00
|
|
|
if (exp->ex_flags & NFSEXP_V4ROOT) {
|
|
|
|
*p++ = cpu_to_be32(convert_to_wallclock(exp->cd->flush_time));
|
|
|
|
*p++ = 0;
|
2020-12-01 06:46:14 +08:00
|
|
|
} else
|
2018-01-03 23:14:35 +08:00
|
|
|
p = xdr_encode_hyper(p, nfsd4_change_attribute(stat, inode));
|
2014-03-23 06:48:39 +08:00
|
|
|
return p;
|
2009-04-17 05:33:25 +08:00
|
|
|
}
|
|
|
|
|
2023-06-12 22:13:39 +08:00
|
|
|
static __be32 nfsd4_encode_nfstime4(struct xdr_stream *xdr,
|
|
|
|
struct timespec64 *tv)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, XDR_UNIT * 3);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
p = xdr_encode_hyper(p, (s64)tv->tv_sec);
|
|
|
|
*p = cpu_to_be32(tv->tv_nsec);
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2018-04-26 02:34:11 +08:00
|
|
|
/*
|
|
|
|
* ctime (in NFSv4, time_metadata) is not writeable, and the client
|
|
|
|
* doesn't really care what resolution could theoretically be stored by
|
|
|
|
* the filesystem.
|
|
|
|
*
|
|
|
|
* The client cares how close together changes can be while still
|
|
|
|
* guaranteeing ctime changes. For most filesystems (which have
|
|
|
|
* timestamps with nanosecond fields) that is limited by the resolution
|
|
|
|
* of the time returned from current_time() (which I'm assuming to be
|
|
|
|
* 1/HZ).
|
|
|
|
*/
|
|
|
|
static __be32 *encode_time_delta(__be32 *p, struct inode *inode)
|
|
|
|
{
|
2019-10-31 22:14:03 +08:00
|
|
|
struct timespec64 ts;
|
2018-04-26 02:34:11 +08:00
|
|
|
u32 ns;
|
|
|
|
|
|
|
|
ns = max_t(u32, NSEC_PER_SEC/HZ, inode->i_sb->s_time_gran);
|
2019-10-31 22:14:03 +08:00
|
|
|
ts = ns_to_timespec64(ns);
|
2018-04-26 02:34:11 +08:00
|
|
|
|
|
|
|
p = xdr_encode_hyper(p, ts.tv_sec);
|
|
|
|
*p++ = cpu_to_be32(ts.tv_nsec);
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2023-05-16 22:26:15 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_change_info4(struct xdr_stream *xdr, struct nfsd4_change_info *c)
|
2009-04-17 05:33:25 +08:00
|
|
|
{
|
2023-05-16 22:26:15 +08:00
|
|
|
if (xdr_stream_encode_bool(xdr, c->atomic) < 0)
|
|
|
|
return nfserr_resource;
|
|
|
|
if (xdr_stream_encode_u64(xdr, c->before_change) < 0)
|
|
|
|
return nfserr_resource;
|
|
|
|
if (xdr_stream_encode_u64(xdr, c->after_change) < 0)
|
|
|
|
return nfserr_resource;
|
|
|
|
return nfs_ok;
|
2009-04-17 05:33:25 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-10-04 17:16:19 +08:00
|
|
|
/* Encode as an array of strings the string given with components
|
2012-04-24 23:07:59 +08:00
|
|
|
* separated @sep, escaped with esc_enter and esc_exit.
|
2006-10-04 17:16:19 +08:00
|
|
|
*/
|
2013-08-28 09:32:25 +08:00
|
|
|
static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep,
|
|
|
|
char *components, char esc_enter,
|
|
|
|
char esc_exit)
|
2006-10-04 17:16:19 +08:00
|
|
|
{
|
2013-08-28 09:32:25 +08:00
|
|
|
__be32 *p;
|
2013-08-30 03:42:52 +08:00
|
|
|
__be32 pathlen;
|
|
|
|
int pathlen_offset;
|
2006-10-04 17:16:19 +08:00
|
|
|
int strlen, count=0;
|
2012-04-24 23:07:59 +08:00
|
|
|
char *str, *end, *next;
|
2006-10-04 17:16:19 +08:00
|
|
|
|
|
|
|
dprintk("nfsd4_encode_components(%s)\n", components);
|
2013-08-30 03:42:52 +08:00
|
|
|
|
|
|
|
pathlen_offset = xdr->buf->len;
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2006-10-04 17:16:19 +08:00
|
|
|
return nfserr_resource;
|
2013-08-30 03:42:52 +08:00
|
|
|
p++; /* We will fill this in with @count later */
|
|
|
|
|
2006-10-04 17:16:19 +08:00
|
|
|
end = str = components;
|
|
|
|
while (*end) {
|
2012-04-24 23:07:59 +08:00
|
|
|
bool found_esc = false;
|
|
|
|
|
|
|
|
/* try to parse as esc_start, ..., esc_end, sep */
|
|
|
|
if (*str == esc_enter) {
|
|
|
|
for (; *end && (*end != esc_exit); end++)
|
|
|
|
/* find esc_exit or end of string */;
|
|
|
|
next = end + 1;
|
|
|
|
if (*end && (!*next || *next == sep)) {
|
|
|
|
str++;
|
|
|
|
found_esc = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!found_esc)
|
|
|
|
for (; *end && (*end != sep); end++)
|
|
|
|
/* find sep or end of string */;
|
|
|
|
|
2006-10-04 17:16:19 +08:00
|
|
|
strlen = end - str;
|
|
|
|
if (strlen) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, strlen + 4);
|
|
|
|
if (!p)
|
2006-10-04 17:16:19 +08:00
|
|
|
return nfserr_resource;
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque(p, str, strlen);
|
2006-10-04 17:16:19 +08:00
|
|
|
count++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
end++;
|
2014-12-08 05:05:47 +08:00
|
|
|
if (found_esc)
|
|
|
|
end = next;
|
|
|
|
|
2006-10-04 17:16:19 +08:00
|
|
|
str = end;
|
|
|
|
}
|
2014-12-08 05:05:48 +08:00
|
|
|
pathlen = htonl(count);
|
2013-08-30 03:42:52 +08:00
|
|
|
write_bytes_to_xdr_buf(xdr->buf, pathlen_offset, &pathlen, 4);
|
2006-10-04 17:16:19 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-24 23:07:59 +08:00
|
|
|
/* Encode as an array of strings the string given with components
|
|
|
|
* separated @sep.
|
|
|
|
*/
|
2013-08-28 09:32:25 +08:00
|
|
|
static __be32 nfsd4_encode_components(struct xdr_stream *xdr, char sep,
|
|
|
|
char *components)
|
2012-04-24 23:07:59 +08:00
|
|
|
{
|
2013-08-28 09:32:25 +08:00
|
|
|
return nfsd4_encode_components_esc(xdr, sep, components, 0, 0);
|
2012-04-24 23:07:59 +08:00
|
|
|
}
|
|
|
|
|
2006-10-04 17:16:19 +08:00
|
|
|
/*
|
|
|
|
* encode a location element of a fs_locations structure
|
|
|
|
*/
|
2013-08-28 09:32:25 +08:00
|
|
|
static __be32 nfsd4_encode_fs_location4(struct xdr_stream *xdr,
|
|
|
|
struct nfsd4_fs_location *location)
|
2006-10-04 17:16:19 +08:00
|
|
|
{
|
2006-10-20 14:28:59 +08:00
|
|
|
__be32 status;
|
2006-10-04 17:16:19 +08:00
|
|
|
|
2013-08-28 09:32:25 +08:00
|
|
|
status = nfsd4_encode_components_esc(xdr, ':', location->hosts,
|
2012-04-24 23:07:59 +08:00
|
|
|
'[', ']');
|
2006-10-04 17:16:19 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2013-08-28 09:32:25 +08:00
|
|
|
status = nfsd4_encode_components(xdr, '/', location->path);
|
2006-10-04 17:16:19 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2011-09-13 07:37:06 +08:00
|
|
|
* Encode a path in RFC3530 'pathname4' format
|
2006-10-04 17:16:19 +08:00
|
|
|
*/
|
2013-08-28 09:32:25 +08:00
|
|
|
static __be32 nfsd4_encode_path(struct xdr_stream *xdr,
|
|
|
|
const struct path *root,
|
|
|
|
const struct path *path)
|
2006-10-04 17:16:19 +08:00
|
|
|
{
|
2013-09-02 04:06:39 +08:00
|
|
|
struct path cur = *path;
|
2013-08-28 09:32:25 +08:00
|
|
|
__be32 *p;
|
2011-09-13 07:37:06 +08:00
|
|
|
struct dentry **components = NULL;
|
|
|
|
unsigned int ncomponents = 0;
|
|
|
|
__be32 err = nfserr_jukebox;
|
2006-10-04 17:16:19 +08:00
|
|
|
|
2011-09-13 07:37:06 +08:00
|
|
|
dprintk("nfsd4_encode_components(");
|
2006-10-04 17:16:19 +08:00
|
|
|
|
2011-09-13 07:37:06 +08:00
|
|
|
path_get(&cur);
|
|
|
|
/* First walk the path up to the nfsd root, and store the
|
|
|
|
* dentries/path components in an array.
|
|
|
|
*/
|
|
|
|
for (;;) {
|
2015-03-15 23:13:32 +08:00
|
|
|
if (path_equal(&cur, root))
|
2011-09-13 07:37:06 +08:00
|
|
|
break;
|
|
|
|
if (cur.dentry == cur.mnt->mnt_root) {
|
|
|
|
if (follow_up(&cur))
|
|
|
|
continue;
|
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
if ((ncomponents & 15) == 0) {
|
|
|
|
struct dentry **new;
|
|
|
|
new = krealloc(components,
|
|
|
|
sizeof(*new) * (ncomponents + 16),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!new)
|
|
|
|
goto out_free;
|
|
|
|
components = new;
|
|
|
|
}
|
|
|
|
components[ncomponents++] = cur.dentry;
|
|
|
|
cur.dentry = dget_parent(cur.dentry);
|
|
|
|
}
|
2013-08-28 09:32:25 +08:00
|
|
|
err = nfserr_resource;
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2011-09-13 07:37:06 +08:00
|
|
|
goto out_free;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(ncomponents);
|
2011-09-13 07:37:06 +08:00
|
|
|
|
|
|
|
while (ncomponents) {
|
|
|
|
struct dentry *dentry = components[ncomponents - 1];
|
2013-09-02 04:06:39 +08:00
|
|
|
unsigned int len;
|
2011-09-13 07:37:06 +08:00
|
|
|
|
2013-09-02 04:06:39 +08:00
|
|
|
spin_lock(&dentry->d_lock);
|
|
|
|
len = dentry->d_name.len;
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, len + 4);
|
|
|
|
if (!p) {
|
2013-09-02 04:06:39 +08:00
|
|
|
spin_unlock(&dentry->d_lock);
|
2011-09-13 07:37:06 +08:00
|
|
|
goto out_free;
|
2013-09-02 04:06:39 +08:00
|
|
|
}
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque(p, dentry->d_name.name, len);
|
2014-10-22 08:11:25 +08:00
|
|
|
dprintk("/%pd", dentry);
|
2013-09-02 04:06:39 +08:00
|
|
|
spin_unlock(&dentry->d_lock);
|
2011-09-13 07:37:06 +08:00
|
|
|
dput(dentry);
|
|
|
|
ncomponents--;
|
2006-10-04 17:16:19 +08:00
|
|
|
}
|
2011-09-13 07:37:06 +08:00
|
|
|
|
|
|
|
err = 0;
|
|
|
|
out_free:
|
|
|
|
dprintk(")\n");
|
|
|
|
while (ncomponents)
|
|
|
|
dput(components[--ncomponents]);
|
|
|
|
kfree(components);
|
|
|
|
path_put(&cur);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2013-08-28 09:32:25 +08:00
|
|
|
static __be32 nfsd4_encode_fsloc_fsroot(struct xdr_stream *xdr,
|
|
|
|
struct svc_rqst *rqstp, const struct path *path)
|
2011-09-13 07:37:06 +08:00
|
|
|
{
|
|
|
|
struct svc_export *exp_ps;
|
|
|
|
__be32 res;
|
|
|
|
|
|
|
|
exp_ps = rqst_find_fsidzero_export(rqstp);
|
|
|
|
if (IS_ERR(exp_ps))
|
|
|
|
return nfserrno(PTR_ERR(exp_ps));
|
2013-08-28 09:32:25 +08:00
|
|
|
res = nfsd4_encode_path(xdr, &exp_ps->ex_path, path);
|
2011-09-13 07:37:06 +08:00
|
|
|
exp_put(exp_ps);
|
|
|
|
return res;
|
2006-10-04 17:16:19 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* encode a fs_locations structure
|
|
|
|
*/
|
2013-08-28 09:32:25 +08:00
|
|
|
static __be32 nfsd4_encode_fs_locations(struct xdr_stream *xdr,
|
|
|
|
struct svc_rqst *rqstp, struct svc_export *exp)
|
2006-10-04 17:16:19 +08:00
|
|
|
{
|
2006-10-20 14:28:59 +08:00
|
|
|
__be32 status;
|
2006-10-20 14:28:44 +08:00
|
|
|
int i;
|
2013-08-28 09:32:25 +08:00
|
|
|
__be32 *p;
|
2006-10-04 17:16:19 +08:00
|
|
|
struct nfsd4_fs_locations *fslocs = &exp->ex_fslocs;
|
|
|
|
|
2013-08-28 09:32:25 +08:00
|
|
|
status = nfsd4_encode_fsloc_fsroot(xdr, rqstp, &exp->ex_path);
|
2006-10-04 17:16:19 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2006-10-04 17:16:19 +08:00
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(fslocs->locations_count);
|
2006-10-04 17:16:19 +08:00
|
|
|
for (i=0; i<fslocs->locations_count; i++) {
|
2013-08-28 09:32:25 +08:00
|
|
|
status = nfsd4_encode_fs_location4(xdr, &fslocs->locations[i]);
|
2006-10-04 17:16:19 +08:00
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-08-15 23:49:30 +08:00
|
|
|
static u32 nfs4_file_type(umode_t mode)
|
|
|
|
{
|
|
|
|
switch (mode & S_IFMT) {
|
|
|
|
case S_IFIFO: return NF4FIFO;
|
|
|
|
case S_IFCHR: return NF4CHR;
|
|
|
|
case S_IFDIR: return NF4DIR;
|
|
|
|
case S_IFBLK: return NF4BLK;
|
|
|
|
case S_IFLNK: return NF4LNK;
|
|
|
|
case S_IFREG: return NF4REG;
|
|
|
|
case S_IFSOCK: return NF4SOCK;
|
|
|
|
default: return NF4BAD;
|
2020-11-01 23:32:34 +08:00
|
|
|
}
|
2011-08-15 23:49:30 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static inline __be32
|
2013-08-28 09:32:25 +08:00
|
|
|
nfsd4_encode_aclname(struct xdr_stream *xdr, struct svc_rqst *rqstp,
|
|
|
|
struct nfs4_ace *ace)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2014-01-08 22:49:01 +08:00
|
|
|
if (ace->whotype != NFS4_ACL_WHO_NAMED)
|
2013-08-28 09:32:25 +08:00
|
|
|
return nfs4_acl_write_who(xdr, ace->whotype);
|
2014-01-08 22:49:01 +08:00
|
|
|
else if (ace->flag & NFS4_ACE_IDENTIFIER_GROUP)
|
2013-08-28 09:32:25 +08:00
|
|
|
return nfsd4_encode_group(xdr, rqstp, ace->who_gid);
|
2014-01-08 22:49:01 +08:00
|
|
|
else
|
2013-08-28 09:32:25 +08:00
|
|
|
return nfsd4_encode_user(xdr, rqstp, ace->who_uid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2015-07-30 21:52:44 +08:00
|
|
|
static inline __be32
|
2016-07-11 03:55:58 +08:00
|
|
|
nfsd4_encode_layout_types(struct xdr_stream *xdr, u32 layout_types)
|
2015-07-30 21:52:44 +08:00
|
|
|
{
|
2016-07-11 03:55:58 +08:00
|
|
|
__be32 *p;
|
|
|
|
unsigned long i = hweight_long(layout_types);
|
2015-07-30 21:52:44 +08:00
|
|
|
|
2016-07-11 03:55:58 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4 + 4 * i);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
*p++ = cpu_to_be32(i);
|
|
|
|
|
|
|
|
for (i = LAYOUT_NFSV4_1_FILES; i < LAYOUT_TYPE_MAX; ++i)
|
|
|
|
if (layout_types & (1 << i))
|
|
|
|
*p++ = cpu_to_be32(i);
|
2015-07-30 21:52:44 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-04 17:16:20 +08:00
|
|
|
#define WORD0_ABSENT_FS_ATTRS (FATTR4_WORD0_FS_LOCATIONS | FATTR4_WORD0_FSID | \
|
|
|
|
FATTR4_WORD0_RDATTR_ERROR)
|
|
|
|
#define WORD1_ABSENT_FS_ATTRS FATTR4_WORD1_MOUNTED_ON_FILEID
|
2015-07-07 10:16:37 +08:00
|
|
|
#define WORD2_ABSENT_FS_ATTRS 0
|
2006-10-04 17:16:20 +08:00
|
|
|
|
2013-05-03 01:19:10 +08:00
|
|
|
#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
|
|
|
|
static inline __be32
|
2013-08-28 09:32:25 +08:00
|
|
|
nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp,
|
|
|
|
void *context, int len)
|
2013-05-03 01:19:10 +08:00
|
|
|
{
|
2013-08-28 09:32:25 +08:00
|
|
|
__be32 *p;
|
2013-05-03 01:19:10 +08:00
|
|
|
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, len + 4 + 4 + 4);
|
|
|
|
if (!p)
|
2013-05-03 01:19:10 +08:00
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For now we use a 0 here to indicate the null translation; in
|
|
|
|
* the future we may place a call to translation code here.
|
|
|
|
*/
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0); /* lfs */
|
|
|
|
*p++ = cpu_to_be32(0); /* pi */
|
2013-05-03 01:19:10 +08:00
|
|
|
p = xdr_encode_opaque(p, context, len);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline __be32
|
2013-08-28 09:32:25 +08:00
|
|
|
nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp,
|
|
|
|
void *context, int len)
|
2013-05-03 01:19:10 +08:00
|
|
|
{ return 0; }
|
|
|
|
#endif
|
|
|
|
|
2015-07-07 10:16:37 +08:00
|
|
|
static __be32 fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *bmval2, u32 *rdattr_err)
|
2006-10-04 17:16:20 +08:00
|
|
|
{
|
|
|
|
/* As per referral draft: */
|
|
|
|
if (*bmval0 & ~WORD0_ABSENT_FS_ATTRS ||
|
|
|
|
*bmval1 & ~WORD1_ABSENT_FS_ATTRS) {
|
|
|
|
if (*bmval0 & FATTR4_WORD0_RDATTR_ERROR ||
|
|
|
|
*bmval0 & FATTR4_WORD0_FS_LOCATIONS)
|
|
|
|
*rdattr_err = NFSERR_MOVED;
|
|
|
|
else
|
|
|
|
return nfserr_moved;
|
|
|
|
}
|
|
|
|
*bmval0 &= WORD0_ABSENT_FS_ATTRS;
|
|
|
|
*bmval1 &= WORD1_ABSENT_FS_ATTRS;
|
2015-07-07 10:16:37 +08:00
|
|
|
*bmval2 &= WORD2_ABSENT_FS_ATTRS;
|
2006-10-04 17:16:20 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-10-02 05:50:56 +08:00
|
|
|
|
2022-09-09 00:31:07 +08:00
|
|
|
static int nfsd4_get_mounted_on_ino(struct svc_export *exp, u64 *pino)
|
2012-10-02 05:50:56 +08:00
|
|
|
{
|
|
|
|
struct path path = exp->ex_path;
|
2022-09-09 00:31:07 +08:00
|
|
|
struct kstat stat;
|
2012-10-02 05:50:56 +08:00
|
|
|
int err;
|
|
|
|
|
|
|
|
path_get(&path);
|
|
|
|
while (follow_up(&path)) {
|
|
|
|
if (path.dentry != path.mnt->mnt_root)
|
|
|
|
break;
|
|
|
|
}
|
2022-09-09 00:31:07 +08:00
|
|
|
err = vfs_getattr(&path, &stat, STATX_INO, AT_STATX_SYNC_AS_STAT);
|
2012-10-02 05:50:56 +08:00
|
|
|
path_put(&path);
|
2022-09-09 00:31:07 +08:00
|
|
|
if (!err)
|
|
|
|
*pino = stat.ino;
|
2012-10-02 05:50:56 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-07-30 21:55:30 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_bitmap(struct xdr_stream *xdr, u32 bmval0, u32 bmval1, u32 bmval2)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
if (bmval2) {
|
|
|
|
p = xdr_reserve_space(xdr, 16);
|
|
|
|
if (!p)
|
|
|
|
goto out_resource;
|
|
|
|
*p++ = cpu_to_be32(3);
|
|
|
|
*p++ = cpu_to_be32(bmval0);
|
|
|
|
*p++ = cpu_to_be32(bmval1);
|
|
|
|
*p++ = cpu_to_be32(bmval2);
|
|
|
|
} else if (bmval1) {
|
|
|
|
p = xdr_reserve_space(xdr, 12);
|
|
|
|
if (!p)
|
|
|
|
goto out_resource;
|
|
|
|
*p++ = cpu_to_be32(2);
|
|
|
|
*p++ = cpu_to_be32(bmval0);
|
|
|
|
*p++ = cpu_to_be32(bmval1);
|
|
|
|
} else {
|
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
|
|
|
goto out_resource;
|
|
|
|
*p++ = cpu_to_be32(1);
|
|
|
|
*p++ = cpu_to_be32(bmval0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
out_resource:
|
|
|
|
return nfserr_resource;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* Note: @fhp can be NULL; in this case, we might have to compose the filehandle
|
|
|
|
* ourselves.
|
|
|
|
*/
|
2014-05-30 21:09:25 +08:00
|
|
|
static __be32
|
2013-08-27 04:04:46 +08:00
|
|
|
nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
|
|
|
|
struct svc_export *exp,
|
|
|
|
struct dentry *dentry, u32 *bmval,
|
2007-11-28 03:34:05 +08:00
|
|
|
struct svc_rqst *rqstp, int ignore_crossmnt)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
u32 bmval0 = bmval[0];
|
|
|
|
u32 bmval1 = bmval[1];
|
2009-04-03 13:29:11 +08:00
|
|
|
u32 bmval2 = bmval[2];
|
2005-04-17 06:20:36 +08:00
|
|
|
struct kstat stat;
|
2014-01-16 01:21:12 +08:00
|
|
|
struct svc_fh *tempfh = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct kstatfs statfs;
|
2022-07-23 04:08:45 +08:00
|
|
|
__be32 *p, *attrlen_p;
|
2014-02-27 09:17:02 +08:00
|
|
|
int starting_len = xdr->buf->len;
|
2013-08-30 03:42:52 +08:00
|
|
|
int attrlen_offset;
|
2005-04-17 06:20:36 +08:00
|
|
|
u32 dummy;
|
|
|
|
u64 dummy64;
|
2006-10-04 17:16:20 +08:00
|
|
|
u32 rdattr_err = 0;
|
2006-10-20 14:28:59 +08:00
|
|
|
__be32 status;
|
2006-10-20 14:29:01 +08:00
|
|
|
int err;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct nfs4_acl *acl = NULL;
|
2019-03-22 22:07:11 +08:00
|
|
|
#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
|
2013-05-03 01:19:10 +08:00
|
|
|
void *context = NULL;
|
|
|
|
int contextlen;
|
2019-03-22 22:07:11 +08:00
|
|
|
#endif
|
2013-05-03 01:19:10 +08:00
|
|
|
bool contextsupport = false;
|
2009-04-03 13:29:11 +08:00
|
|
|
struct nfsd4_compoundres *resp = rqstp->rq_resp;
|
|
|
|
u32 minorversion = resp->cstate.minorversion;
|
2010-07-08 00:53:11 +08:00
|
|
|
struct path path = {
|
|
|
|
.mnt = exp->ex_path.mnt,
|
|
|
|
.dentry = dentry,
|
|
|
|
};
|
2012-11-27 19:11:44 +08:00
|
|
|
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
|
2016-10-19 02:18:40 +08:00
|
|
|
BUG_ON(!nfsd_attrs_supported(minorversion, bmval));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-10-04 17:16:20 +08:00
|
|
|
if (exp->ex_fslocs.migrated) {
|
2015-07-07 10:16:37 +08:00
|
|
|
status = fattr_handle_absent_fs(&bmval0, &bmval1, &bmval2, &rdattr_err);
|
2006-10-04 17:16:20 +08:00
|
|
|
if (status)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2022-09-08 02:45:01 +08:00
|
|
|
err = vfs_getattr(&path, &stat,
|
|
|
|
STATX_BASIC_STATS | STATX_BTIME | STATX_CHANGE_COOKIE,
|
|
|
|
AT_STATX_SYNC_AS_STAT);
|
2006-10-20 14:29:01 +08:00
|
|
|
if (err)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_nfserr;
|
2022-01-11 20:08:42 +08:00
|
|
|
if (!(stat.result_mask & STATX_BTIME))
|
|
|
|
/* underlying FS does not offer btime so we can't share it */
|
|
|
|
bmval1 &= ~FATTR4_WORD1_TIME_CREATE;
|
2014-05-28 16:46:13 +08:00
|
|
|
if ((bmval0 & (FATTR4_WORD0_FILES_AVAIL | FATTR4_WORD0_FILES_FREE |
|
|
|
|
FATTR4_WORD0_FILES_TOTAL | FATTR4_WORD0_MAXNAME)) ||
|
2005-04-17 06:20:36 +08:00
|
|
|
(bmval1 & (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE |
|
|
|
|
FATTR4_WORD1_SPACE_TOTAL))) {
|
2010-07-08 00:53:11 +08:00
|
|
|
err = vfs_statfs(&path, &statfs);
|
2006-10-20 14:29:01 +08:00
|
|
|
if (err)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_nfserr;
|
|
|
|
}
|
|
|
|
if ((bmval0 & (FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FSID)) && !fhp) {
|
2014-01-16 01:21:12 +08:00
|
|
|
tempfh = kmalloc(sizeof(struct svc_fh), GFP_KERNEL);
|
|
|
|
status = nfserr_jukebox;
|
|
|
|
if (!tempfh)
|
|
|
|
goto out;
|
|
|
|
fh_init(tempfh, NFS4_FHSIZE);
|
|
|
|
status = fh_compose(tempfh, exp, dentry, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (status)
|
|
|
|
goto out;
|
2014-01-16 01:21:12 +08:00
|
|
|
fhp = tempfh;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2015-04-24 19:04:00 +08:00
|
|
|
if (bmval0 & FATTR4_WORD0_ACL) {
|
2006-10-20 14:29:01 +08:00
|
|
|
err = nfsd4_get_nfs4_acl(rqstp, dentry, &acl);
|
2015-04-24 19:04:00 +08:00
|
|
|
if (err == -EOPNOTSUPP)
|
|
|
|
bmval0 &= ~FATTR4_WORD0_ACL;
|
|
|
|
else if (err == -EINVAL) {
|
|
|
|
status = nfserr_attrnotsupp;
|
|
|
|
goto out;
|
|
|
|
} else if (err != 0)
|
|
|
|
goto out_nfserr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2013-05-03 01:19:10 +08:00
|
|
|
#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
|
2015-07-07 10:16:37 +08:00
|
|
|
if ((bmval2 & FATTR4_WORD2_SECURITY_LABEL) ||
|
|
|
|
bmval0 & FATTR4_WORD0_SUPPORTED_ATTRS) {
|
2017-01-04 01:30:11 +08:00
|
|
|
if (exp->ex_flags & NFSEXP_SECURITY_LABEL)
|
|
|
|
err = security_inode_getsecctx(d_inode(dentry),
|
2013-05-03 01:19:10 +08:00
|
|
|
&context, &contextlen);
|
2017-01-04 01:30:11 +08:00
|
|
|
else
|
|
|
|
err = -EOPNOTSUPP;
|
2013-05-03 01:19:10 +08:00
|
|
|
contextsupport = (err == 0);
|
|
|
|
if (bmval2 & FATTR4_WORD2_SECURITY_LABEL) {
|
|
|
|
if (err == -EOPNOTSUPP)
|
|
|
|
bmval2 &= ~FATTR4_WORD2_SECURITY_LABEL;
|
|
|
|
else if (err)
|
|
|
|
goto out_nfserr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */
|
|
|
|
|
2015-07-30 21:55:30 +08:00
|
|
|
status = nfsd4_encode_bitmap(xdr, bmval0, bmval1, bmval2);
|
|
|
|
if (status)
|
|
|
|
goto out;
|
2013-08-30 03:42:52 +08:00
|
|
|
|
|
|
|
attrlen_offset = xdr->buf->len;
|
2022-07-23 04:08:45 +08:00
|
|
|
attrlen_p = xdr_reserve_space(xdr, XDR_UNIT);
|
|
|
|
if (!attrlen_p)
|
2013-08-28 09:32:25 +08:00
|
|
|
goto out_resource;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (bmval0 & FATTR4_WORD0_SUPPORTED_ATTRS) {
|
2017-01-12 09:34:50 +08:00
|
|
|
u32 supp[3];
|
|
|
|
|
|
|
|
memcpy(supp, nfsd_suppattrs[minorversion], sizeof(supp));
|
2009-04-03 13:29:11 +08:00
|
|
|
|
2015-04-24 19:04:00 +08:00
|
|
|
if (!IS_POSIXACL(dentry->d_inode))
|
2016-10-19 02:18:40 +08:00
|
|
|
supp[0] &= ~FATTR4_WORD0_ACL;
|
2013-05-03 01:19:10 +08:00
|
|
|
if (!contextsupport)
|
2016-10-19 02:18:40 +08:00
|
|
|
supp[2] &= ~FATTR4_WORD2_SECURITY_LABEL;
|
|
|
|
if (!supp[2]) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 12);
|
|
|
|
if (!p)
|
2010-10-01 02:47:46 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(2);
|
2016-10-19 02:18:40 +08:00
|
|
|
*p++ = cpu_to_be32(supp[0]);
|
|
|
|
*p++ = cpu_to_be32(supp[1]);
|
2009-04-03 13:29:11 +08:00
|
|
|
} else {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 16);
|
|
|
|
if (!p)
|
2010-10-01 02:47:46 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(3);
|
2016-10-19 02:18:40 +08:00
|
|
|
*p++ = cpu_to_be32(supp[0]);
|
|
|
|
*p++ = cpu_to_be32(supp[1]);
|
|
|
|
*p++ = cpu_to_be32(supp[2]);
|
2009-04-03 13:29:11 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_TYPE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2011-08-15 23:49:30 +08:00
|
|
|
dummy = nfs4_file_type(stat.mode);
|
2013-01-17 06:11:11 +08:00
|
|
|
if (dummy == NF4BAD) {
|
|
|
|
status = nfserr_serverfault;
|
|
|
|
goto out;
|
|
|
|
}
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(dummy);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_FH_EXPIRE_TYPE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2005-06-24 13:02:58 +08:00
|
|
|
if (exp->ex_flags & NFSEXP_NOSUBTREECHECK)
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(NFS4_FH_PERSISTENT);
|
2005-06-24 13:02:58 +08:00
|
|
|
else
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(NFS4_FH_PERSISTENT|
|
|
|
|
NFS4_FH_VOL_RENAME);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_CHANGE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2017-01-30 14:17:00 +08:00
|
|
|
p = encode_change(p, &stat, d_inode(dentry), exp);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_SIZE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, stat.size);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_LINK_SUPPORT) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_SYMLINK_SUPPORT) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_NAMED_ATTR) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_FSID) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 16);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2006-10-04 17:16:20 +08:00
|
|
|
if (exp->ex_fslocs.migrated) {
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, NFS4_REFERRAL_FSID_MAJOR);
|
|
|
|
p = xdr_encode_hyper(p, NFS4_REFERRAL_FSID_MINOR);
|
2007-02-14 16:33:12 +08:00
|
|
|
} else switch(fsid_source(fhp)) {
|
|
|
|
case FSIDSOURCE_FSID:
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, (u64)exp->ex_fsid);
|
|
|
|
p = xdr_encode_hyper(p, (u64)0);
|
2007-02-14 16:33:12 +08:00
|
|
|
break;
|
|
|
|
case FSIDSOURCE_DEV:
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
*p++ = cpu_to_be32(MAJOR(stat.dev));
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
*p++ = cpu_to_be32(MINOR(stat.dev));
|
2007-02-14 16:33:12 +08:00
|
|
|
break;
|
|
|
|
case FSIDSOURCE_UUID:
|
2014-05-23 20:00:19 +08:00
|
|
|
p = xdr_encode_opaque_fixed(p, exp->ex_uuid,
|
|
|
|
EX_UUID_LEN);
|
2007-02-14 16:33:12 +08:00
|
|
|
break;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_UNIQUE_HANDLES) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_LEASE_TIME) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(nn->nfsd4_lease);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_RDATTR_ERROR) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(rdattr_err);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_ACL) {
|
|
|
|
struct nfs4_ace *ace;
|
|
|
|
|
|
|
|
if (acl == NULL) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
|
|
|
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0);
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_acl;
|
|
|
|
}
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(acl->naces);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-02-16 17:28:30 +08:00
|
|
|
for (ace = acl->aces; ace < acl->aces + acl->naces; ace++) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4*3);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(ace->type);
|
|
|
|
*p++ = cpu_to_be32(ace->flag);
|
|
|
|
*p++ = cpu_to_be32(ace->access_mask &
|
|
|
|
NFS4_ACE_MASK_ALL);
|
2013-08-28 09:32:25 +08:00
|
|
|
status = nfsd4_encode_aclname(xdr, rqstp, ace);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (status)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out_acl:
|
|
|
|
if (bmval0 & FATTR4_WORD0_ACLSUPPORT) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2015-04-24 19:04:00 +08:00
|
|
|
*p++ = cpu_to_be32(IS_POSIXACL(dentry->d_inode) ?
|
2005-04-17 06:20:36 +08:00
|
|
|
ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL : 0);
|
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_CANSETTIME) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_CASE_INSENSITIVE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_CASE_PRESERVING) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_CHOWN_RESTRICTED) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_FILEHANDLE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, fhp->fh_handle.fh_size + 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2021-09-02 09:16:32 +08:00
|
|
|
p = xdr_encode_opaque(p, &fhp->fh_handle.fh_raw,
|
2014-03-23 06:43:16 +08:00
|
|
|
fhp->fh_handle.fh_size);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_FILEID) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, stat.ino);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_FILES_AVAIL) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, (u64) statfs.f_ffree);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_FILES_FREE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, (u64) statfs.f_ffree);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_FILES_TOTAL) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, (u64) statfs.f_files);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-10-04 17:16:19 +08:00
|
|
|
if (bmval0 & FATTR4_WORD0_FS_LOCATIONS) {
|
2013-08-28 09:32:25 +08:00
|
|
|
status = nfsd4_encode_fs_locations(xdr, rqstp, exp);
|
2006-10-04 17:16:19 +08:00
|
|
|
if (status)
|
|
|
|
goto out;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
if (bmval0 & FATTR4_WORD0_HOMOGENEOUS) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_MAXFILESIZE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, exp->ex_path.mnt->mnt_sb->s_maxbytes);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_MAXLINK) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(255);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_MAXNAME) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(statfs.f_namelen);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_MAXREAD) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, (u64) svc_max_payload(rqstp));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval0 & FATTR4_WORD0_MAXWRITE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, (u64) svc_max_payload(rqstp));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_MODE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(stat.mode & S_IALLUGO);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_NO_TRUNC) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_NUMLINKS) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(stat.nlink);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_OWNER) {
|
2013-08-28 09:32:25 +08:00
|
|
|
status = nfsd4_encode_user(xdr, rqstp, stat.uid);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (status)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
|
2013-08-28 09:32:25 +08:00
|
|
|
status = nfsd4_encode_group(xdr, rqstp, stat.gid);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (status)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_RAWDEV) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32((u32) MAJOR(stat.rdev));
|
|
|
|
*p++ = cpu_to_be32((u32) MINOR(stat.rdev));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_SPACE_AVAIL) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
|
|
|
dummy64 = (u64)statfs.f_bavail * (u64)statfs.f_bsize;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, dummy64);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_SPACE_FREE) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
|
|
|
dummy64 = (u64)statfs.f_bfree * (u64)statfs.f_bsize;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, dummy64);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_SPACE_TOTAL) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
|
|
|
dummy64 = (u64)statfs.f_blocks * (u64)statfs.f_bsize;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, dummy64);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_SPACE_USED) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
|
|
|
dummy64 = (u64)stat.blocks << 9;
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, dummy64);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_TIME_ACCESS) {
|
2023-06-12 22:13:39 +08:00
|
|
|
status = nfsd4_encode_nfstime4(xdr, &stat.atime);
|
|
|
|
if (status)
|
|
|
|
goto out;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2023-06-24 05:09:06 +08:00
|
|
|
if (bmval1 & FATTR4_WORD1_TIME_CREATE) {
|
|
|
|
status = nfsd4_encode_nfstime4(xdr, &stat.btime);
|
|
|
|
if (status)
|
|
|
|
goto out;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
if (bmval1 & FATTR4_WORD1_TIME_DELTA) {
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 12);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2018-04-26 02:34:11 +08:00
|
|
|
p = encode_time_delta(p, d_inode(dentry));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_TIME_METADATA) {
|
2023-06-12 22:13:39 +08:00
|
|
|
status = nfsd4_encode_nfstime4(xdr, &stat.ctime);
|
|
|
|
if (status)
|
|
|
|
goto out;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_TIME_MODIFY) {
|
2023-06-12 22:13:39 +08:00
|
|
|
status = nfsd4_encode_nfstime4(xdr, &stat.mtime);
|
|
|
|
if (status)
|
|
|
|
goto out;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (bmval1 & FATTR4_WORD1_MOUNTED_ON_FILEID) {
|
2015-07-30 21:51:54 +08:00
|
|
|
u64 ino = stat.ino;
|
|
|
|
|
2013-08-28 09:32:25 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_resource;
|
2007-11-28 03:34:05 +08:00
|
|
|
/*
|
2022-09-09 00:31:07 +08:00
|
|
|
* Get ino of mountpoint in parent filesystem, if not ignoring
|
|
|
|
* crossmount and this is the root of a cross-mounted
|
|
|
|
* filesystem.
|
2007-11-28 03:34:05 +08:00
|
|
|
*/
|
|
|
|
if (ignore_crossmnt == 0 &&
|
2015-07-30 21:51:54 +08:00
|
|
|
dentry == exp->ex_path.mnt->mnt_root) {
|
2022-09-09 00:31:07 +08:00
|
|
|
err = nfsd4_get_mounted_on_ino(exp, &ino);
|
2015-07-30 21:51:54 +08:00
|
|
|
if (err)
|
|
|
|
goto out_nfserr;
|
|
|
|
}
|
|
|
|
p = xdr_encode_hyper(p, ino);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#ifdef CONFIG_NFSD_PNFS
|
2015-07-30 21:52:44 +08:00
|
|
|
if (bmval1 & FATTR4_WORD1_FS_LAYOUT_TYPES) {
|
2016-07-11 03:55:58 +08:00
|
|
|
status = nfsd4_encode_layout_types(xdr, exp->ex_layout_types);
|
2015-07-30 21:52:44 +08:00
|
|
|
if (status)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bmval2 & FATTR4_WORD2_LAYOUT_TYPES) {
|
2016-07-11 03:55:58 +08:00
|
|
|
status = nfsd4_encode_layout_types(xdr, exp->ex_layout_types);
|
2015-07-30 21:52:44 +08:00
|
|
|
if (status)
|
|
|
|
goto out;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (bmval2 & FATTR4_WORD2_LAYOUT_BLKSIZE) {
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
goto out_resource;
|
|
|
|
*p++ = cpu_to_be32(stat.blksize);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NFSD_PNFS */
|
2009-04-03 13:29:14 +08:00
|
|
|
if (bmval2 & FATTR4_WORD2_SUPPATTR_EXCLCREAT) {
|
2017-05-10 04:24:59 +08:00
|
|
|
u32 supp[3];
|
|
|
|
|
|
|
|
memcpy(supp, nfsd_suppattrs[minorversion], sizeof(supp));
|
|
|
|
supp[0] &= NFSD_SUPPATTR_EXCLCREAT_WORD0;
|
|
|
|
supp[1] &= NFSD_SUPPATTR_EXCLCREAT_WORD1;
|
|
|
|
supp[2] &= NFSD_SUPPATTR_EXCLCREAT_WORD2;
|
|
|
|
|
|
|
|
status = nfsd4_encode_bitmap(xdr, supp[0], supp[1], supp[2]);
|
2015-07-30 21:55:30 +08:00
|
|
|
if (status)
|
|
|
|
goto out;
|
2009-04-03 13:29:14 +08:00
|
|
|
}
|
2009-04-03 13:29:11 +08:00
|
|
|
|
2019-03-22 22:07:11 +08:00
|
|
|
#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
|
2015-07-30 21:54:26 +08:00
|
|
|
if (bmval2 & FATTR4_WORD2_SECURITY_LABEL) {
|
|
|
|
status = nfsd4_encode_security_label(xdr, rqstp, context,
|
|
|
|
contextlen);
|
|
|
|
if (status)
|
|
|
|
goto out;
|
|
|
|
}
|
2019-03-22 22:07:11 +08:00
|
|
|
#endif
|
2015-07-30 21:54:26 +08:00
|
|
|
|
2020-06-24 06:39:27 +08:00
|
|
|
if (bmval2 & FATTR4_WORD2_XATTR_SUPPORT) {
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
goto out_resource;
|
2023-02-01 21:14:54 +08:00
|
|
|
err = xattr_supports_user_prefix(d_inode(dentry));
|
2020-06-24 06:39:27 +08:00
|
|
|
*p++ = cpu_to_be32(err == 0);
|
|
|
|
}
|
|
|
|
|
2022-07-23 04:08:45 +08:00
|
|
|
*attrlen_p = cpu_to_be32(xdr->buf->len - attrlen_offset - XDR_UNIT);
|
2005-04-17 06:20:36 +08:00
|
|
|
status = nfs_ok;
|
|
|
|
|
|
|
|
out:
|
2013-05-15 22:27:52 +08:00
|
|
|
#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
|
2013-05-03 01:19:10 +08:00
|
|
|
if (context)
|
|
|
|
security_release_secctx(context, contextlen);
|
2013-05-15 22:27:52 +08:00
|
|
|
#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */
|
2007-02-16 17:28:30 +08:00
|
|
|
kfree(acl);
|
2014-03-10 12:52:07 +08:00
|
|
|
if (tempfh) {
|
2014-01-16 01:21:12 +08:00
|
|
|
fh_put(tempfh);
|
2014-03-10 12:52:07 +08:00
|
|
|
kfree(tempfh);
|
|
|
|
}
|
2014-02-27 09:17:02 +08:00
|
|
|
if (status)
|
|
|
|
xdr_truncate_encode(xdr, starting_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
return status;
|
|
|
|
out_nfserr:
|
2006-10-20 14:29:01 +08:00
|
|
|
status = nfserrno(err);
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out;
|
|
|
|
out_resource:
|
|
|
|
status = nfserr_resource;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-08-27 04:04:46 +08:00
|
|
|
static void svcxdr_init_encode_from_buffer(struct xdr_stream *xdr,
|
|
|
|
struct xdr_buf *buf, __be32 *p, int bytes)
|
|
|
|
{
|
|
|
|
xdr->scratch.iov_len = 0;
|
|
|
|
memset(buf, 0, sizeof(struct xdr_buf));
|
|
|
|
buf->head[0].iov_base = p;
|
|
|
|
buf->head[0].iov_len = 0;
|
|
|
|
buf->len = 0;
|
|
|
|
xdr->buf = buf;
|
|
|
|
xdr->iov = buf->head;
|
|
|
|
xdr->p = p;
|
|
|
|
xdr->end = (void *)p + bytes;
|
|
|
|
buf->buflen = bytes;
|
|
|
|
}
|
|
|
|
|
2013-08-27 04:04:46 +08:00
|
|
|
__be32 nfsd4_encode_fattr_to_buf(__be32 **p, int words,
|
|
|
|
struct svc_fh *fhp, struct svc_export *exp,
|
|
|
|
struct dentry *dentry, u32 *bmval,
|
|
|
|
struct svc_rqst *rqstp, int ignore_crossmnt)
|
|
|
|
{
|
2013-08-27 04:04:46 +08:00
|
|
|
struct xdr_buf dummy;
|
2013-08-27 04:04:46 +08:00
|
|
|
struct xdr_stream xdr;
|
|
|
|
__be32 ret;
|
|
|
|
|
2013-08-27 04:04:46 +08:00
|
|
|
svcxdr_init_encode_from_buffer(&xdr, &dummy, *p, words << 2);
|
2013-08-27 04:04:46 +08:00
|
|
|
ret = nfsd4_encode_fattr(&xdr, fhp, exp, dentry, bmval, rqstp,
|
|
|
|
ignore_crossmnt);
|
|
|
|
*p = xdr.p;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-02-12 04:48:47 +08:00
|
|
|
static inline int attributes_need_mount(u32 *bmval)
|
|
|
|
{
|
|
|
|
if (bmval[0] & ~(FATTR4_WORD0_RDATTR_ERROR | FATTR4_WORD0_LEASE_TIME))
|
|
|
|
return 1;
|
|
|
|
if (bmval[1] & ~FATTR4_WORD1_MOUNTED_ON_FILEID)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
2014-01-21 05:37:11 +08:00
|
|
|
nfsd4_encode_dirent_fattr(struct xdr_stream *xdr, struct nfsd4_readdir *cd,
|
|
|
|
const char *name, int namlen)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct svc_export *exp = cd->rd_fhp->fh_export;
|
|
|
|
struct dentry *dentry;
|
2006-10-20 14:28:59 +08:00
|
|
|
__be32 nfserr;
|
2007-11-28 03:34:05 +08:00
|
|
|
int ignore_crossmnt = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2019-10-31 13:21:58 +08:00
|
|
|
dentry = lookup_positive_unlocked(name, cd->rd_fhp->fh_dentry, namlen);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (IS_ERR(dentry))
|
|
|
|
return nfserrno(PTR_ERR(dentry));
|
|
|
|
|
|
|
|
exp_get(exp);
|
2007-11-28 03:34:05 +08:00
|
|
|
/*
|
|
|
|
* In the case of a mountpoint, the client may be asking for
|
|
|
|
* attributes that are only properties of the underlying filesystem
|
|
|
|
* as opposed to the cross-mounted file system. In such a case,
|
|
|
|
* we will not follow the cross mount and will fill the attribtutes
|
|
|
|
* directly from the mountpoint dentry.
|
|
|
|
*/
|
2009-10-26 09:43:01 +08:00
|
|
|
if (nfsd_mountpoint(dentry, exp)) {
|
2006-12-13 16:35:24 +08:00
|
|
|
int err;
|
|
|
|
|
2009-10-26 09:43:01 +08:00
|
|
|
if (!(exp->ex_flags & NFSEXP_V4ROOT)
|
|
|
|
&& !attributes_need_mount(cd->rd_bmval)) {
|
|
|
|
ignore_crossmnt = 1;
|
|
|
|
goto out_encode;
|
|
|
|
}
|
2007-07-17 19:04:51 +08:00
|
|
|
/*
|
|
|
|
* Why the heck aren't we just using nfsd_lookup??
|
|
|
|
* Different "."/".." handling? Something else?
|
|
|
|
* At least, add a comment here to explain....
|
|
|
|
*/
|
2006-12-13 16:35:24 +08:00
|
|
|
err = nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp);
|
|
|
|
if (err) {
|
|
|
|
nfserr = nfserrno(err);
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_put;
|
|
|
|
}
|
2007-07-17 19:04:51 +08:00
|
|
|
nfserr = check_nfsd_access(exp, cd->rd_rqstp);
|
|
|
|
if (nfserr)
|
|
|
|
goto out_put;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
}
|
2009-10-26 09:43:01 +08:00
|
|
|
out_encode:
|
2014-01-21 05:37:11 +08:00
|
|
|
nfserr = nfsd4_encode_fattr(xdr, NULL, exp, dentry, cd->rd_bmval,
|
2007-11-28 03:34:05 +08:00
|
|
|
cd->rd_rqstp, ignore_crossmnt);
|
2005-04-17 06:20:36 +08:00
|
|
|
out_put:
|
|
|
|
dput(dentry);
|
|
|
|
exp_put(exp);
|
|
|
|
return nfserr;
|
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:58 +08:00
|
|
|
static __be32 *
|
2014-01-21 05:37:11 +08:00
|
|
|
nfsd4_encode_rdattr_error(struct xdr_stream *xdr, __be32 nfserr)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2014-01-21 05:37:11 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
2014-07-06 11:34:43 +08:00
|
|
|
p = xdr_reserve_space(xdr, 20);
|
2014-01-21 05:37:11 +08:00
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
return NULL;
|
|
|
|
*p++ = htonl(2);
|
|
|
|
*p++ = htonl(FATTR4_WORD0_RDATTR_ERROR); /* bmval0 */
|
|
|
|
*p++ = htonl(0); /* bmval1 */
|
|
|
|
|
2013-01-17 06:33:28 +08:00
|
|
|
*p++ = htonl(4); /* attribute length */
|
2005-04-17 06:20:36 +08:00
|
|
|
*p++ = nfserr; /* no htonl */
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2007-01-26 16:57:10 +08:00
|
|
|
nfsd4_encode_dirent(void *ccdv, const char *name, int namlen,
|
|
|
|
loff_t offset, u64 ino, unsigned int d_type)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-01-26 16:57:10 +08:00
|
|
|
struct readdir_cd *ccd = ccdv;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common);
|
2014-01-21 05:37:11 +08:00
|
|
|
struct xdr_stream *xdr = cd->xdr;
|
|
|
|
int start_offset = xdr->buf->len;
|
|
|
|
int cookie_offset;
|
2014-08-21 02:49:50 +08:00
|
|
|
u32 name_and_cookie;
|
2014-01-21 05:37:11 +08:00
|
|
|
int entry_bytes;
|
2006-10-20 14:28:59 +08:00
|
|
|
__be32 nfserr = nfserr_toosmall;
|
2014-01-21 05:37:11 +08:00
|
|
|
__be64 wire_offset;
|
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* In nfsv4, "." and ".." never make it onto the wire.. */
|
|
|
|
if (name && isdotent(name, namlen)) {
|
|
|
|
cd->common.err = nfs_ok;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-01-21 05:37:11 +08:00
|
|
|
if (cd->cookie_offset) {
|
|
|
|
wire_offset = cpu_to_be64(offset);
|
|
|
|
write_bytes_to_xdr_buf(xdr->buf, cd->cookie_offset,
|
|
|
|
&wire_offset, 8);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-01-21 05:37:11 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto fail;
|
|
|
|
*p++ = xdr_one; /* mark entry present */
|
2014-01-21 05:37:11 +08:00
|
|
|
cookie_offset = xdr->buf->len;
|
|
|
|
p = xdr_reserve_space(xdr, 3*4 + namlen);
|
|
|
|
if (!p)
|
|
|
|
goto fail;
|
2022-01-26 04:57:45 +08:00
|
|
|
p = xdr_encode_hyper(p, OFFSET_MAX); /* offset of next entry */
|
2005-04-17 06:20:36 +08:00
|
|
|
p = xdr_encode_array(p, name, namlen); /* name length & name */
|
|
|
|
|
2014-01-21 05:37:11 +08:00
|
|
|
nfserr = nfsd4_encode_dirent_fattr(xdr, cd, name, namlen);
|
2005-04-17 06:20:36 +08:00
|
|
|
switch (nfserr) {
|
|
|
|
case nfs_ok:
|
|
|
|
break;
|
|
|
|
case nfserr_resource:
|
|
|
|
nfserr = nfserr_toosmall;
|
|
|
|
goto fail;
|
2009-05-06 07:04:29 +08:00
|
|
|
case nfserr_noent:
|
2014-06-13 17:32:42 +08:00
|
|
|
xdr_truncate_encode(xdr, start_offset);
|
2009-05-06 07:04:29 +08:00
|
|
|
goto skip_entry;
|
2022-12-14 02:08:26 +08:00
|
|
|
case nfserr_jukebox:
|
|
|
|
/*
|
|
|
|
* The pseudoroot should only display dentries that lead to
|
|
|
|
* exports. If we get EJUKEBOX here, then we can't tell whether
|
|
|
|
* this entry should be included. Just fail the whole READDIR
|
|
|
|
* with NFS4ERR_DELAY in that case, and hope that the situation
|
|
|
|
* will resolve itself by the client's next attempt.
|
|
|
|
*/
|
|
|
|
if (cd->rd_fhp->fh_export->ex_flags & NFSEXP_V4ROOT)
|
|
|
|
goto fail;
|
|
|
|
fallthrough;
|
2005-04-17 06:20:36 +08:00
|
|
|
default:
|
|
|
|
/*
|
|
|
|
* If the client requested the RDATTR_ERROR attribute,
|
|
|
|
* we stuff the error code into this attribute
|
|
|
|
* and continue. If this attribute was not requested,
|
|
|
|
* then in accordance with the spec, we fail the
|
|
|
|
* entire READDIR operation(!)
|
|
|
|
*/
|
|
|
|
if (!(cd->rd_bmval[0] & FATTR4_WORD0_RDATTR_ERROR))
|
|
|
|
goto fail;
|
2014-01-21 05:37:11 +08:00
|
|
|
p = nfsd4_encode_rdattr_error(xdr, nfserr);
|
2006-01-19 09:43:40 +08:00
|
|
|
if (p == NULL) {
|
|
|
|
nfserr = nfserr_toosmall;
|
2005-04-17 06:20:36 +08:00
|
|
|
goto fail;
|
2006-01-19 09:43:40 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2014-01-21 05:37:11 +08:00
|
|
|
nfserr = nfserr_toosmall;
|
|
|
|
entry_bytes = xdr->buf->len - start_offset;
|
|
|
|
if (entry_bytes > cd->rd_maxcount)
|
|
|
|
goto fail;
|
|
|
|
cd->rd_maxcount -= entry_bytes;
|
2014-08-21 02:49:50 +08:00
|
|
|
/*
|
2021-10-01 03:44:41 +08:00
|
|
|
* RFC 3530 14.2.24 describes rd_dircount as only a "hint", and
|
|
|
|
* notes that it could be zero. If it is zero, then the server
|
|
|
|
* should enforce only the rd_maxcount value.
|
2014-08-21 02:49:50 +08:00
|
|
|
*/
|
2021-10-01 03:44:41 +08:00
|
|
|
if (cd->rd_dircount) {
|
|
|
|
name_and_cookie = 4 + 4 * XDR_QUADLEN(namlen) + 8;
|
|
|
|
if (name_and_cookie > cd->rd_dircount && cd->cookie_offset)
|
|
|
|
goto fail;
|
|
|
|
cd->rd_dircount -= min(cd->rd_dircount, name_and_cookie);
|
|
|
|
if (!cd->rd_dircount)
|
|
|
|
cd->rd_maxcount = 0;
|
|
|
|
}
|
2014-12-20 07:01:35 +08:00
|
|
|
|
2014-01-21 05:37:11 +08:00
|
|
|
cd->cookie_offset = cookie_offset;
|
2009-05-06 07:04:29 +08:00
|
|
|
skip_entry:
|
2005-04-17 06:20:36 +08:00
|
|
|
cd->common.err = nfs_ok;
|
|
|
|
return 0;
|
|
|
|
fail:
|
2014-01-21 05:37:11 +08:00
|
|
|
xdr_truncate_encode(xdr, start_offset);
|
2005-04-17 06:20:36 +08:00
|
|
|
cd->common.err = nfserr;
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2023-05-16 22:26:09 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_verifier4(struct xdr_stream *xdr, const nfs4_verifier *verf)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, NFS4_VERIFIER_SIZE);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
memcpy(p, verf->data, sizeof(verf->data));
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_clientid4(struct xdr_stream *xdr, const clientid_t *clientid)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, sizeof(__be64));
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
memcpy(p, clientid, sizeof(*clientid));
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_stateid(struct xdr_stream *xdr, stateid_t *sid)
|
2008-08-13 01:45:07 +08:00
|
|
|
{
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2008-08-13 01:45:07 +08:00
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, sizeof(stateid_t));
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(sid->si_generation);
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque_fixed(p, &sid->si_opaque,
|
|
|
|
sizeof(stateid_opaque_t));
|
2014-01-31 06:18:38 +08:00
|
|
|
return 0;
|
2008-08-13 01:45:07 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_access(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_access *access = &u->access;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
*p++ = cpu_to_be32(access->ac_supported);
|
|
|
|
*p++ = cpu_to_be32(access->ac_resp_access);
|
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
static __be32 nfsd4_encode_bind_conn_to_session(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2010-10-05 11:12:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_bind_conn_to_session *bcts = &u->bind_conn_to_session;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2010-10-05 11:12:59 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
p = xdr_reserve_space(xdr, NFS4_MAX_SESSIONID_LEN + 8);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
p = xdr_encode_opaque_fixed(p, bcts->sessionid.data,
|
|
|
|
NFS4_MAX_SESSIONID_LEN);
|
|
|
|
*p++ = cpu_to_be32(bcts->dir);
|
|
|
|
/* Upshifting from TCP to RDMA is not supported */
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
return 0;
|
2010-10-05 11:12:59 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_close(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_close *close = &u->close;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-01-31 06:18:38 +08:00
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfsd4_encode_stateid(xdr, &close->cl_stateid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_commit(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_commit *commit = &u->commit;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-16 22:26:09 +08:00
|
|
|
return nfsd4_encode_verifier4(resp->xdr, &commit->co_verf);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_create(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_create *create = &u->create;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-16 22:26:15 +08:00
|
|
|
nfserr = nfsd4_encode_change_info4(xdr, &create->cr_cinfo);
|
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
2019-08-19 02:18:58 +08:00
|
|
|
return nfsd4_encode_bitmap(xdr, create->cr_bmval[0],
|
2017-05-06 23:12:04 +08:00
|
|
|
create->cr_bmval[1], create->cr_bmval[2]);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_getattr(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_getattr *getattr = &u->getattr;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct svc_fh *fhp = getattr->ga_fhp;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfsd4_encode_fattr(xdr, fhp, fhp->fh_export, fhp->fh_dentry,
|
|
|
|
getattr->ga_bmval, resp->rqstp, 0);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_getfh(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct svc_fh **fhpp = &u->getfh;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2008-07-04 19:38:33 +08:00
|
|
|
struct svc_fh *fhp = *fhpp;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned int len;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
len = fhp->fh_handle.fh_size;
|
|
|
|
p = xdr_reserve_space(xdr, len + 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2021-09-02 09:16:32 +08:00
|
|
|
p = xdr_encode_opaque(p, &fhp->fh_handle.fh_raw, len);
|
2017-05-06 23:12:04 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Including all fields other than the name, a LOCK4denied structure requires
|
|
|
|
* 8(clientid) + 4(namelen) + 8(offset) + 8(length) + 4(type) = 32 bytes.
|
|
|
|
*/
|
2014-01-31 06:18:38 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_lock_denied(struct xdr_stream *xdr, struct nfsd4_lock_denied *ld)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2011-08-31 10:15:47 +08:00
|
|
|
struct xdr_netobj *conf = &ld->ld_owner;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-03-11 00:19:10 +08:00
|
|
|
again:
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 32 + XDR_LEN(conf->len));
|
2014-03-11 00:19:10 +08:00
|
|
|
if (!p) {
|
|
|
|
/*
|
|
|
|
* Don't fail to return the result just because we can't
|
|
|
|
* return the conflicting open:
|
|
|
|
*/
|
|
|
|
if (conf->len) {
|
2014-07-07 22:10:56 +08:00
|
|
|
kfree(conf->data);
|
2014-03-11 00:19:10 +08:00
|
|
|
conf->len = 0;
|
|
|
|
conf->data = NULL;
|
|
|
|
goto again;
|
|
|
|
}
|
2014-01-31 06:18:38 +08:00
|
|
|
return nfserr_resource;
|
2014-03-11 00:19:10 +08:00
|
|
|
}
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, ld->ld_start);
|
|
|
|
p = xdr_encode_hyper(p, ld->ld_length);
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(ld->ld_type);
|
2011-08-31 10:15:47 +08:00
|
|
|
if (conf->len) {
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque_fixed(p, &ld->ld_clientid, 8);
|
|
|
|
p = xdr_encode_opaque(p, conf->data, conf->len);
|
2014-07-07 22:10:56 +08:00
|
|
|
kfree(conf->data);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else { /* non - nfsv4 lock in conflict, no clientid nor owner */
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, (u64)0); /* clientid */
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0); /* length of owner name */
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2014-01-31 06:18:38 +08:00
|
|
|
return nfserr_denied;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_lock(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_lock *lock = &u->lock;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-01-31 06:18:38 +08:00
|
|
|
|
2008-08-13 01:45:07 +08:00
|
|
|
if (!nfserr)
|
2014-01-31 06:18:38 +08:00
|
|
|
nfserr = nfsd4_encode_stateid(xdr, &lock->lk_resp_stateid);
|
2008-08-13 01:45:07 +08:00
|
|
|
else if (nfserr == nfserr_denied)
|
2014-01-31 06:18:38 +08:00
|
|
|
nfserr = nfsd4_encode_lock_denied(xdr, &lock->lk_denied);
|
2014-07-07 22:10:56 +08:00
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
return nfserr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_lockt(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_lockt *lockt = &u->lockt;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-01-31 06:18:38 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (nfserr == nfserr_denied)
|
2014-01-31 06:18:38 +08:00
|
|
|
nfsd4_encode_lock_denied(xdr, &lockt->lt_denied);
|
2008-07-04 19:38:33 +08:00
|
|
|
return nfserr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_locku(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_locku *locku = &u->locku;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-01-31 06:18:38 +08:00
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfsd4_encode_stateid(xdr, &locku->lu_stateid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_link(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_link *link = &u->link;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-16 22:26:15 +08:00
|
|
|
return nfsd4_encode_change_info4(xdr, &link->li_cinfo);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_open *open = &u->open;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
nfserr = nfsd4_encode_stateid(xdr, &open->op_stateid);
|
|
|
|
if (nfserr)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr;
|
2023-05-16 22:26:15 +08:00
|
|
|
nfserr = nfsd4_encode_change_info4(xdr, &open->op_cinfo);
|
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
|
|
|
if (xdr_stream_encode_u32(xdr, open->op_rflags) < 0)
|
2014-01-31 06:18:38 +08:00
|
|
|
return nfserr_resource;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2015-07-30 21:55:30 +08:00
|
|
|
nfserr = nfsd4_encode_bitmap(xdr, open->op_bmval[0], open->op_bmval[1],
|
|
|
|
open->op_bmval[2]);
|
|
|
|
if (nfserr)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr;
|
2015-07-30 21:55:30 +08:00
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
*p++ = cpu_to_be32(open->op_delegate_type);
|
2005-04-17 06:20:36 +08:00
|
|
|
switch (open->op_delegate_type) {
|
|
|
|
case NFS4_OPEN_DELEGATE_NONE:
|
|
|
|
break;
|
|
|
|
case NFS4_OPEN_DELEGATE_READ:
|
2014-01-31 06:18:38 +08:00
|
|
|
nfserr = nfsd4_encode_stateid(xdr, &open->op_delegate_stateid);
|
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
|
|
|
p = xdr_reserve_space(xdr, 20);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(open->op_recall);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO: ACE's in delegations
|
|
|
|
*/
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE);
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
*p++ = cpu_to_be32(0); /* XXX: is NULL principal ok? */
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
case NFS4_OPEN_DELEGATE_WRITE:
|
2014-01-31 06:18:38 +08:00
|
|
|
nfserr = nfsd4_encode_stateid(xdr, &open->op_delegate_stateid);
|
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
|
|
|
p = xdr_reserve_space(xdr, 32);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2023-06-07 07:41:02 +08:00
|
|
|
*p++ = cpu_to_be32(open->op_recall);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO: space_limit's in delegations
|
|
|
|
*/
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(NFS4_LIMIT_SIZE);
|
|
|
|
*p++ = cpu_to_be32(~(u32)0);
|
|
|
|
*p++ = cpu_to_be32(~(u32)0);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO: ACE's in delegations
|
|
|
|
*/
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE);
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
*p++ = cpu_to_be32(0); /* XXX: is NULL principal ok? */
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
2012-02-17 02:57:17 +08:00
|
|
|
case NFS4_OPEN_DELEGATE_NONE_EXT: /* 4.1 */
|
|
|
|
switch (open->op_why_no_deleg) {
|
|
|
|
case WND4_CONTENTION:
|
|
|
|
case WND4_RESOURCE:
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(open->op_why_no_deleg);
|
|
|
|
/* deleg signaling not supported yet: */
|
|
|
|
*p++ = cpu_to_be32(0);
|
2012-02-17 02:57:17 +08:00
|
|
|
break;
|
|
|
|
default:
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(open->op_why_no_deleg);
|
2012-02-17 02:57:17 +08:00
|
|
|
}
|
|
|
|
break;
|
2005-04-17 06:20:36 +08:00
|
|
|
default:
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
/* XXX save filehandle here */
|
2017-05-06 23:12:04 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_open_confirm(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_open_confirm *oc = &u->open_confirm;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-01-31 06:18:38 +08:00
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfsd4_encode_stateid(xdr, &oc->oc_resp_stateid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_open_downgrade *od = &u->open_downgrade;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-01-31 06:18:38 +08:00
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfsd4_encode_stateid(xdr, &od->od_stateid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2023-05-19 01:45:43 +08:00
|
|
|
/*
|
|
|
|
* The operation of this function assumes that this is the only
|
|
|
|
* READ operation in the COMPOUND. If there are multiple READs,
|
|
|
|
* we use nfsd4_encode_readv().
|
|
|
|
*/
|
2014-03-19 05:01:51 +08:00
|
|
|
static __be32 nfsd4_encode_splice_read(
|
|
|
|
struct nfsd4_compoundres *resp,
|
|
|
|
struct nfsd4_read *read,
|
|
|
|
struct file *file, unsigned long maxcount)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-05-14 04:32:04 +08:00
|
|
|
struct xdr_buf *buf = xdr->buf;
|
2020-11-05 23:24:19 +08:00
|
|
|
int status, space_left;
|
2014-03-19 05:01:51 +08:00
|
|
|
__be32 nfserr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-19 01:45:43 +08:00
|
|
|
/*
|
|
|
|
* Make sure there is room at the end of buf->head for
|
|
|
|
* svcxdr_encode_opaque_pages() to create a tail buffer
|
|
|
|
* to XDR-pad the payload.
|
|
|
|
*/
|
|
|
|
if (xdr->iov != xdr->buf->head || xdr->end - xdr->p < 1)
|
2014-01-31 06:18:38 +08:00
|
|
|
return nfserr_resource;
|
2014-03-19 05:01:51 +08:00
|
|
|
|
2018-03-29 01:29:11 +08:00
|
|
|
nfserr = nfsd_splice_read(read->rd_rqstp, read->rd_fhp,
|
2022-07-23 04:08:57 +08:00
|
|
|
file, read->rd_offset, &maxcount,
|
|
|
|
&read->rd_eof);
|
2018-03-29 01:29:11 +08:00
|
|
|
read->rd_length = maxcount;
|
2020-11-05 23:24:19 +08:00
|
|
|
if (nfserr)
|
|
|
|
goto out_err;
|
2023-05-19 01:45:43 +08:00
|
|
|
svcxdr_encode_opaque_pages(read->rd_rqstp, xdr, buf->pages,
|
|
|
|
buf->page_base, maxcount);
|
2020-11-05 23:24:19 +08:00
|
|
|
status = svc_encode_result_payload(read->rd_rqstp,
|
|
|
|
buf->head[0].iov_len, maxcount);
|
|
|
|
if (status) {
|
|
|
|
nfserr = nfserrno(status);
|
|
|
|
goto out_err;
|
2014-02-04 23:36:59 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-19 01:45:43 +08:00
|
|
|
/*
|
|
|
|
* Prepare to encode subsequent operations.
|
|
|
|
*
|
|
|
|
* xdr_truncate_encode() is not safe to use after a successful
|
|
|
|
* splice read has been done, so the following stream
|
|
|
|
* manipulations are open-coded.
|
|
|
|
*/
|
2014-03-19 05:01:51 +08:00
|
|
|
space_left = min_t(int, (void *)xdr->end - (void *)xdr->p,
|
2014-05-14 04:32:04 +08:00
|
|
|
buf->buflen - buf->len);
|
|
|
|
buf->buflen = buf->len + space_left;
|
2014-03-19 05:01:51 +08:00
|
|
|
xdr->end = (__be32 *)((void *)xdr->end + space_left);
|
|
|
|
|
2023-05-19 01:45:43 +08:00
|
|
|
return nfs_ok;
|
2020-11-05 23:24:19 +08:00
|
|
|
|
|
|
|
out_err:
|
|
|
|
/*
|
|
|
|
* nfsd_splice_actor may have already messed with the
|
|
|
|
* page length; reset it so as not to confuse
|
|
|
|
* xdr_truncate_encode in our caller.
|
|
|
|
*/
|
|
|
|
buf->page_len = 0;
|
|
|
|
return nfserr;
|
2014-03-19 05:01:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
|
|
|
|
struct nfsd4_read *read,
|
|
|
|
struct file *file, unsigned long maxcount)
|
|
|
|
{
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2022-07-23 04:09:10 +08:00
|
|
|
unsigned int starting_len = xdr->buf->len;
|
2022-07-23 04:09:16 +08:00
|
|
|
__be32 zero = xdr_zero;
|
2014-03-19 05:01:51 +08:00
|
|
|
__be32 nfserr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-19 01:46:03 +08:00
|
|
|
if (xdr_reserve_space_vec(xdr, maxcount) < 0)
|
2020-08-18 00:53:06 +08:00
|
|
|
return nfserr_resource;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-19 01:46:03 +08:00
|
|
|
nfserr = nfsd_iter_read(resp->rqstp, read->rd_fhp, file,
|
|
|
|
read->rd_offset, &maxcount,
|
|
|
|
xdr->buf->page_len & ~PAGE_MASK,
|
|
|
|
&read->rd_eof);
|
2018-03-29 01:29:11 +08:00
|
|
|
read->rd_length = maxcount;
|
2014-03-19 05:01:51 +08:00
|
|
|
if (nfserr)
|
2005-04-17 06:20:36 +08:00
|
|
|
return nfserr;
|
2022-07-23 04:09:10 +08:00
|
|
|
if (svc_encode_result_payload(resp->rqstp, starting_len, maxcount))
|
2020-03-03 03:45:53 +08:00
|
|
|
return nfserr_io;
|
2022-07-23 04:09:10 +08:00
|
|
|
xdr_truncate_encode(xdr, starting_len + xdr_align_size(maxcount));
|
2014-03-19 05:01:51 +08:00
|
|
|
|
2022-07-23 04:09:16 +08:00
|
|
|
write_bytes_to_xdr_buf(xdr->buf, starting_len + maxcount, &zero,
|
|
|
|
xdr_pad_size(maxcount));
|
|
|
|
return nfs_ok;
|
2014-03-19 05:01:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2014-03-19 05:01:51 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_read *read = &u->read;
|
2022-07-23 04:08:51 +08:00
|
|
|
bool splice_ok = test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags);
|
2014-03-19 05:01:51 +08:00
|
|
|
unsigned long maxcount;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2019-08-19 02:18:54 +08:00
|
|
|
struct file *file;
|
2014-03-19 05:01:51 +08:00
|
|
|
int starting_len = xdr->buf->len;
|
|
|
|
__be32 *p;
|
|
|
|
|
2019-08-19 02:18:54 +08:00
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
|
|
|
file = read->rd_nf->nf_file;
|
|
|
|
|
2014-03-19 05:01:51 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8); /* eof flag and byte count */
|
|
|
|
if (!p) {
|
2022-07-23 04:08:51 +08:00
|
|
|
WARN_ON_ONCE(splice_ok);
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr_resource;
|
2014-03-19 05:01:51 +08:00
|
|
|
}
|
2022-07-23 04:08:51 +08:00
|
|
|
if (resp->xdr->buf->page_len && splice_ok) {
|
2014-03-19 05:44:10 +08:00
|
|
|
WARN_ON_ONCE(1);
|
2022-09-14 02:01:50 +08:00
|
|
|
return nfserr_serverfault;
|
2014-03-19 05:01:51 +08:00
|
|
|
}
|
|
|
|
xdr_commit_encode(xdr);
|
|
|
|
|
2022-02-05 04:19:34 +08:00
|
|
|
maxcount = min_t(unsigned long, read->rd_length,
|
2015-06-18 22:45:02 +08:00
|
|
|
(xdr->buf->buflen - xdr->buf->len));
|
2014-03-19 05:01:51 +08:00
|
|
|
|
2022-07-23 04:08:51 +08:00
|
|
|
if (file->f_op->splice_read && splice_ok)
|
2015-06-18 22:45:01 +08:00
|
|
|
nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount);
|
2014-03-19 05:01:51 +08:00
|
|
|
else
|
2015-06-18 22:45:01 +08:00
|
|
|
nfserr = nfsd4_encode_readv(resp, read, file, maxcount);
|
2022-07-23 04:09:04 +08:00
|
|
|
if (nfserr) {
|
2014-03-19 05:01:51 +08:00
|
|
|
xdr_truncate_encode(xdr, starting_len);
|
2022-07-23 04:09:04 +08:00
|
|
|
return nfserr;
|
|
|
|
}
|
2015-06-18 22:45:01 +08:00
|
|
|
|
2022-07-23 04:09:04 +08:00
|
|
|
p = xdr_encode_bool(p, read->rd_eof);
|
|
|
|
*p = cpu_to_be32(read->rd_length);
|
|
|
|
return nfs_ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_readlink *readlink = &u->readlink;
|
2022-07-23 04:09:23 +08:00
|
|
|
__be32 *p, *maxcount_p, zero = xdr_zero;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-02-27 09:17:02 +08:00
|
|
|
int length_offset = xdr->buf->len;
|
2022-07-23 04:09:23 +08:00
|
|
|
int maxcount, status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2022-07-23 04:09:23 +08:00
|
|
|
maxcount_p = xdr_reserve_space(xdr, XDR_UNIT);
|
|
|
|
if (!maxcount_p)
|
2013-08-27 04:04:46 +08:00
|
|
|
return nfserr_resource;
|
2005-04-17 06:20:36 +08:00
|
|
|
maxcount = PAGE_SIZE;
|
2014-01-31 06:18:38 +08:00
|
|
|
|
2014-01-21 06:08:27 +08:00
|
|
|
p = xdr_reserve_space(xdr, maxcount);
|
|
|
|
if (!p)
|
2014-03-23 03:15:11 +08:00
|
|
|
return nfserr_resource;
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2016-12-09 23:45:04 +08:00
|
|
|
* XXX: By default, vfs_readlink() will truncate symlinks if they
|
|
|
|
* would overflow the buffer. Is this kosher in NFSv4? If not, one
|
|
|
|
* easy fix is: if vfs_readlink() precisely fills the buffer, assume
|
|
|
|
* that truncation occurred, and return NFS4ERR_RESOURCE.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2014-01-21 06:08:27 +08:00
|
|
|
nfserr = nfsd_readlink(readlink->rl_rqstp, readlink->rl_fhp,
|
|
|
|
(char *)p, &maxcount);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (nfserr == nfserr_isdir)
|
2014-02-27 06:00:38 +08:00
|
|
|
nfserr = nfserr_inval;
|
2020-11-05 23:24:19 +08:00
|
|
|
if (nfserr)
|
|
|
|
goto out_err;
|
|
|
|
status = svc_encode_result_payload(readlink->rl_rqstp, length_offset,
|
|
|
|
maxcount);
|
|
|
|
if (status) {
|
|
|
|
nfserr = nfserrno(status);
|
|
|
|
goto out_err;
|
2014-02-27 06:00:38 +08:00
|
|
|
}
|
2022-07-23 04:09:23 +08:00
|
|
|
*maxcount_p = cpu_to_be32(maxcount);
|
|
|
|
xdr_truncate_encode(xdr, length_offset + 4 + xdr_align_size(maxcount));
|
|
|
|
write_bytes_to_xdr_buf(xdr->buf, length_offset + 4 + maxcount, &zero,
|
|
|
|
xdr_pad_size(maxcount));
|
|
|
|
return nfs_ok;
|
2020-11-05 23:24:19 +08:00
|
|
|
|
|
|
|
out_err:
|
|
|
|
xdr_truncate_encode(xdr, length_offset);
|
|
|
|
return nfserr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-20 14:28:59 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_readdir *readdir = &u->readdir;
|
2005-04-17 06:20:36 +08:00
|
|
|
int maxcount;
|
2014-01-21 05:37:11 +08:00
|
|
|
int bytes_left;
|
2005-04-17 06:20:36 +08:00
|
|
|
loff_t offset;
|
2014-01-21 05:37:11 +08:00
|
|
|
__be64 wire_offset;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-02-27 09:17:02 +08:00
|
|
|
int starting_len = xdr->buf->len;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-16 22:26:09 +08:00
|
|
|
nfserr = nfsd4_encode_verifier4(xdr, &readdir->rd_verf);
|
|
|
|
if (nfserr != nfs_ok)
|
|
|
|
return nfserr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
2014-01-21 05:37:11 +08:00
|
|
|
* Number of bytes left for directory entries allowing for the
|
|
|
|
* final 8 bytes of the readdir and a following failed op:
|
|
|
|
*/
|
|
|
|
bytes_left = xdr->buf->buflen - xdr->buf->len
|
|
|
|
- COMPOUND_ERR_SLACK_SPACE - 8;
|
|
|
|
if (bytes_left < 0) {
|
|
|
|
nfserr = nfserr_resource;
|
|
|
|
goto err_no_verf;
|
|
|
|
}
|
2018-05-07 21:01:08 +08:00
|
|
|
maxcount = svc_max_payload(resp->rqstp);
|
|
|
|
maxcount = min_t(u32, readdir->rd_maxcount, maxcount);
|
2014-01-21 05:37:11 +08:00
|
|
|
/*
|
|
|
|
* Note the rfc defines rd_maxcount as the size of the
|
|
|
|
* READDIR4resok structure, which includes the verifier above
|
|
|
|
* and the 8 bytes encoded at the end of this function:
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2014-01-21 05:37:11 +08:00
|
|
|
if (maxcount < 16) {
|
|
|
|
nfserr = nfserr_toosmall;
|
2005-04-17 06:20:36 +08:00
|
|
|
goto err_no_verf;
|
|
|
|
}
|
2014-01-21 05:37:11 +08:00
|
|
|
maxcount = min_t(int, maxcount-16, bytes_left);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-08-21 02:49:50 +08:00
|
|
|
/* RFC 3530 14.2.24 allows us to ignore dircount when it's 0: */
|
|
|
|
if (!readdir->rd_dircount)
|
2018-05-07 21:01:08 +08:00
|
|
|
readdir->rd_dircount = svc_max_payload(resp->rqstp);
|
2014-08-21 02:49:50 +08:00
|
|
|
|
2014-01-21 05:37:11 +08:00
|
|
|
readdir->xdr = xdr;
|
|
|
|
readdir->rd_maxcount = maxcount;
|
2005-04-17 06:20:36 +08:00
|
|
|
readdir->common.err = 0;
|
2014-01-21 05:37:11 +08:00
|
|
|
readdir->cookie_offset = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
offset = readdir->rd_cookie;
|
|
|
|
nfserr = nfsd_readdir(readdir->rd_rqstp, readdir->rd_fhp,
|
|
|
|
&offset,
|
|
|
|
&readdir->common, nfsd4_encode_dirent);
|
|
|
|
if (nfserr == nfs_ok &&
|
|
|
|
readdir->common.err == nfserr_toosmall &&
|
2014-01-21 05:37:11 +08:00
|
|
|
xdr->buf->len == starting_len + 8) {
|
|
|
|
/* nothing encoded; which limit did we hit?: */
|
|
|
|
if (maxcount - 16 < bytes_left)
|
|
|
|
/* It was the fault of rd_maxcount: */
|
|
|
|
nfserr = nfserr_toosmall;
|
|
|
|
else
|
|
|
|
/* We ran out of buffer space: */
|
|
|
|
nfserr = nfserr_resource;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
if (nfserr)
|
|
|
|
goto err_no_verf;
|
|
|
|
|
2014-01-21 05:37:11 +08:00
|
|
|
if (readdir->cookie_offset) {
|
|
|
|
wire_offset = cpu_to_be64(offset);
|
|
|
|
write_bytes_to_xdr_buf(xdr->buf, readdir->cookie_offset,
|
|
|
|
&wire_offset, 8);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-01-21 05:37:11 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p) {
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
goto err_no_verf;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
*p++ = 0; /* no more entries */
|
|
|
|
*p++ = htonl(readdir->common.err == nfserr_eof);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
err_no_verf:
|
2014-02-27 09:17:02 +08:00
|
|
|
xdr_truncate_encode(xdr, starting_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
return nfserr;
|
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_remove(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_remove *remove = &u->remove;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-16 22:26:15 +08:00
|
|
|
return nfsd4_encode_change_info4(xdr, &remove->rm_cinfo);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_rename(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_rename *rename = &u->rename;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-16 22:26:15 +08:00
|
|
|
nfserr = nfsd4_encode_change_info4(xdr, &rename->rn_sinfo);
|
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
|
|
|
return nfsd4_encode_change_info4(xdr, &rename->rn_tinfo);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
2017-05-06 23:12:04 +08:00
|
|
|
nfsd4_do_encode_secinfo(struct xdr_stream *xdr, struct svc_export *exp)
|
2007-07-17 19:04:51 +08:00
|
|
|
{
|
2013-05-01 06:48:54 +08:00
|
|
|
u32 i, nflavs, supported;
|
2007-07-17 19:04:51 +08:00
|
|
|
struct exp_flavor_info *flavs;
|
|
|
|
struct exp_flavor_info def_flavs[2];
|
2013-05-01 06:48:54 +08:00
|
|
|
__be32 *p, *flavorsp;
|
|
|
|
static bool report = true;
|
2007-07-17 19:04:51 +08:00
|
|
|
|
2007-07-17 19:04:51 +08:00
|
|
|
if (exp->ex_nflavors) {
|
|
|
|
flavs = exp->ex_flavors;
|
|
|
|
nflavs = exp->ex_nflavors;
|
|
|
|
} else { /* Handling of some defaults in absence of real secinfo: */
|
|
|
|
flavs = def_flavs;
|
|
|
|
if (exp->ex_client->flavour->flavour == RPC_AUTH_UNIX) {
|
|
|
|
nflavs = 2;
|
|
|
|
flavs[0].pseudoflavor = RPC_AUTH_UNIX;
|
|
|
|
flavs[1].pseudoflavor = RPC_AUTH_NULL;
|
|
|
|
} else if (exp->ex_client->flavour->flavour == RPC_AUTH_GSS) {
|
|
|
|
nflavs = 1;
|
|
|
|
flavs[0].pseudoflavor
|
|
|
|
= svcauth_gss_flavor(exp->ex_client);
|
|
|
|
} else {
|
|
|
|
nflavs = 1;
|
|
|
|
flavs[0].pseudoflavor
|
|
|
|
= exp->ex_client->flavour->flavour;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-01 06:48:54 +08:00
|
|
|
supported = 0;
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr_resource;
|
2013-05-01 06:48:54 +08:00
|
|
|
flavorsp = p++; /* to be backfilled later */
|
|
|
|
|
2007-07-17 19:04:51 +08:00
|
|
|
for (i = 0; i < nflavs; i++) {
|
2013-05-01 06:48:54 +08:00
|
|
|
rpc_authflavor_t pf = flavs[i].pseudoflavor;
|
2013-03-17 03:55:10 +08:00
|
|
|
struct rpcsec_gss_info info;
|
2007-07-17 19:04:51 +08:00
|
|
|
|
2013-05-01 06:48:54 +08:00
|
|
|
if (rpcauth_get_gssinfo(pf, &info) == 0) {
|
|
|
|
supported++;
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4 + 4 +
|
|
|
|
XDR_LEN(info.oid.len) + 4 + 4);
|
|
|
|
if (!p)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(RPC_AUTH_GSS);
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque(p, info.oid.data, info.oid.len);
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(info.qop);
|
|
|
|
*p++ = cpu_to_be32(info.service);
|
2013-05-01 06:48:54 +08:00
|
|
|
} else if (pf < RPC_AUTH_MAXFLAVOR) {
|
|
|
|
supported++;
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(pf);
|
2013-05-01 06:48:54 +08:00
|
|
|
} else {
|
|
|
|
if (report)
|
|
|
|
pr_warn("NFS: SECINFO: security flavor %u "
|
|
|
|
"is not supported\n", pf);
|
2007-07-17 19:04:51 +08:00
|
|
|
}
|
|
|
|
}
|
2013-03-17 03:55:10 +08:00
|
|
|
|
2013-05-01 06:48:54 +08:00
|
|
|
if (nflavs != supported)
|
|
|
|
report = false;
|
|
|
|
*flavorsp = htonl(supported);
|
2017-05-06 23:12:04 +08:00
|
|
|
return 0;
|
2007-07-17 19:04:51 +08:00
|
|
|
}
|
|
|
|
|
2010-12-27 14:29:57 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2010-12-27 14:29:57 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_secinfo *secinfo = &u->secinfo;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-01-31 06:18:38 +08:00
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfsd4_do_encode_secinfo(xdr, secinfo->si_exp);
|
2010-12-27 14:29:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_secinfo_no_name(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2010-12-27 14:29:57 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_secinfo_no_name *secinfo = &u->secinfo_no_name;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2014-01-31 06:18:38 +08:00
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfsd4_do_encode_secinfo(xdr, secinfo->sin_exp);
|
2010-12-27 14:29:57 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* The SETATTR encode routine is special -- it always encodes a bitmap,
|
|
|
|
* regardless of the error status.
|
|
|
|
*/
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_setattr(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_setattr *setattr = &u->setattr;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 16);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (nfserr) {
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(3);
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
*p++ = cpu_to_be32(0);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
else {
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(3);
|
|
|
|
*p++ = cpu_to_be32(setattr->sa_bmval[0]);
|
|
|
|
*p++ = cpu_to_be32(setattr->sa_bmval[1]);
|
|
|
|
*p++ = cpu_to_be32(setattr->sa_bmval[2]);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2008-07-04 19:38:33 +08:00
|
|
|
return nfserr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_setclientid(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_setclientid *scd = &u->setclientid;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (!nfserr) {
|
2023-05-16 22:26:09 +08:00
|
|
|
nfserr = nfsd4_encode_clientid4(xdr, &scd->se_clientid);
|
|
|
|
if (nfserr != nfs_ok)
|
|
|
|
goto out;
|
|
|
|
nfserr = nfsd4_encode_verifier4(xdr, &scd->se_confirm);
|
|
|
|
} else if (nfserr == nfserr_clid_inuse) {
|
|
|
|
/* empty network id */
|
|
|
|
if (xdr_stream_encode_u32(xdr, 0) < 0) {
|
|
|
|
nfserr = nfserr_resource;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* empty universal address */
|
|
|
|
if (xdr_stream_encode_u32(xdr, 0) < 0) {
|
|
|
|
nfserr = nfserr_resource;
|
|
|
|
goto out;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2023-05-16 22:26:09 +08:00
|
|
|
out:
|
2008-07-04 19:38:33 +08:00
|
|
|
return nfserr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_write(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *u)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_write *write = &u->write;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2023-05-16 22:26:09 +08:00
|
|
|
if (xdr_stream_encode_u32(resp->xdr, write->wr_bytes_written) < 0)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr_resource;
|
2023-05-16 22:26:09 +08:00
|
|
|
if (xdr_stream_encode_u32(resp->xdr, write->wr_how_written) < 0)
|
|
|
|
return nfserr_resource;
|
|
|
|
return nfsd4_encode_verifier4(resp->xdr, &write->wr_verifier);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2009-04-03 13:27:55 +08:00
|
|
|
static __be32
|
2012-04-26 05:58:50 +08:00
|
|
|
nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2009-04-03 13:27:55 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_exchange_id *exid = &u->exchange_id;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2009-04-03 13:28:01 +08:00
|
|
|
char *major_id;
|
|
|
|
char *server_scope;
|
|
|
|
int major_id_sz;
|
|
|
|
int server_scope_sz;
|
|
|
|
uint64_t minor_id = 0;
|
2020-02-20 04:52:15 +08:00
|
|
|
struct nfsd_net *nn = net_generic(SVC_NET(resp->rqstp), nfsd_net_id);
|
2009-04-03 13:28:01 +08:00
|
|
|
|
2020-02-20 04:52:15 +08:00
|
|
|
major_id = nn->nfsd_name;
|
|
|
|
major_id_sz = strlen(nn->nfsd_name);
|
|
|
|
server_scope = nn->nfsd_name;
|
|
|
|
server_scope_sz = strlen(nn->nfsd_name);
|
2009-04-03 13:28:01 +08:00
|
|
|
|
2023-05-16 22:26:09 +08:00
|
|
|
if (nfsd4_encode_clientid4(xdr, &exid->clientid) != nfs_ok)
|
|
|
|
return nfserr_resource;
|
|
|
|
if (xdr_stream_encode_u32(xdr, exid->seqid) < 0)
|
|
|
|
return nfserr_resource;
|
|
|
|
if (xdr_stream_encode_u32(xdr, exid->flags) < 0)
|
2014-01-31 06:18:38 +08:00
|
|
|
return nfserr_resource;
|
2009-04-03 13:28:01 +08:00
|
|
|
|
2023-05-16 22:26:09 +08:00
|
|
|
if (xdr_stream_encode_u32(xdr, exid->spa_how) < 0)
|
|
|
|
return nfserr_resource;
|
2013-04-14 02:27:29 +08:00
|
|
|
switch (exid->spa_how) {
|
|
|
|
case SP4_NONE:
|
|
|
|
break;
|
|
|
|
case SP4_MACH_CRED:
|
|
|
|
/* spo_must_enforce bitmap: */
|
2017-05-06 23:12:04 +08:00
|
|
|
nfserr = nfsd4_encode_bitmap(xdr,
|
2016-06-16 00:52:09 +08:00
|
|
|
exid->spo_must_enforce[0],
|
|
|
|
exid->spo_must_enforce[1],
|
|
|
|
exid->spo_must_enforce[2]);
|
2017-05-06 23:12:04 +08:00
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
2016-06-16 00:52:09 +08:00
|
|
|
/* spo_must_allow bitmap: */
|
2017-05-06 23:12:04 +08:00
|
|
|
nfserr = nfsd4_encode_bitmap(xdr,
|
2016-06-16 00:52:09 +08:00
|
|
|
exid->spo_must_allow[0],
|
|
|
|
exid->spo_must_allow[1],
|
|
|
|
exid->spo_must_allow[2]);
|
2017-05-06 23:12:04 +08:00
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
2013-04-14 02:27:29 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
}
|
2009-04-03 13:28:01 +08:00
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr,
|
2013-12-10 15:24:36 +08:00
|
|
|
8 /* so_minor_id */ +
|
|
|
|
4 /* so_major_id.len */ +
|
|
|
|
(XDR_QUADLEN(major_id_sz) * 4) +
|
|
|
|
4 /* eir_server_scope.len */ +
|
|
|
|
(XDR_QUADLEN(server_scope_sz) * 4) +
|
|
|
|
4 /* eir_server_impl_id.count (0) */);
|
2014-01-31 06:18:38 +08:00
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2013-12-10 15:24:36 +08:00
|
|
|
|
2009-04-03 13:28:01 +08:00
|
|
|
/* The server_owner struct */
|
2014-03-23 05:11:35 +08:00
|
|
|
p = xdr_encode_hyper(p, minor_id); /* Minor id */
|
2009-04-03 13:28:01 +08:00
|
|
|
/* major id */
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque(p, major_id, major_id_sz);
|
2009-04-03 13:28:01 +08:00
|
|
|
|
|
|
|
/* Server scope */
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque(p, server_scope, server_scope_sz);
|
2009-04-03 13:28:01 +08:00
|
|
|
|
|
|
|
/* Implementation id */
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0); /* zero length nfs_impl_id4 array */
|
2009-04-03 13:28:01 +08:00
|
|
|
return 0;
|
2009-04-03 13:27:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
2012-04-26 05:58:50 +08:00
|
|
|
nfsd4_encode_create_session(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2009-04-03 13:27:55 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_create_session *sess = &u->create_session;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2009-04-03 13:28:28 +08:00
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 24);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque_fixed(p, sess->sessionid.data,
|
|
|
|
NFS4_MAX_SESSIONID_LEN);
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(sess->seqid);
|
|
|
|
*p++ = cpu_to_be32(sess->flags);
|
2009-04-03 13:28:28 +08:00
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 28);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0); /* headerpadsz */
|
|
|
|
*p++ = cpu_to_be32(sess->fore_channel.maxreq_sz);
|
|
|
|
*p++ = cpu_to_be32(sess->fore_channel.maxresp_sz);
|
|
|
|
*p++ = cpu_to_be32(sess->fore_channel.maxresp_cached);
|
|
|
|
*p++ = cpu_to_be32(sess->fore_channel.maxops);
|
|
|
|
*p++ = cpu_to_be32(sess->fore_channel.maxreqs);
|
|
|
|
*p++ = cpu_to_be32(sess->fore_channel.nr_rdma_attrs);
|
2009-04-03 13:28:28 +08:00
|
|
|
|
|
|
|
if (sess->fore_channel.nr_rdma_attrs) {
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(sess->fore_channel.rdma_attrs);
|
2009-04-03 13:28:28 +08:00
|
|
|
}
|
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 28);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(0); /* headerpadsz */
|
|
|
|
*p++ = cpu_to_be32(sess->back_channel.maxreq_sz);
|
|
|
|
*p++ = cpu_to_be32(sess->back_channel.maxresp_sz);
|
|
|
|
*p++ = cpu_to_be32(sess->back_channel.maxresp_cached);
|
|
|
|
*p++ = cpu_to_be32(sess->back_channel.maxops);
|
|
|
|
*p++ = cpu_to_be32(sess->back_channel.maxreqs);
|
|
|
|
*p++ = cpu_to_be32(sess->back_channel.nr_rdma_attrs);
|
2009-04-03 13:28:28 +08:00
|
|
|
|
|
|
|
if (sess->back_channel.nr_rdma_attrs) {
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(sess->back_channel.rdma_attrs);
|
2009-04-03 13:28:28 +08:00
|
|
|
}
|
|
|
|
return 0;
|
2009-04-03 13:27:55 +08:00
|
|
|
}
|
|
|
|
|
2011-05-16 22:38:14 +08:00
|
|
|
static __be32
|
2012-04-26 05:58:50 +08:00
|
|
|
nfsd4_encode_sequence(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2009-04-03 13:27:55 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_sequence *seq = &u->sequence;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2009-04-03 13:28:08 +08:00
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, NFS4_MAX_SESSIONID_LEN + 20);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque_fixed(p, seq->sessionid.data,
|
|
|
|
NFS4_MAX_SESSIONID_LEN);
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(seq->seqid);
|
|
|
|
*p++ = cpu_to_be32(seq->slotid);
|
2011-09-01 03:39:30 +08:00
|
|
|
/* Note slotid's are numbered from zero: */
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(seq->maxslots - 1); /* sr_highest_slotid */
|
|
|
|
*p++ = cpu_to_be32(seq->maxslots - 1); /* sr_target_highest_slotid */
|
|
|
|
*p++ = cpu_to_be32(seq->status_flags);
|
2009-04-03 13:28:08 +08:00
|
|
|
|
2014-03-22 05:57:57 +08:00
|
|
|
resp->cstate.data_offset = xdr->buf->len; /* DRC cache data pointer */
|
2009-04-03 13:28:08 +08:00
|
|
|
return 0;
|
2009-04-03 13:27:55 +08:00
|
|
|
}
|
|
|
|
|
2012-04-26 04:56:22 +08:00
|
|
|
static __be32
|
2012-04-26 05:58:50 +08:00
|
|
|
nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2011-07-13 22:50:48 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_test_stateid *test_stateid = &u->test_stateid;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2012-01-27 23:22:49 +08:00
|
|
|
struct nfsd4_test_stateid_id *stateid, *next;
|
2011-07-13 22:50:48 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4 + (4 * test_stateid->ts_num_ids));
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2011-07-13 22:50:48 +08:00
|
|
|
*p++ = htonl(test_stateid->ts_num_ids);
|
|
|
|
|
2012-01-27 23:22:49 +08:00
|
|
|
list_for_each_entry_safe(stateid, next, &test_stateid->ts_stateid_list, ts_id_list) {
|
2012-04-13 12:10:34 +08:00
|
|
|
*p++ = stateid->ts_id_status;
|
2011-07-13 22:50:48 +08:00
|
|
|
}
|
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return 0;
|
2011-07-13 22:50:48 +08:00
|
|
|
}
|
|
|
|
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#ifdef CONFIG_NFSD_PNFS
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_getdeviceinfo(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_getdeviceinfo *gdev = &u->getdeviceinfo;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2017-05-06 04:17:57 +08:00
|
|
|
const struct nfsd4_layout_ops *ops;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
u32 starting_len = xdr->buf->len, needed_len;
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr_resource;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
|
|
|
|
*p++ = cpu_to_be32(gdev->gd_layout_type);
|
|
|
|
|
|
|
|
/* If maxcount is 0 then just update notifications */
|
|
|
|
if (gdev->gd_maxcount != 0) {
|
2017-05-06 04:17:57 +08:00
|
|
|
ops = nfsd4_layout_ops[gdev->gd_layout_type];
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
nfserr = ops->encode_getdeviceinfo(xdr, gdev);
|
|
|
|
if (nfserr) {
|
|
|
|
/*
|
|
|
|
* We don't bother to burden the layout drivers with
|
|
|
|
* enforcing gd_maxcount, just tell the client to
|
|
|
|
* come back with a bigger buffer if it's not enough.
|
|
|
|
*/
|
|
|
|
if (xdr->buf->len + 4 > gdev->gd_maxcount)
|
|
|
|
goto toosmall;
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gdev->gd_notify_types) {
|
|
|
|
p = xdr_reserve_space(xdr, 4 + 4);
|
|
|
|
if (!p)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr_resource;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
*p++ = cpu_to_be32(1); /* bitmap length */
|
|
|
|
*p++ = cpu_to_be32(gdev->gd_notify_types);
|
|
|
|
} else {
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr_resource;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
*p++ = 0;
|
|
|
|
}
|
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return 0;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
toosmall:
|
|
|
|
dprintk("%s: maxcount too small\n", __func__);
|
|
|
|
needed_len = xdr->buf->len + 4 /* notifications */;
|
|
|
|
xdr_truncate_encode(xdr, starting_len);
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
2017-05-06 23:12:04 +08:00
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
*p++ = cpu_to_be32(needed_len);
|
|
|
|
return nfserr_toosmall;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_layoutget(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_layoutget *lgp = &u->layoutget;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2017-05-06 04:17:57 +08:00
|
|
|
const struct nfsd4_layout_ops *ops;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 36 + sizeof(stateid_opaque_t));
|
|
|
|
if (!p)
|
2017-05-06 23:12:04 +08:00
|
|
|
return nfserr_resource;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
|
|
|
|
*p++ = cpu_to_be32(1); /* we always set return-on-close */
|
|
|
|
*p++ = cpu_to_be32(lgp->lg_sid.si_generation);
|
|
|
|
p = xdr_encode_opaque_fixed(p, &lgp->lg_sid.si_opaque,
|
|
|
|
sizeof(stateid_opaque_t));
|
|
|
|
|
|
|
|
*p++ = cpu_to_be32(1); /* we always return a single layout */
|
|
|
|
p = xdr_encode_hyper(p, lgp->lg_seg.offset);
|
|
|
|
p = xdr_encode_hyper(p, lgp->lg_seg.length);
|
|
|
|
*p++ = cpu_to_be32(lgp->lg_seg.iomode);
|
|
|
|
*p++ = cpu_to_be32(lgp->lg_layout_type);
|
|
|
|
|
2017-05-06 04:17:57 +08:00
|
|
|
ops = nfsd4_layout_ops[lgp->lg_layout_type];
|
2017-05-06 23:12:04 +08:00
|
|
|
return ops->encode_layoutget(xdr, lgp);
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_layoutcommit(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_layoutcommit *lcp = &u->layoutcommit;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
*p++ = cpu_to_be32(lcp->lc_size_chg);
|
|
|
|
if (lcp->lc_size_chg) {
|
|
|
|
p = xdr_reserve_space(xdr, 8);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
p = xdr_encode_hyper(p, lcp->lc_newsize);
|
|
|
|
}
|
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return 0;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_layoutreturn(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_layoutreturn *lrp = &u->layoutreturn;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
*p++ = cpu_to_be32(lrp->lrs_present);
|
|
|
|
if (lrp->lrs_present)
|
2015-03-22 22:17:10 +08:00
|
|
|
return nfsd4_encode_stateid(xdr, &lrp->lr_sid);
|
2017-05-06 23:12:04 +08:00
|
|
|
return 0;
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
}
|
|
|
|
#endif /* CONFIG_NFSD_PNFS */
|
|
|
|
|
2016-09-08 03:57:30 +08:00
|
|
|
static __be32
|
2018-07-21 06:19:20 +08:00
|
|
|
nfsd42_encode_write_res(struct nfsd4_compoundres *resp,
|
|
|
|
struct nfsd42_write_res *write, bool sync)
|
2016-09-08 03:57:30 +08:00
|
|
|
{
|
|
|
|
__be32 *p;
|
2020-10-28 03:53:42 +08:00
|
|
|
p = xdr_reserve_space(resp->xdr, 4);
|
2018-07-21 06:19:20 +08:00
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
2016-09-08 03:57:30 +08:00
|
|
|
|
2018-07-21 06:19:20 +08:00
|
|
|
if (sync)
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
else {
|
|
|
|
__be32 nfserr;
|
|
|
|
*p++ = cpu_to_be32(1);
|
2020-10-28 03:53:42 +08:00
|
|
|
nfserr = nfsd4_encode_stateid(resp->xdr, &write->cb_stateid);
|
2018-07-21 06:19:20 +08:00
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
|
|
|
}
|
2020-10-28 03:53:42 +08:00
|
|
|
p = xdr_reserve_space(resp->xdr, 8 + 4 + NFS4_VERIFIER_SIZE);
|
2016-09-08 03:57:30 +08:00
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
p = xdr_encode_hyper(p, write->wr_bytes_written);
|
|
|
|
*p++ = cpu_to_be32(write->wr_stable_how);
|
|
|
|
p = xdr_encode_opaque_fixed(p, write->wr_verifier.data,
|
|
|
|
NFS4_VERIFIER_SIZE);
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2019-08-08 23:14:59 +08:00
|
|
|
static __be32
|
|
|
|
nfsd42_encode_nl4_server(struct nfsd4_compoundres *resp, struct nl4_server *ns)
|
|
|
|
{
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2019-08-08 23:14:59 +08:00
|
|
|
struct nfs42_netaddr *addr;
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
*p++ = cpu_to_be32(ns->nl4_type);
|
|
|
|
|
|
|
|
switch (ns->nl4_type) {
|
|
|
|
case NL4_NETADDR:
|
|
|
|
addr = &ns->u.nl4_addr;
|
|
|
|
|
|
|
|
/* netid_len, netid, uaddr_len, uaddr (port included
|
|
|
|
* in RPCBIND_MAXUADDRLEN)
|
|
|
|
*/
|
|
|
|
p = xdr_reserve_space(xdr,
|
|
|
|
4 /* netid len */ +
|
|
|
|
(XDR_QUADLEN(addr->netid_len) * 4) +
|
|
|
|
4 /* uaddr len */ +
|
|
|
|
(XDR_QUADLEN(addr->addr_len) * 4));
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
*p++ = cpu_to_be32(addr->netid_len);
|
|
|
|
p = xdr_encode_opaque_fixed(p, addr->netid,
|
|
|
|
addr->netid_len);
|
|
|
|
*p++ = cpu_to_be32(addr->addr_len);
|
|
|
|
p = xdr_encode_opaque_fixed(p, addr->addr,
|
|
|
|
addr->addr_len);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
WARN_ON_ONCE(ns->nl4_type != NL4_NETADDR);
|
|
|
|
return nfserr_inval;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-09-08 03:57:30 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_copy(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2016-09-08 03:57:30 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_copy *copy = &u->copy;
|
2016-09-08 03:57:30 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
2018-07-21 06:19:20 +08:00
|
|
|
nfserr = nfsd42_encode_write_res(resp, ©->cp_res,
|
2022-07-28 02:40:41 +08:00
|
|
|
nfsd4_copy_is_sync(copy));
|
2017-05-06 23:12:04 +08:00
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
2016-09-08 03:57:30 +08:00
|
|
|
|
2020-10-28 03:53:42 +08:00
|
|
|
p = xdr_reserve_space(resp->xdr, 4 + 4);
|
2018-03-08 04:37:35 +08:00
|
|
|
*p++ = xdr_one; /* cr_consecutive */
|
2022-07-28 02:40:41 +08:00
|
|
|
*p = nfsd4_copy_is_sync(copy) ? xdr_one : xdr_zero;
|
2017-05-06 23:12:04 +08:00
|
|
|
return 0;
|
2016-09-08 03:57:30 +08:00
|
|
|
}
|
|
|
|
|
2018-07-21 06:19:18 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_offload_status(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2018-07-21 06:19:18 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_offload_status *os = &u->offload_status;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2018-07-21 06:19:18 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 8 + 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
p = xdr_encode_hyper(p, os->count);
|
|
|
|
*p++ = cpu_to_be32(0);
|
2020-09-29 01:08:58 +08:00
|
|
|
return nfserr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp,
|
2022-09-14 02:01:51 +08:00
|
|
|
struct nfsd4_read *read)
|
2020-09-29 01:08:58 +08:00
|
|
|
{
|
2022-09-14 02:01:51 +08:00
|
|
|
bool splice_ok = test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags);
|
2020-09-29 01:08:58 +08:00
|
|
|
struct file *file = read->rd_nf->nf_file;
|
2022-09-14 02:01:51 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
|
|
|
unsigned long maxcount;
|
|
|
|
__be32 nfserr, *p;
|
2020-09-29 01:08:58 +08:00
|
|
|
|
|
|
|
/* Content type, offset, byte count */
|
|
|
|
p = xdr_reserve_space(xdr, 4 + 8 + 4);
|
|
|
|
if (!p)
|
2022-09-14 02:01:51 +08:00
|
|
|
return nfserr_io;
|
|
|
|
if (resp->xdr->buf->page_len && splice_ok) {
|
|
|
|
WARN_ON_ONCE(splice_ok);
|
|
|
|
return nfserr_serverfault;
|
|
|
|
}
|
2020-09-29 01:08:58 +08:00
|
|
|
|
2022-09-14 02:01:51 +08:00
|
|
|
maxcount = min_t(unsigned long, read->rd_length,
|
|
|
|
(xdr->buf->buflen - xdr->buf->len));
|
2020-09-29 01:08:58 +08:00
|
|
|
|
2022-09-14 02:01:51 +08:00
|
|
|
if (file->f_op->splice_read && splice_ok)
|
|
|
|
nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount);
|
|
|
|
else
|
|
|
|
nfserr = nfsd4_encode_readv(resp, read, file, maxcount);
|
2020-09-29 01:08:58 +08:00
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
2020-09-29 01:09:00 +08:00
|
|
|
|
2022-09-14 02:01:51 +08:00
|
|
|
*p++ = cpu_to_be32(NFS4_CONTENT_DATA);
|
2021-12-02 16:35:42 +08:00
|
|
|
p = xdr_encode_hyper(p, read->rd_offset);
|
2022-09-14 02:01:51 +08:00
|
|
|
*p = cpu_to_be32(read->rd_length);
|
2020-09-29 01:08:59 +08:00
|
|
|
|
|
|
|
return nfs_ok;
|
|
|
|
}
|
|
|
|
|
2020-09-29 01:08:58 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-09-29 01:08:58 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_read *read = &u->read;
|
2022-09-14 02:01:51 +08:00
|
|
|
struct file *file = read->rd_nf->nf_file;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2020-09-29 01:08:58 +08:00
|
|
|
int starting_len = xdr->buf->len;
|
2022-09-14 02:01:51 +08:00
|
|
|
u32 segments = 0;
|
|
|
|
__be32 *p;
|
2020-09-29 01:08:58 +08:00
|
|
|
|
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
|
|
|
|
|
|
|
/* eof flag, segment count */
|
|
|
|
p = xdr_reserve_space(xdr, 4 + 4);
|
|
|
|
if (!p)
|
2022-09-14 02:01:51 +08:00
|
|
|
return nfserr_io;
|
2020-09-29 01:08:58 +08:00
|
|
|
xdr_commit_encode(xdr);
|
|
|
|
|
2022-09-14 02:01:51 +08:00
|
|
|
read->rd_eof = read->rd_offset >= i_size_read(file_inode(file));
|
|
|
|
if (read->rd_eof)
|
2020-09-29 01:08:59 +08:00
|
|
|
goto out;
|
|
|
|
|
2022-09-14 02:01:51 +08:00
|
|
|
nfserr = nfsd4_encode_read_plus_data(resp, read);
|
|
|
|
if (nfserr) {
|
2020-09-29 01:08:58 +08:00
|
|
|
xdr_truncate_encode(xdr, starting_len);
|
2022-09-14 02:01:51 +08:00
|
|
|
return nfserr;
|
2020-09-29 01:08:58 +08:00
|
|
|
}
|
2018-07-21 06:19:18 +08:00
|
|
|
|
2022-09-14 02:01:51 +08:00
|
|
|
segments++;
|
|
|
|
|
|
|
|
out:
|
|
|
|
p = xdr_encode_bool(p, read->rd_eof);
|
|
|
|
*p = cpu_to_be32(segments);
|
2018-07-21 06:19:18 +08:00
|
|
|
return nfserr;
|
|
|
|
}
|
|
|
|
|
2019-08-08 23:14:59 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_copy_notify(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2019-08-08 23:14:59 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_copy_notify *cn = &u->copy_notify;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2019-08-08 23:14:59 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
|
|
|
|
|
|
|
/* 8 sec, 4 nsec */
|
|
|
|
p = xdr_reserve_space(xdr, 12);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
/* cnr_lease_time */
|
|
|
|
p = xdr_encode_hyper(p, cn->cpn_sec);
|
|
|
|
*p++ = cpu_to_be32(cn->cpn_nsec);
|
|
|
|
|
|
|
|
/* cnr_stateid */
|
|
|
|
nfserr = nfsd4_encode_stateid(xdr, &cn->cpn_cnr_stateid);
|
|
|
|
if (nfserr)
|
|
|
|
return nfserr;
|
|
|
|
|
|
|
|
/* cnr_src.nl_nsvr */
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
*p++ = cpu_to_be32(1);
|
|
|
|
|
2022-07-28 02:40:16 +08:00
|
|
|
nfserr = nfsd42_encode_nl4_server(resp, cn->cpn_src);
|
|
|
|
return nfserr;
|
2019-08-08 23:14:59 +08:00
|
|
|
}
|
|
|
|
|
2014-09-27 01:58:27 +08:00
|
|
|
static __be32
|
|
|
|
nfsd4_encode_seek(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2014-09-27 01:58:27 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_seek *seek = &u->seek;
|
2014-09-27 01:58:27 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
2020-10-28 03:53:42 +08:00
|
|
|
p = xdr_reserve_space(resp->xdr, 4 + 8);
|
2014-09-27 01:58:27 +08:00
|
|
|
*p++ = cpu_to_be32(seek->seek_eof);
|
|
|
|
p = xdr_encode_hyper(p, seek->seek_pos);
|
|
|
|
|
2017-05-06 23:12:04 +08:00
|
|
|
return 0;
|
2014-09-27 01:58:27 +08:00
|
|
|
}
|
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
static __be32
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
nfsd4_encode_noop(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
union nfsd4_op_u *p)
|
2008-07-04 19:38:33 +08:00
|
|
|
{
|
|
|
|
return nfserr;
|
|
|
|
}
|
|
|
|
|
2020-06-24 06:39:26 +08:00
|
|
|
/*
|
|
|
|
* Encode kmalloc-ed buffer in to XDR stream.
|
|
|
|
*/
|
2020-09-12 02:47:53 +08:00
|
|
|
static __be32
|
2020-06-24 06:39:26 +08:00
|
|
|
nfsd4_vbuf_to_stream(struct xdr_stream *xdr, char *buf, u32 buflen)
|
|
|
|
{
|
|
|
|
u32 cplen;
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
cplen = min_t(unsigned long, buflen,
|
|
|
|
((void *)xdr->end - (void *)xdr->p));
|
|
|
|
p = xdr_reserve_space(xdr, cplen);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
memcpy(p, buf, cplen);
|
|
|
|
buf += cplen;
|
|
|
|
buflen -= cplen;
|
|
|
|
|
|
|
|
while (buflen) {
|
|
|
|
cplen = min_t(u32, buflen, PAGE_SIZE);
|
|
|
|
p = xdr_reserve_space(xdr, cplen);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
memcpy(p, buf, cplen);
|
|
|
|
|
|
|
|
if (cplen < PAGE_SIZE) {
|
|
|
|
/*
|
|
|
|
* We're done, with a length that wasn't page
|
|
|
|
* aligned, so possibly not word aligned. Pad
|
|
|
|
* any trailing bytes with 0.
|
|
|
|
*/
|
|
|
|
xdr_encode_opaque_fixed(p, NULL, cplen);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
buflen -= PAGE_SIZE;
|
|
|
|
buf += PAGE_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_getxattr(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-06-24 06:39:26 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_getxattr *getxattr = &u->getxattr;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
__be32 *p, err;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p)
|
|
|
|
return nfserr_resource;
|
|
|
|
|
|
|
|
*p = cpu_to_be32(getxattr->getxa_len);
|
|
|
|
|
|
|
|
if (getxattr->getxa_len == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err = nfsd4_vbuf_to_stream(xdr, getxattr->getxa_buf,
|
|
|
|
getxattr->getxa_len);
|
|
|
|
|
|
|
|
kvfree(getxattr->getxa_buf);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_setxattr(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-06-24 06:39:26 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_setxattr *setxattr = &u->setxattr;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
|
2023-05-16 22:26:15 +08:00
|
|
|
return nfsd4_encode_change_info4(xdr, &setxattr->setxa_cinfo);
|
2020-06-24 06:39:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* See if there are cookie values that can be rejected outright.
|
|
|
|
*/
|
|
|
|
static __be32
|
|
|
|
nfsd4_listxattr_validate_cookie(struct nfsd4_listxattrs *listxattrs,
|
|
|
|
u32 *offsetp)
|
|
|
|
{
|
|
|
|
u64 cookie = listxattrs->lsxa_cookie;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the cookie is larger than the maximum number we can fit
|
|
|
|
* in either the buffer we just got back from vfs_listxattr, or,
|
|
|
|
* XDR-encoded, in the return buffer, it's invalid.
|
|
|
|
*/
|
|
|
|
if (cookie > (listxattrs->lsxa_len) / (XATTR_USER_PREFIX_LEN + 2))
|
|
|
|
return nfserr_badcookie;
|
|
|
|
|
|
|
|
if (cookie > (listxattrs->lsxa_maxcount /
|
|
|
|
(XDR_QUADLEN(XATTR_USER_PREFIX_LEN + 2) + 4)))
|
|
|
|
return nfserr_badcookie;
|
|
|
|
|
|
|
|
*offsetp = (u32)cookie;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-06-24 06:39:26 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_listxattrs *listxattrs = &u->listxattrs;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
u32 cookie_offset, count_offset, eof;
|
|
|
|
u32 left, xdrleft, slen, count;
|
|
|
|
u32 xdrlen, offset;
|
|
|
|
u64 cookie;
|
|
|
|
char *sp;
|
2020-09-12 02:47:53 +08:00
|
|
|
__be32 status, tmp;
|
2020-06-24 06:39:26 +08:00
|
|
|
__be32 *p;
|
|
|
|
u32 nuser;
|
|
|
|
|
|
|
|
eof = 1;
|
|
|
|
|
|
|
|
status = nfsd4_listxattr_validate_cookie(listxattrs, &offset);
|
|
|
|
if (status)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reserve space for the cookie and the name array count. Record
|
|
|
|
* the offsets to save them later.
|
|
|
|
*/
|
|
|
|
cookie_offset = xdr->buf->len;
|
|
|
|
count_offset = cookie_offset + 8;
|
|
|
|
p = xdr_reserve_space(xdr, 12);
|
|
|
|
if (!p) {
|
|
|
|
status = nfserr_resource;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
count = 0;
|
|
|
|
left = listxattrs->lsxa_len;
|
|
|
|
sp = listxattrs->lsxa_buf;
|
|
|
|
nuser = 0;
|
|
|
|
|
|
|
|
xdrleft = listxattrs->lsxa_maxcount;
|
|
|
|
|
|
|
|
while (left > 0 && xdrleft > 0) {
|
|
|
|
slen = strlen(sp);
|
|
|
|
|
|
|
|
/*
|
2020-08-18 01:51:26 +08:00
|
|
|
* Check if this is a "user." attribute, skip it if not.
|
2020-06-24 06:39:26 +08:00
|
|
|
*/
|
|
|
|
if (strncmp(sp, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))
|
|
|
|
goto contloop;
|
|
|
|
|
|
|
|
slen -= XATTR_USER_PREFIX_LEN;
|
|
|
|
xdrlen = 4 + ((slen + 3) & ~3);
|
|
|
|
if (xdrlen > xdrleft) {
|
|
|
|
if (count == 0) {
|
|
|
|
/*
|
|
|
|
* Can't even fit the first attribute name.
|
|
|
|
*/
|
|
|
|
status = nfserr_toosmall;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
eof = 0;
|
|
|
|
goto wreof;
|
|
|
|
}
|
|
|
|
|
|
|
|
left -= XATTR_USER_PREFIX_LEN;
|
|
|
|
sp += XATTR_USER_PREFIX_LEN;
|
|
|
|
if (nuser++ < offset)
|
|
|
|
goto contloop;
|
|
|
|
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, xdrlen);
|
|
|
|
if (!p) {
|
|
|
|
status = nfserr_resource;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2020-08-12 22:12:51 +08:00
|
|
|
xdr_encode_opaque(p, sp, slen);
|
2020-06-24 06:39:26 +08:00
|
|
|
|
|
|
|
xdrleft -= xdrlen;
|
|
|
|
count++;
|
|
|
|
contloop:
|
|
|
|
sp += slen + 1;
|
|
|
|
left -= slen + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If there were user attributes to copy, but we didn't copy
|
|
|
|
* any, the offset was too large (e.g. the cookie was invalid).
|
|
|
|
*/
|
|
|
|
if (nuser > 0 && count == 0) {
|
|
|
|
status = nfserr_badcookie;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
wreof:
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
if (!p) {
|
|
|
|
status = nfserr_resource;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
*p = cpu_to_be32(eof);
|
|
|
|
|
|
|
|
cookie = offset + count;
|
|
|
|
|
|
|
|
write_bytes_to_xdr_buf(xdr->buf, cookie_offset, &cookie, 8);
|
2020-09-12 02:47:53 +08:00
|
|
|
tmp = cpu_to_be32(count);
|
|
|
|
write_bytes_to_xdr_buf(xdr->buf, count_offset, &tmp, 4);
|
2020-06-24 06:39:26 +08:00
|
|
|
out:
|
|
|
|
if (listxattrs->lsxa_len)
|
|
|
|
kvfree(listxattrs->lsxa_buf);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __be32
|
|
|
|
nfsd4_encode_removexattr(struct nfsd4_compoundres *resp, __be32 nfserr,
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
union nfsd4_op_u *u)
|
2020-06-24 06:39:26 +08:00
|
|
|
{
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
struct nfsd4_removexattr *removexattr = &u->removexattr;
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2020-06-24 06:39:26 +08:00
|
|
|
|
2023-05-16 22:26:15 +08:00
|
|
|
return nfsd4_encode_change_info4(xdr, &removexattr->rmxa_cinfo);
|
2020-06-24 06:39:26 +08:00
|
|
|
}
|
|
|
|
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
typedef __be32(*nfsd4_enc)(struct nfsd4_compoundres *, __be32, union nfsd4_op_u *u);
|
2008-07-04 19:38:33 +08:00
|
|
|
|
2009-04-03 13:27:55 +08:00
|
|
|
/*
|
|
|
|
* Note: nfsd4_enc_ops vector is shared for v4.0 and v4.1
|
|
|
|
* since we don't need to filter out obsolete ops as this is
|
|
|
|
* done in the decoding phase.
|
|
|
|
*/
|
2017-08-01 23:59:58 +08:00
|
|
|
static const nfsd4_enc nfsd4_enc_ops[] = {
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_ACCESS] = nfsd4_encode_access,
|
|
|
|
[OP_CLOSE] = nfsd4_encode_close,
|
|
|
|
[OP_COMMIT] = nfsd4_encode_commit,
|
|
|
|
[OP_CREATE] = nfsd4_encode_create,
|
|
|
|
[OP_DELEGPURGE] = nfsd4_encode_noop,
|
|
|
|
[OP_DELEGRETURN] = nfsd4_encode_noop,
|
|
|
|
[OP_GETATTR] = nfsd4_encode_getattr,
|
|
|
|
[OP_GETFH] = nfsd4_encode_getfh,
|
|
|
|
[OP_LINK] = nfsd4_encode_link,
|
|
|
|
[OP_LOCK] = nfsd4_encode_lock,
|
|
|
|
[OP_LOCKT] = nfsd4_encode_lockt,
|
|
|
|
[OP_LOCKU] = nfsd4_encode_locku,
|
|
|
|
[OP_LOOKUP] = nfsd4_encode_noop,
|
|
|
|
[OP_LOOKUPP] = nfsd4_encode_noop,
|
|
|
|
[OP_NVERIFY] = nfsd4_encode_noop,
|
|
|
|
[OP_OPEN] = nfsd4_encode_open,
|
|
|
|
[OP_OPENATTR] = nfsd4_encode_noop,
|
|
|
|
[OP_OPEN_CONFIRM] = nfsd4_encode_open_confirm,
|
|
|
|
[OP_OPEN_DOWNGRADE] = nfsd4_encode_open_downgrade,
|
|
|
|
[OP_PUTFH] = nfsd4_encode_noop,
|
|
|
|
[OP_PUTPUBFH] = nfsd4_encode_noop,
|
|
|
|
[OP_PUTROOTFH] = nfsd4_encode_noop,
|
|
|
|
[OP_READ] = nfsd4_encode_read,
|
|
|
|
[OP_READDIR] = nfsd4_encode_readdir,
|
|
|
|
[OP_READLINK] = nfsd4_encode_readlink,
|
|
|
|
[OP_REMOVE] = nfsd4_encode_remove,
|
|
|
|
[OP_RENAME] = nfsd4_encode_rename,
|
|
|
|
[OP_RENEW] = nfsd4_encode_noop,
|
|
|
|
[OP_RESTOREFH] = nfsd4_encode_noop,
|
|
|
|
[OP_SAVEFH] = nfsd4_encode_noop,
|
|
|
|
[OP_SECINFO] = nfsd4_encode_secinfo,
|
|
|
|
[OP_SETATTR] = nfsd4_encode_setattr,
|
|
|
|
[OP_SETCLIENTID] = nfsd4_encode_setclientid,
|
|
|
|
[OP_SETCLIENTID_CONFIRM] = nfsd4_encode_noop,
|
|
|
|
[OP_VERIFY] = nfsd4_encode_noop,
|
|
|
|
[OP_WRITE] = nfsd4_encode_write,
|
|
|
|
[OP_RELEASE_LOCKOWNER] = nfsd4_encode_noop,
|
2009-04-03 13:27:55 +08:00
|
|
|
|
|
|
|
/* NFSv4.1 operations */
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_BACKCHANNEL_CTL] = nfsd4_encode_noop,
|
|
|
|
[OP_BIND_CONN_TO_SESSION] = nfsd4_encode_bind_conn_to_session,
|
|
|
|
[OP_EXCHANGE_ID] = nfsd4_encode_exchange_id,
|
|
|
|
[OP_CREATE_SESSION] = nfsd4_encode_create_session,
|
|
|
|
[OP_DESTROY_SESSION] = nfsd4_encode_noop,
|
|
|
|
[OP_FREE_STATEID] = nfsd4_encode_noop,
|
|
|
|
[OP_GET_DIR_DELEGATION] = nfsd4_encode_noop,
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#ifdef CONFIG_NFSD_PNFS
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_GETDEVICEINFO] = nfsd4_encode_getdeviceinfo,
|
|
|
|
[OP_GETDEVICELIST] = nfsd4_encode_noop,
|
|
|
|
[OP_LAYOUTCOMMIT] = nfsd4_encode_layoutcommit,
|
|
|
|
[OP_LAYOUTGET] = nfsd4_encode_layoutget,
|
|
|
|
[OP_LAYOUTRETURN] = nfsd4_encode_layoutreturn,
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#else
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_GETDEVICEINFO] = nfsd4_encode_noop,
|
|
|
|
[OP_GETDEVICELIST] = nfsd4_encode_noop,
|
|
|
|
[OP_LAYOUTCOMMIT] = nfsd4_encode_noop,
|
|
|
|
[OP_LAYOUTGET] = nfsd4_encode_noop,
|
|
|
|
[OP_LAYOUTRETURN] = nfsd4_encode_noop,
|
nfsd: implement pNFS operations
Add support for the GETDEVICEINFO, LAYOUTGET, LAYOUTCOMMIT and
LAYOUTRETURN NFSv4.1 operations, as well as backing code to manage
outstanding layouts and devices.
Layout management is very straight forward, with a nfs4_layout_stateid
structure that extends nfs4_stid to manage layout stateids as the
top-level structure. It is linked into the nfs4_file and nfs4_client
structures like the other stateids, and contains a linked list of
layouts that hang of the stateid. The actual layout operations are
implemented in layout drivers that are not part of this commit, but
will be added later.
The worst part of this commit is the management of the pNFS device IDs,
which suffers from a specification that is not sanely implementable due
to the fact that the device-IDs are global and not bound to an export,
and have a small enough size so that we can't store the fsid portion of
a file handle, and must never be reused. As we still do need perform all
export authentication and validation checks on a device ID passed to
GETDEVICEINFO we are caught between a rock and a hard place. To work
around this issue we add a new hash that maps from a 64-bit integer to a
fsid so that we can look up the export to authenticate against it,
a 32-bit integer as a generation that we can bump when changing the device,
and a currently unused 32-bit integer that could be used in the future
to handle more than a single device per export. Entries in this hash
table are never deleted as we can't reuse the ids anyway, and would have
a severe lifetime problem anyway as Linux export structures are temporary
structures that can go away under load.
Parts of the XDR data, structures and marshaling/unmarshaling code, as
well as many concepts are derived from the old pNFS server implementation
from Andy Adamson, Benny Halevy, Dean Hildebrand, Marc Eshel, Fred Isaman,
Mike Sager, Ricardo Labiaga and many others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-05-05 19:11:59 +08:00
|
|
|
#endif
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_SECINFO_NO_NAME] = nfsd4_encode_secinfo_no_name,
|
|
|
|
[OP_SEQUENCE] = nfsd4_encode_sequence,
|
|
|
|
[OP_SET_SSV] = nfsd4_encode_noop,
|
|
|
|
[OP_TEST_STATEID] = nfsd4_encode_test_stateid,
|
|
|
|
[OP_WANT_DELEGATION] = nfsd4_encode_noop,
|
|
|
|
[OP_DESTROY_CLIENTID] = nfsd4_encode_noop,
|
|
|
|
[OP_RECLAIM_COMPLETE] = nfsd4_encode_noop,
|
2014-09-27 01:58:26 +08:00
|
|
|
|
|
|
|
/* NFSv4.2 operations */
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_ALLOCATE] = nfsd4_encode_noop,
|
|
|
|
[OP_COPY] = nfsd4_encode_copy,
|
|
|
|
[OP_COPY_NOTIFY] = nfsd4_encode_copy_notify,
|
|
|
|
[OP_DEALLOCATE] = nfsd4_encode_noop,
|
|
|
|
[OP_IO_ADVISE] = nfsd4_encode_noop,
|
|
|
|
[OP_LAYOUTERROR] = nfsd4_encode_noop,
|
|
|
|
[OP_LAYOUTSTATS] = nfsd4_encode_noop,
|
|
|
|
[OP_OFFLOAD_CANCEL] = nfsd4_encode_noop,
|
|
|
|
[OP_OFFLOAD_STATUS] = nfsd4_encode_offload_status,
|
|
|
|
[OP_READ_PLUS] = nfsd4_encode_read_plus,
|
|
|
|
[OP_SEEK] = nfsd4_encode_seek,
|
|
|
|
[OP_WRITE_SAME] = nfsd4_encode_noop,
|
|
|
|
[OP_CLONE] = nfsd4_encode_noop,
|
2020-06-24 06:39:26 +08:00
|
|
|
|
|
|
|
/* RFC 8276 extended atributes operations */
|
NFSD: Avoid clashing function prototypes
When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].
There were 97 warnings produced by NFS. For example:
fs/nfsd/nfs4xdr.c:2228:17: warning: cast from '__be32 (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, struct nfsd4_access *)') to 'nfsd4_dec' (aka 'unsigned int (*)(struct nfsd4_compoundargs *, void *)') converts to incompatible function type [-Wcast-function-type-strict]
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The enc/dec callbacks were defined as passing "void *" as the second
argument, but were being implicitly cast to a new type. Replace the
argument with union nfsd4_op_u, and perform explicit member selection
in the function body. There are no resulting binary differences.
Changes were made mechanically using the following Coccinelle script,
with minor by-hand fixes for members that didn't already match their
existing argument name:
@find@
identifier func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] = (T) func,
};
@already_void@
identifier find.func;
identifier name;
@@
func(...,
-void
+union nfsd4_op_u
*name)
{
...
}
@proto depends on !already_void@
identifier find.func;
type T;
identifier name;
position p;
@@
func@p(...,
T name
) {
...
}
@script:python get_member@
type_name << proto.T;
member;
@@
coccinelle.member = cocci.make_ident(type_name.split("_", 1)[1].split(' ',1)[0])
@convert@
identifier find.func;
type proto.T;
identifier proto.name;
position proto.p;
identifier get_member.member;
@@
func@p(...,
- T name
+ union nfsd4_op_u *u
) {
+ T name = &u->member;
...
}
@cast@
identifier find.func;
type T, opsT;
identifier ops, N;
@@
opsT ops[] = {
[N] =
- (T)
func,
};
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
2022-12-03 04:48:59 +08:00
|
|
|
[OP_GETXATTR] = nfsd4_encode_getxattr,
|
|
|
|
[OP_SETXATTR] = nfsd4_encode_setxattr,
|
|
|
|
[OP_LISTXATTRS] = nfsd4_encode_listxattrs,
|
|
|
|
[OP_REMOVEXATTR] = nfsd4_encode_removexattr,
|
2008-07-04 19:38:33 +08:00
|
|
|
};
|
|
|
|
|
2009-04-03 13:28:48 +08:00
|
|
|
/*
|
2014-03-12 05:54:34 +08:00
|
|
|
* Calculate whether we still have space to encode repsize bytes.
|
|
|
|
* There are two considerations:
|
|
|
|
* - For NFS versions >=4.1, the size of the reply must stay within
|
|
|
|
* session limits
|
|
|
|
* - For all NFS versions, we must stay within limited preallocated
|
|
|
|
* buffer space.
|
2009-04-03 13:28:48 +08:00
|
|
|
*
|
2014-03-12 05:54:34 +08:00
|
|
|
* This is called before the operation is processed, so can only provide
|
|
|
|
* an upper estimate. For some nonidempotent operations (such as
|
|
|
|
* getattr), it's not necessarily a problem if that estimate is wrong,
|
|
|
|
* as we can fail it after processing without significant side effects.
|
2009-04-03 13:28:48 +08:00
|
|
|
*/
|
2014-03-12 05:54:34 +08:00
|
|
|
__be32 nfsd4_check_resp_size(struct nfsd4_compoundres *resp, u32 respsize)
|
2009-04-03 13:28:48 +08:00
|
|
|
{
|
2014-03-09 05:42:05 +08:00
|
|
|
struct xdr_buf *buf = &resp->rqstp->rq_res;
|
2014-03-13 09:39:35 +08:00
|
|
|
struct nfsd4_slot *slot = resp->cstate.slot;
|
2009-04-03 13:28:48 +08:00
|
|
|
|
2014-03-13 09:39:35 +08:00
|
|
|
if (buf->len + respsize <= buf->buflen)
|
|
|
|
return nfs_ok;
|
|
|
|
if (!nfsd4_has_session(&resp->cstate))
|
2014-03-09 06:19:55 +08:00
|
|
|
return nfserr_resource;
|
2014-03-13 09:39:35 +08:00
|
|
|
if (slot->sl_flags & NFSD4_SLOT_CACHETHIS) {
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
return nfserr_rep_too_big_to_cache;
|
2014-03-09 06:19:55 +08:00
|
|
|
}
|
2014-03-13 09:39:35 +08:00
|
|
|
return nfserr_rep_too_big;
|
2009-04-03 13:28:48 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
void
|
|
|
|
nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)
|
|
|
|
{
|
2020-10-28 03:53:42 +08:00
|
|
|
struct xdr_stream *xdr = resp->xdr;
|
2013-04-02 04:37:12 +08:00
|
|
|
struct nfs4_stateowner *so = resp->cstate.replay_owner;
|
2014-03-08 00:01:37 +08:00
|
|
|
struct svc_rqst *rqstp = resp->rqstp;
|
2017-05-06 05:09:37 +08:00
|
|
|
const struct nfsd4_operation *opdesc = op->opdesc;
|
2013-08-30 03:42:52 +08:00
|
|
|
int post_err_offset;
|
2014-03-07 09:39:29 +08:00
|
|
|
nfsd4_enc encoder;
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8);
|
2023-03-27 18:21:37 +08:00
|
|
|
if (!p)
|
|
|
|
goto release;
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(op->opnum);
|
2013-08-30 03:42:52 +08:00
|
|
|
post_err_offset = xdr->buf->len;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-07-04 19:38:33 +08:00
|
|
|
if (op->opnum == OP_ILLEGAL)
|
|
|
|
goto status;
|
2017-05-06 22:49:21 +08:00
|
|
|
if (op->status && opdesc &&
|
|
|
|
!(opdesc->op_flags & OP_NONTRIVIAL_ERROR_ENCODE))
|
|
|
|
goto status;
|
2020-11-23 01:49:52 +08:00
|
|
|
BUG_ON(op->opnum >= ARRAY_SIZE(nfsd4_enc_ops) ||
|
2008-07-04 19:38:33 +08:00
|
|
|
!nfsd4_enc_ops[op->opnum]);
|
2014-03-07 09:39:29 +08:00
|
|
|
encoder = nfsd4_enc_ops[op->opnum];
|
|
|
|
op->status = encoder(resp, op->status, &op->u);
|
2020-11-22 00:36:42 +08:00
|
|
|
if (op->status)
|
|
|
|
trace_nfsd_compound_encode_err(rqstp, op->opnum, op->status);
|
2013-08-27 04:04:46 +08:00
|
|
|
xdr_commit_encode(xdr);
|
|
|
|
|
2014-03-22 05:26:44 +08:00
|
|
|
/* nfsd4_check_resp_size guarantees enough room for error status */
|
2014-03-08 00:01:37 +08:00
|
|
|
if (!op->status) {
|
|
|
|
int space_needed = 0;
|
|
|
|
if (!nfsd4_last_compound_op(rqstp))
|
|
|
|
space_needed = COMPOUND_ERR_SLACK_SPACE;
|
|
|
|
op->status = nfsd4_check_resp_size(resp, space_needed);
|
|
|
|
}
|
2014-05-09 05:38:18 +08:00
|
|
|
if (op->status == nfserr_resource && nfsd4_has_session(&resp->cstate)) {
|
|
|
|
struct nfsd4_slot *slot = resp->cstate.slot;
|
|
|
|
|
|
|
|
if (slot->sl_flags & NFSD4_SLOT_CACHETHIS)
|
|
|
|
op->status = nfserr_rep_too_big_to_cache;
|
|
|
|
else
|
|
|
|
op->status = nfserr_rep_too_big;
|
|
|
|
}
|
2014-03-07 09:39:29 +08:00
|
|
|
if (op->status == nfserr_resource ||
|
|
|
|
op->status == nfserr_rep_too_big ||
|
|
|
|
op->status == nfserr_rep_too_big_to_cache) {
|
|
|
|
/*
|
|
|
|
* The operation may have already been encoded or
|
|
|
|
* partially encoded. No op returns anything additional
|
|
|
|
* in the case of one of these three errors, so we can
|
|
|
|
* just truncate back to after the status. But it's a
|
|
|
|
* bug if we had to do this on a non-idempotent op:
|
|
|
|
*/
|
|
|
|
warn_on_nonidempotent_op(op);
|
2013-08-30 03:42:52 +08:00
|
|
|
xdr_truncate_encode(xdr, post_err_offset);
|
2014-03-07 09:39:29 +08:00
|
|
|
}
|
2013-04-02 04:37:12 +08:00
|
|
|
if (so) {
|
2013-08-30 03:42:52 +08:00
|
|
|
int len = xdr->buf->len - post_err_offset;
|
|
|
|
|
2013-04-02 04:37:12 +08:00
|
|
|
so->so_replay.rp_status = op->status;
|
2013-08-30 03:42:52 +08:00
|
|
|
so->so_replay.rp_buflen = len;
|
|
|
|
read_bytes_from_xdr_buf(xdr->buf, post_err_offset,
|
|
|
|
so->so_replay.rp_buf, len);
|
2013-04-02 04:37:12 +08:00
|
|
|
}
|
2008-07-04 19:38:33 +08:00
|
|
|
status:
|
2022-07-23 04:08:38 +08:00
|
|
|
*p = op->status;
|
2023-03-27 18:21:37 +08:00
|
|
|
release:
|
|
|
|
if (opdesc && opdesc->op_release)
|
|
|
|
opdesc->op_release(&op->u);
|
2023-05-19 01:45:50 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Account for pages consumed while encoding this operation.
|
|
|
|
* The xdr_stream primitives don't manage rq_next_page.
|
|
|
|
*/
|
|
|
|
rqstp->rq_next_page = xdr->page_ptr + 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Encode the reply stored in the stateowner reply cache
|
|
|
|
*
|
|
|
|
* XDR note: do not encode rp->rp_buflen: the buffer contains the
|
|
|
|
* previously sent already encoded operation.
|
|
|
|
*/
|
|
|
|
void
|
2014-01-31 06:18:38 +08:00
|
|
|
nfsd4_encode_replay(struct xdr_stream *xdr, struct nfsd4_op *op)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2009-04-08 07:55:27 +08:00
|
|
|
__be32 *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct nfs4_replay *rp = op->replay;
|
|
|
|
|
2014-01-31 06:18:38 +08:00
|
|
|
p = xdr_reserve_space(xdr, 8 + rp->rp_buflen);
|
|
|
|
if (!p) {
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
return;
|
|
|
|
}
|
2014-03-23 05:09:18 +08:00
|
|
|
*p++ = cpu_to_be32(op->opnum);
|
2005-04-17 06:20:36 +08:00
|
|
|
*p++ = rp->rp_status; /* already xdr'ed */
|
|
|
|
|
2014-03-23 06:43:16 +08:00
|
|
|
p = xdr_encode_opaque_fixed(p, rp->rp_buf, rp->rp_buflen);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2017-05-09 00:48:24 +08:00
|
|
|
void nfsd4_release_compoundargs(struct svc_rqst *rqstp)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2011-07-17 05:15:10 +08:00
|
|
|
struct nfsd4_compoundargs *args = rqstp->rq_argp;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (args->ops != args->iops) {
|
2022-09-03 06:18:16 +08:00
|
|
|
vfree(args->ops);
|
2005-04-17 06:20:36 +08:00
|
|
|
args->ops = args->iops;
|
|
|
|
}
|
|
|
|
while (args->to_free) {
|
2014-06-25 05:43:45 +08:00
|
|
|
struct svcxdr_tmpbuf *tb = args->to_free;
|
2005-04-17 06:20:36 +08:00
|
|
|
args->to_free = tb->next;
|
|
|
|
kfree(tb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-12 23:57:28 +08:00
|
|
|
bool
|
2021-10-12 23:57:22 +08:00
|
|
|
nfs4svc_decode_compoundargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2017-05-09 01:01:48 +08:00
|
|
|
struct nfsd4_compoundargs *args = rqstp->rq_argp;
|
|
|
|
|
2020-11-04 00:54:23 +08:00
|
|
|
/* svcxdr_tmp_alloc */
|
2005-04-17 06:20:36 +08:00
|
|
|
args->to_free = NULL;
|
2020-11-04 00:54:23 +08:00
|
|
|
|
2021-10-12 23:57:22 +08:00
|
|
|
args->xdr = xdr;
|
2005-04-17 06:20:36 +08:00
|
|
|
args->ops = args->iops;
|
|
|
|
args->rqstp = rqstp;
|
|
|
|
|
2020-11-05 00:07:06 +08:00
|
|
|
return nfsd4_decode_compound(args);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2021-10-13 22:41:13 +08:00
|
|
|
bool
|
2021-10-13 22:41:06 +08:00
|
|
|
nfs4svc_encode_compoundres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2017-05-09 01:42:02 +08:00
|
|
|
struct nfsd4_compoundres *resp = rqstp->rq_resp;
|
2021-10-13 22:41:06 +08:00
|
|
|
__be32 *p;
|
2014-02-27 06:39:35 +08:00
|
|
|
|
2021-10-13 22:40:59 +08:00
|
|
|
/*
|
|
|
|
* Send buffer space for the following items is reserved
|
|
|
|
* at the top of nfsd4_proc_compound().
|
|
|
|
*/
|
|
|
|
p = resp->statusp;
|
|
|
|
|
|
|
|
*p++ = resp->cstate.status;
|
2005-04-17 06:20:36 +08:00
|
|
|
*p++ = htonl(resp->taglen);
|
|
|
|
memcpy(p, resp->tag, resp->taglen);
|
|
|
|
p += XDR_QUADLEN(resp->taglen);
|
|
|
|
*p++ = htonl(resp->opcnt);
|
|
|
|
|
2014-06-30 23:48:35 +08:00
|
|
|
nfsd4_sequence_done(resp);
|
2021-10-13 22:41:13 +08:00
|
|
|
return true;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|