mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-12 21:44:06 +08:00
cf0d7e7f45
The 'nfs_server' and 'mount_server' structures include a union of 'struct sockaddr' (with the older 16 bytes max address size) and 'struct sockaddr_storage' which is large enough to hold all the supported sa_family types (128 bytes max size). The runtime memcpy() buffer overflow checker is seeing attempts to write beyond the 16 bytes as an overflow, but the actual expected size is that of 'struct sockaddr_storage'. Plumb the use of 'struct sockaddr_storage' more completely through-out NFS, which results in adjusting the memcpy() buffers to the correct union members. Avoids this false positive run-time warning under CONFIG_FORTIFY_SOURCE: memcpy: detected field-spanning write (size 28) of single field "&ctx->nfs_server.address" at fs/nfs/namespace.c:178 (size 16) Reported-by: kernel test robot <yujie.liu@intel.com> Link: https://lore.kernel.org/all/202210110948.26b43120-yujie.liu@intel.com Cc: Trond Myklebust <trond.myklebust@hammerspace.com> Cc: Anna Schumaker <anna@kernel.org> Cc: linux-nfs@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
120 lines
3.2 KiB
C
120 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
#include <linux/nfs_fs.h>
|
|
#include <linux/nfs_mount.h>
|
|
#include <linux/sunrpc/addr.h>
|
|
#include "internal.h"
|
|
#include "nfs3_fs.h"
|
|
|
|
#ifdef CONFIG_NFS_V3_ACL
|
|
static struct rpc_stat nfsacl_rpcstat = { &nfsacl_program };
|
|
static const struct rpc_version *nfsacl_version[] = {
|
|
[3] = &nfsacl_version3,
|
|
};
|
|
|
|
const struct rpc_program nfsacl_program = {
|
|
.name = "nfsacl",
|
|
.number = NFS_ACL_PROGRAM,
|
|
.nrvers = ARRAY_SIZE(nfsacl_version),
|
|
.version = nfsacl_version,
|
|
.stats = &nfsacl_rpcstat,
|
|
};
|
|
|
|
/*
|
|
* Initialise an NFSv3 ACL client connection
|
|
*/
|
|
static void nfs_init_server_aclclient(struct nfs_server *server)
|
|
{
|
|
if (server->flags & NFS_MOUNT_NOACL)
|
|
goto out_noacl;
|
|
|
|
server->client_acl = rpc_bind_new_program(server->client, &nfsacl_program, 3);
|
|
if (IS_ERR(server->client_acl))
|
|
goto out_noacl;
|
|
|
|
/* No errors! Assume that Sun nfsacls are supported */
|
|
server->caps |= NFS_CAP_ACLS;
|
|
return;
|
|
|
|
out_noacl:
|
|
server->caps &= ~NFS_CAP_ACLS;
|
|
}
|
|
#else
|
|
static inline void nfs_init_server_aclclient(struct nfs_server *server)
|
|
{
|
|
server->flags &= ~NFS_MOUNT_NOACL;
|
|
server->caps &= ~NFS_CAP_ACLS;
|
|
}
|
|
#endif
|
|
|
|
struct nfs_server *nfs3_create_server(struct fs_context *fc)
|
|
{
|
|
struct nfs_server *server = nfs_create_server(fc);
|
|
|
|
/* Create a client RPC handle for the NFS v3 ACL management interface */
|
|
if (!IS_ERR(server))
|
|
nfs_init_server_aclclient(server);
|
|
return server;
|
|
}
|
|
|
|
struct nfs_server *nfs3_clone_server(struct nfs_server *source,
|
|
struct nfs_fh *fh,
|
|
struct nfs_fattr *fattr,
|
|
rpc_authflavor_t flavor)
|
|
{
|
|
struct nfs_server *server = nfs_clone_server(source, fh, fattr, flavor);
|
|
if (!IS_ERR(server) && !IS_ERR(source->client_acl))
|
|
nfs_init_server_aclclient(server);
|
|
return server;
|
|
}
|
|
|
|
/*
|
|
* Set up a pNFS Data Server client over NFSv3.
|
|
*
|
|
* Return any existing nfs_client that matches server address,port,version
|
|
* and minorversion.
|
|
*
|
|
* For a new nfs_client, use a soft mount (default), a low retrans and a
|
|
* low timeout interval so that if a connection is lost, we retry through
|
|
* the MDS.
|
|
*/
|
|
struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,
|
|
const struct sockaddr_storage *ds_addr, int ds_addrlen,
|
|
int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans)
|
|
{
|
|
struct rpc_timeout ds_timeout;
|
|
struct nfs_client *mds_clp = mds_srv->nfs_client;
|
|
struct nfs_client_initdata cl_init = {
|
|
.addr = ds_addr,
|
|
.addrlen = ds_addrlen,
|
|
.nodename = mds_clp->cl_rpcclient->cl_nodename,
|
|
.ip_addr = mds_clp->cl_ipaddr,
|
|
.nfs_mod = &nfs_v3,
|
|
.proto = ds_proto,
|
|
.net = mds_clp->cl_net,
|
|
.timeparms = &ds_timeout,
|
|
.cred = mds_srv->cred,
|
|
};
|
|
struct nfs_client *clp;
|
|
char buf[INET6_ADDRSTRLEN + 1];
|
|
|
|
/* fake a hostname because lockd wants it */
|
|
if (rpc_ntop((struct sockaddr *)ds_addr, buf, sizeof(buf)) <= 0)
|
|
return ERR_PTR(-EINVAL);
|
|
cl_init.hostname = buf;
|
|
|
|
if (mds_clp->cl_nconnect > 1 && ds_proto == XPRT_TRANSPORT_TCP)
|
|
cl_init.nconnect = mds_clp->cl_nconnect;
|
|
|
|
if (mds_srv->flags & NFS_MOUNT_NORESVPORT)
|
|
__set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
|
|
|
|
__set_bit(NFS_CS_DS, &cl_init.init_flags);
|
|
|
|
/* Use the MDS nfs_client cl_ipaddr. */
|
|
nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans);
|
|
clp = nfs_get_client(&cl_init);
|
|
|
|
return clp;
|
|
}
|
|
EXPORT_SYMBOL_GPL(nfs3_set_ds_client);
|