Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0a5c33e23c4d781ecc815002c54f1f91012c703d

Authored by Bryan Schumaker
Committed by J. Bruce Fields
1 parent 88c4766617
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

fs/nfsd/fault_inject.c
Diff comments   View file @ 0a5c33e
... ... @@ -79,7 +79,7 @@
79 79 clp = nfsd_find_client(addr, addr_size);
80 80 if (clp) {
81 81 count = op->forget(clp, 0);
82   - rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129);
  82 + rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));
83 83 printk(KERN_INFO "NFSD [%s]: Client %s had %llu state object(s)\n", op->file, buf, count);
84 84 }
85 85 nfs4_unlock_state();
... ... @@ -4623,7 +4623,7 @@
4623 4623 u64 nfsd_print_client(struct nfs4_client *clp, u64 num)
4624 4624 {
4625 4625 char buf[INET6_ADDRSTRLEN];
4626   - rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129);
  4626 + rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));
4627 4627 printk(KERN_INFO "NFS Client: %s\n", buf);
4628 4628 return 1;
4629 4629 }
... ... @@ -4632,7 +4632,7 @@
4632 4632 const char *type)
4633 4633 {
4634 4634 char buf[INET6_ADDRSTRLEN];
4635   - rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129);
  4635 + rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));
4636 4636 printk(KERN_INFO "NFS Client: %s has %u %s\n", buf, count, type);
4637 4637 }
4638 4638