On Fri, Oct 19, 2018 at 11:28:58AM -0400, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <kolga@xxxxxxxxxx>
>
> nfs.4 defines nfs42_netaddr structure that represents netloc4.
>
> Populate needed fields from the sockaddr structure.
>
> This will be used by flexfiles and 4.2 inter copy
>
> Signed-off-by: Olga Kornievskaia <kolga@xxxxxxxxxx>
> ---
> fs/nfsd/nfsd.h | 31 ++++++++++++++++++++++++++++++-
> 1 file changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> index 0668999..030fccb 100644
> --- a/fs/nfsd/nfsd.h
> +++ b/fs/nfsd/nfsd.h
> @@ -18,7 +18,7 @@
> #include <linux/nfs4.h>
> #include <linux/sunrpc/svc.h>
> #include <linux/sunrpc/msg_prot.h>
> -
> +#include <linux/sunrpc/addr.h>
> #include <uapi/linux/nfsd/debug.h>
>
> #include "stats.h"
> @@ -366,6 +366,35 @@ static inline bool nfsd4_spo_must_allow(struct svc_rqst *rqstp)
>
> extern const u32 nfsd_suppattrs[3][3];
>
> +static inline u32 nfsd4_set_netaddr(struct sockaddr *addr, struct nfs42_netaddr *netaddr)
> +{
> + struct sockaddr_in *sin = (struct sockaddr_in *)addr;
> + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr;
> + unsigned int port;
> + size_t ret;
> +
> + switch (addr->sa_family) {
> + case AF_INET:
> + port = ntohs(sin->sin_port);
> + sprintf(netaddr->netid, "tcp");
> + netaddr->netid_len = 3;
> + break;
> + case AF_INET6:
> + port = ntohs(sin6->sin6_port);
> + sprintf(netaddr->netid, "tcp6");
> + netaddr->netid_len = 4;
> + break;
> + default:
> + return nfserrno(-EINVAL);
Let's just write that nfserr_inval;
> + }
> + ret = rpc_ntop(addr, netaddr->addr, sizeof(netaddr->addr));
> + netaddr->addr_len = ret + snprintf(netaddr->addr + ret,
> + RPCBIND_MAXUADDRLEN + 1,
> + ".%u.%u", port >> 8, port & 0xff);
Isn't the remaining space RPCBIND_MAXUADDRLEN + 1 - ret ?
But really I think we're depending on RPCBIND_MAXUADDRLEN being large
enough that there will never be overlow, in which case we may as well
just use sprintf.
And maybe add a WARN_ON() in case of overflow, if we want to be
paranoid about it.
--b.
> +
> + return 0;
> +}
> +
> static inline bool bmval_is_subset(const u32 *bm1, const u32 *bm2)
> {
> return !((bm1[0] & ~bm2[0]) ||
> --
> 1.8.3.1
