diff options
| author |   Stefan Metzmacher <metze@samba.org> | 2012-05-04 00:19:28 +0200 |
|---|---|---|
| committer |   Steve French <sfrench@us.ibm.com> | 2012-05-03 22:47:39 -0500 |
| commit | d8f2799b105a24bb0bbd3380a0d56e6348484058 (patch) | |
| tree | 170d00ed1bb01443fb1b1695f9fcea3adb3d1f10 | |
| parent | cifs: make sure we ignore the credentials= and cred= options (diff) | |
| download | linux-dev-d8f2799b105a24bb0bbd3380a0d56e6348484058.tar.xz linux-dev-d8f2799b105a24bb0bbd3380a0d56e6348484058.zip | |
fs/cifs: fix parsing of dfs referrals
The problem was that the first referral was parsed more than once
and so the caller tried the same referrals multiple times.
The problem was introduced partly by commit
066ce6899484d9026acd6ba3a8dbbedb33d7ae1b,
where 'ref += le16_to_cpu(ref->Size);' got lost,
but that was also wrong...
Cc: <stable@vger.kernel.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Tested-by: Björn Jacke <bj@sernet.de>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/cifssmb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index f52c5ab78f9d..da2f5446fa7a 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -4844,8 +4844,12 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, max_len = data_end - temp; node->node_name = cifs_strndup_from_utf16(temp, max_len, is_unicode, nls_codepage); - if (!node->node_name) + if (!node->node_name) { rc = -ENOMEM; + goto parse_DFS_referrals_exit; + } + + ref++; } parse_DFS_referrals_exit: |