]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
NFS: Fix decode_secinfo_maxsz
authorBryan Schumaker <bjschuma@netapp.com>
Thu, 2 Jun 2011 19:07:35 +0000 (15:07 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 21 Jun 2011 15:54:07 +0000 (11:54 -0400)
I initially did the calculation in bytes, and not words

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/nfs4xdr.c

index 5db44a8dddf9643545ee713dec4e8ee58637b22d..6870bc61ceec4083f80818c4a31f934dab3227b1 100644 (file)
@@ -255,7 +255,7 @@ static int nfs4_stat_to_errno(int);
 #define decode_fs_locations_maxsz \
                                (0)
 #define encode_secinfo_maxsz   (op_encode_hdr_maxsz + nfs4_name_maxsz)
-#define decode_secinfo_maxsz   (op_decode_hdr_maxsz + 4 + (NFS_MAX_SECFLAVORS * (16 + GSS_OID_MAX_LEN)))
+#define decode_secinfo_maxsz   (op_decode_hdr_maxsz + 1 + ((NFS_MAX_SECFLAVORS * (16 + GSS_OID_MAX_LEN)) / 4))
 
 #if defined(CONFIG_NFS_V4_1)
 #define NFS4_MAX_MACHINE_NAME_LEN (64)