nfs4: fix attr parsing corner case

8 years ago · 53fa2af07c
parent 39489bc5fd
commit 53fa2af07c
1 changed files with 4 additions and 2 deletions
--- a/rust/src/nfs/nfs4_records.rs
+++ b/rust/src/nfs/nfs4_records.rs
@ -63,7 +63,8 @@ named!(nfs4_parse_attrs<Nfs4Attr>,
    do_parse!(
        attr_cnt: be_u32
    >>  attr_mask1: be_u32
-    >>  attr_mask2: cond!(attr_cnt == 2, be_u32)
+    >>  attr_mask2: cond!(attr_cnt >= 2, be_u32)
+    >>  cond!(attr_cnt == 3, be_u32)
    >>  nfs4_parse_attr_fields
    >> ( Nfs4Attr {
            attr_mask: ((attr_mask1 as u64) << 32) | attr_mask2.unwrap_or(0) as u64,
@ -74,7 +75,8 @@ named!(nfs4_parse_attrbits<Nfs4Attr>,
    do_parse!(
        attr_cnt: be_u32
    >>  attr_mask1: be_u32
-    >>  attr_mask2: cond!(attr_cnt == 2, be_u32)
+    >>  attr_mask2: cond!(attr_cnt >= 2, be_u32)
+    >>  cond!(attr_cnt == 3, be_u32)
    >> ( Nfs4Attr {
            attr_mask: ((attr_mask1 as u64) << 32) | attr_mask2.unwrap_or(0) as u64,
        } )