Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a5c33e2 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by J. Bruce Fields
Browse files

NFSD: Pass correct buffer size to rpc_ntop 



I honestly have no idea where I got 129 from, but it's a much bigger
value than the actual buffer size (INET6_ADDRSTRLEN).

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 88c47666

fs/nfsd/fault_inject.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void nfsd_inject_set_client(struct nfsd_fault_inject_op *op, 
	clp = nfsd_find_client(addr, addr_size);

	if (clp) {

		count = op->forget(clp, 0);

		rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129);

		rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));

		printk(KERN_INFO "NFSD [%s]: Client %s had %llu state object(s)\n", op->file, buf, count);

	}

	nfs4_unlock_state();

fs/nfsd/nfs4state.c

+2 −2
Original line number Diff line number Diff line
@@ -4623,7 +4623,7 @@ u64 nfsd_forget_client(struct nfs4_client *clp, u64 max) 
u64 nfsd_print_client(struct nfs4_client *clp, u64 num)

{

	char buf[INET6_ADDRSTRLEN];

	rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129);

	rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));

	printk(KERN_INFO "NFS Client: %s\n", buf);

	return 1;

}
@@ -4632,7 +4632,7 @@ static void nfsd_print_count(struct nfs4_client *clp, unsigned int count, 
			     const char *type)

{

	char buf[INET6_ADDRSTRLEN];

	rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129);

	rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));

	printk(KERN_INFO "NFS Client: %s has %u %s\n", buf, count, type);

}