diff options
| author | Pavel Shilovsky <pshilovsky@samba.org> | 2013-07-09 19:44:56 +0400 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2013-07-10 13:08:39 -0500 |
| commit | fd55439638a27e34d87b91d618c0ba6b42302940 (patch) | |
| tree | 3b448d011f80e69ce1954d7e48519eea57c71185 /fs | |
| parent | 6658b9f70ebca5fc0795b1d6d733996af1e2caa7 (diff) | |
| download | linux-fd55439638a27e34d87b91d618c0ba6b42302940.tar.gz linux-fd55439638a27e34d87b91d618c0ba6b42302940.tar.bz2 linux-fd55439638a27e34d87b91d618c0ba6b42302940.zip | |
CIFS: Fix lease context buffer parsing
to prevent missing RqLs context if it's not the first one.
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steven French <steven@steven-GA-970A-DS3.(none)>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 2b312e4eeaa6..19fafeb767fa 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -853,23 +853,24 @@ parse_lease_state(struct smb2_create_rsp *rsp) char *data_offset; struct create_lease *lc; bool found = false; + unsigned int next = 0; + char *name; - data_offset = (char *)rsp; - data_offset += 4 + le32_to_cpu(rsp->CreateContextsOffset); + data_offset = (char *)rsp + 4 + le32_to_cpu(rsp->CreateContextsOffset); lc = (struct create_lease *)data_offset; do { - char *name = le16_to_cpu(lc->ccontext.NameOffset) + (char *)lc; + lc = (struct create_lease *)((char *)lc + next); + name = le16_to_cpu(lc->ccontext.NameOffset) + (char *)lc; if (le16_to_cpu(lc->ccontext.NameLength) != 4 || strncmp(name, "RqLs", 4)) { - lc = (struct create_lease *)((char *)lc - + le32_to_cpu(lc->ccontext.Next)); + next = le32_to_cpu(lc->ccontext.Next); continue; } if (lc->lcontext.LeaseFlags & SMB2_LEASE_FLAG_BREAK_IN_PROGRESS) return SMB2_OPLOCK_LEVEL_NOCHANGE; found = true; break; - } while (le32_to_cpu(lc->ccontext.Next) != 0); + } while (next != 0); if (!found) return 0; |