summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2007-12-31 04:56:21 +0000
committerSteve French <sfrench@us.ibm.com>2007-12-31 04:56:21 +0000
commit28c5a02a11f70bb1fd8dd3b633206e2db3220308 (patch)
tree024b972b94ff1045b3c88bd3a04411a00e758342
parentbb5a9a04d4cab4b13d63ac5cd3e1fb35f9583607 (diff)
downloadop-kernel-dev-28c5a02a11f70bb1fd8dd3b633206e2db3220308.zip
op-kernel-dev-28c5a02a11f70bb1fd8dd3b633206e2db3220308.tar.gz
[CIFS] fix unicode string alignment in SPNEGO setup
Unicode strings need to be word aligned, but the code that handles that is currently not taking the length of the SPNEGO blob into account. Fix it to do so. Signed-off-by: Jeff Layton <jlayton@tupile.poochiereds.net> Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/sess.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index ce698d5..d2153ab 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -542,7 +542,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
if (ses->capabilities & CAP_UNICODE) {
/* unicode strings must be word aligned */
- if (iov[0].iov_len % 2) {
+ if ((iov[0].iov_len + iov[1].iov_len) % 2) {
*bcc_ptr = 0;
bcc_ptr++;
}
OpenPOWER on IntegriCloud