 @@ -1,14 +1,14 @@
-/*	$NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $	*/
+/*	$NetBSD: smbfs_smb.c,v 1.42.8.1 2012/11/29 00:04:37 riz Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -54,27 +54,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * FreeBSD: src/sys/fs/smbfs/smbfs_smb.c,v 1.3 2001/12/10 08:09:46 obrien Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_smb.c,v 1.42.8.1 2012/11/29 00:04:37 riz Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/vnode.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #ifdef USE_MD5_HASH
 #include <sys/md5.h>
 @@ -679,27 +679,27 @@ smbfs_smb_create(struct smbnode *dnp, co
 	mb_put_uint32le(mbp, tm);
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
 	mb_put_uint8(mbp, SMB_DT_ASCII);
 	error = smbfs_fullpath(mbp, SSTOVC(ssp), dnp, name, nmlen);
 	if (!error) {
 		smb_rq_bend(rqp);
 		error = smb_rq_simple(rqp);
 		if (!error) {
 			smb_rq_getreply(rqp, &mdp);
 			md_get_uint8(mdp, &wc);
 			if (wc == 1)
-				md_get_uint16le(mdp, &fid);
+				md_get_uint16(mdp, &fid);
 			else
 				error = EBADRPC;
+		}
+	}
 	smb_rq_done(rqp);
 	if (!error)
 		smbfs_smb_close(ssp, fid, &ctime, scred);
 	return (error);
+}
 int
 @@ -1412,39 +1412,38 @@ smbfs_smb_ntcreatex(struct smbnode *np,
 	mb_put_uint32le(mbp, 0);	/* Hi 32bit */
 					/* Initial allocation size */
 	mb_put_uint32le(mbp, 0);	/* File attributes */
 	mb_put_uint32le(mbp, NT_FILE_SHARE_READ|NT_FILE_SHARE_WRITE);
 					/* Type of share access */
 	mb_put_uint32le(mbp, NT_OPEN_EXISTING);
 					/* Create disposition - just open */
 	mb_put_uint32le(mbp, NT_FILE_DIRECTORY_FILE);
 					/* Options to use if creating a file */
 	mb_put_uint32le(mbp, 0);	/* Security QOS information */
 	mb_put_uint8(mbp, 0);		/* Security tracking mode flags */
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
 	smb_rq_bend(rqp);
 	mbp->mb_count = 0;
 	error = smbfs_fullpath(mbp, SSTOVC(ssp), np, NULL, 0);
 	if (error)
 		return error;
 	/* Windows XP seems to include the final zero. Better do that too. */
 	mb_put_uint8(mbp, 0);
 	flen = mbp->mb_count;
 	SMBRQ_PUTLE16(nmlen, flen);
 	smb_rq_bend(rqp);
 	error = smb_rq_simple(rqp);
 	if (error)
 		goto bad;
 	smb_rq_getreply(rqp, &mdp);
 	md_get_uint8(mdp, &wc);		/* WordCount - check? */
 	md_get_uint8(mdp, NULL);	/* AndXCommand */
 	md_get_uint8(mdp, NULL);	/* Reserved - must be zero */
 	md_get_uint16(mdp, NULL);	/* Offset to next cmd WordCount */
 	md_get_uint8(mdp, NULL);	/* Oplock level granted */
 	md_get_uint16(mdp, &np->n_fid);	/* FID */
 	/* ignore rest */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $	*/
+/*	$NetBSD: smb_smb.c,v 1.32.18.1 2012/11/29 00:04:37 riz Exp $	*/
 /*
  * Copyright (c) 2000-2001 Boris Popov
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,27 +28,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * FreeBSD: src/sys/netsmb/smb_smb.c,v 1.10 2003/02/19 05:47:38 imp Exp
  */
 /*
  * various SMB requests. Most of the routines merely packs data into mbufs.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_smb.c,v 1.32.18.1 2012/11/29 00:04:37 riz Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/sysctl.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <netsmb/iconv.h>
 @@ -165,27 +165,27 @@ smb_smb_negotiate(struct smb_vc *vcp, st
 			md_get_uint32le(mdp, &sp->sv_maxtx);
 			md_get_uint32le(mdp, &sp->sv_maxraw);
 			md_get_uint32le(mdp, &sp->sv_skey);
 			md_get_uint32le(mdp, &sp->sv_caps);
 			md_get_mem(mdp, stime, 8, MB_MSYSTEM);
 			md_get_uint16le(mdp, &tw);
 			sp->sv_tz = tw;
 			md_get_uint8(mdp, &sblen);
 			if (sblen && (sp->sv_sm & SMB_SM_ENCRYPT)) {
 				if (sblen != SMB_MAXCHALLENGELEN) {
 					SMBERROR(("Unexpected length of security blob (%d)\n", sblen));
 					break;
+				}
-				error = md_get_uint16(mdp, &bc);
+				error = md_get_uint16le(mdp, &bc);
 				if (error)
 					break;
 				if (sp->sv_caps & SMB_CAP_EXT_SECURITY)
 					md_get_mem(mdp, NULL, 16, MB_MSYSTEM);
 				error = md_get_mem(mdp, vcp->vc_ch, sblen, MB_MSYSTEM);
 				if (error)
 					break;
 				vcp->vc_chlen = sblen;
 				vcp->obj.co_flags |= SMBV_ENCRYPT;
+			}
 			vcp->vc_hflags2 |= SMB_FLAGS2_KNOWS_LONG_NAMES;
 			if (dp->d_id == SMB_DIALECT_NTLM0_12 &&
 			    sp->sv_maxtx < 4096 &&
 @@ -200,27 +200,27 @@ smb_smb_negotiate(struct smb_vc *vcp, st
 			md_get_uint16le(mdp, &sp->sv_maxmux);
 			md_get_uint16le(mdp, &sp->sv_maxvcs);
 			md_get_uint16(mdp, NULL);	/* rawmode */
 			md_get_uint32le(mdp, &sp->sv_skey);
 			if (wc == 13) {		/* >= LANMAN1 */
 				md_get_uint16(mdp, NULL);		/* time */
 				md_get_uint16(mdp, NULL);		/* date */
 				md_get_uint16le(mdp, &tw);
 				sp->sv_tz = tw;
 				md_get_uint16le(mdp, &swlen);
 				if (swlen > SMB_MAXCHALLENGELEN)
 					break;
 				md_get_uint16(mdp, NULL);	/* mbz */
-				if (md_get_uint16(mdp, &bc) != 0)
+				if (md_get_uint16le(mdp, &bc) != 0)
 					break;
 				if (bc < swlen)
 					break;
 				if (swlen && (sp->sv_sm & SMB_SM_ENCRYPT)) {
 					error = md_get_mem(mdp, vcp->vc_ch, swlen, MB_MSYSTEM);
 					if (error)
 						break;
 					vcp->vc_chlen = swlen;
 					vcp->obj.co_flags |= SMBV_ENCRYPT;
+				}
+			}
 			vcp->vc_hflags2 |= SMB_FLAGS2_KNOWS_LONG_NAMES;
 		} else {	/* an old CORE protocol */