 @@ -1,14 +1,14 @@
-/*	$NetBSD: smb_smb.c,v 1.29 2008/06/24 10:37:19 gmcgarry Exp $	*/
+/*	$NetBSD: smb_smb.c,v 1.29.6.1 2009/10/27 20:31:15 bouyer 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.29 2008/06/24 10:37:19 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_smb.c,v 1.29.6.1 2009/10/27 20:31:15 bouyer 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>
 @@ -584,26 +584,42 @@ smb_smb_treedisconnect(struct smb_share
 static inline int
 smb_smb_readx(struct smb_share *ssp, u_int16_t fid, size_t *len, size_t *rresid,
 	      struct uio *uio, struct smb_cred *scred)
+{
 	struct smb_rq *rqp;
 	struct mbchain *mbp;
 	struct mdchain *mdp;
 	u_int8_t wc;
 	int error;
 	u_int16_t residhi, residlo, off, doff;
 	u_int32_t resid;
 	if (!(SMB_CAPS(SSTOVC(ssp)) & SMB_CAP_LARGE_FILES) &&
 	    uio->uio_offset >= (1LL << 32)) {
 		/* Cannot read at/beyond 4G */
 		return (EFBIG);
+	}
 	if (!(SMB_CAPS(SSTOVC(ssp)) & SMB_CAP_LARGE_READX)) {
 		size_t blksz;
 		blksz = SSTOVC(ssp)->vc_txmax - SMB_HDRLEN - 64;
 		if (blksz > 0xffff)
 			blksz = 0xffff;
 		*len = min(blksz, *len);
+	}
 	error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_READ_ANDX, scred, &rqp);
 	if (error)
 		return error;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
 	mb_put_uint8(mbp, 0xff);	/* no secondary command */
 	mb_put_uint8(mbp, 0);		/* MBZ */
 	mb_put_uint16le(mbp, 0);	/* offset to secondary */
 	mb_put_mem(mbp, (void *)&fid, sizeof(fid), MB_MSYSTEM);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	*len = min(SSTOVC(ssp)->vc_rxmax, *len);
 	mb_put_uint16le(mbp, *len);	/* MaxCount */
 	mb_put_uint16le(mbp, *len);	/* MinCount (only indicates blocking) */
 @@ -664,40 +680,57 @@ smb_smb_readx(struct smb_share *ssp, u_i
+}
 static inline int
 smb_smb_writex(struct smb_share *ssp, u_int16_t fid, size_t *len, size_t *rresid,
 	struct uio *uio, struct smb_cred *scred)
+{
 	struct smb_rq *rqp;
 	struct mbchain *mbp;
 	struct mdchain *mdp;
 	int error;
 	u_int8_t wc;
 	u_int16_t resid;
 	if (!(SMB_CAPS(SSTOVC(ssp)) & SMB_CAP_LARGE_FILES) &&
 	    uio->uio_offset >= (1LL << 32)) {
 		/* Cannot write at/beyond 4G */
 		return (EFBIG);
+	}
 	if (SMB_CAPS(SSTOVC(ssp)) & SMB_CAP_LARGE_WRITEX) {
 		*len = min(SSTOVC(ssp)->vc_wxmax, *len);
 	} else {
 		size_t blksz;
 		blksz = SSTOVC(ssp)->vc_txmax - SMB_HDRLEN - 64;
 		if (blksz > 0xffff)
 			blksz = 0xffff;
 		*len = min(blksz, *len);
+	}
 	error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_WRITE_ANDX, scred, &rqp);
-	if (error)
+	if (error != 0)
 		return (error);
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
 	mb_put_uint8(mbp, 0xff);	/* no secondary command */
 	mb_put_uint8(mbp, 0);		/* MBZ */
 	mb_put_uint16le(mbp, 0);	/* offset to secondary */
 	mb_put_mem(mbp, (void *)&fid, sizeof(fid), MB_MSYSTEM);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	mb_put_uint32le(mbp, 0);	/* MBZ (timeout) */
 	mb_put_uint16le(mbp, 0);	/* !write-thru */
 	mb_put_uint16le(mbp, 0);
 	*len = min(SSTOVC(ssp)->vc_wxmax, *len);
 	mb_put_uint16le(mbp, *len >> 16);
 	mb_put_uint16le(mbp, *len);
 	mb_put_uint16le(mbp, 64);	/* data offset from header start */
 	mb_put_uint32le(mbp, uio->uio_offset >> 32);	/* OffsetHigh */
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
 	do {
 		mb_put_uint8(mbp, 0xee);	/* mimic xp pad byte! */
 		error = mb_put_uio(mbp, uio, *len);
 		if (error)
 			break;
 		smb_rq_bend(rqp);
 		error = smb_rq_simple(rqp);
 @@ -775,27 +808,28 @@ smb_smb_read(struct smb_share *ssp, u_in
 			break;
 		*rresid = resid;
 	} while(0);
 	smb_rq_done(rqp);
 	return error;
+}
 int
 smb_read(struct smb_share *ssp, u_int16_t fid, struct uio *uio,
 	struct smb_cred *scred)
+{
 	size_t tsize, len, resid;
 	int error = 0;
-	int rx = (SMB_CAPS(SSTOVC(ssp)) & SMB_CAP_LARGE_READX);
+	bool rx = (SMB_CAPS(SSTOVC(ssp)) &
 		   (SMB_CAP_LARGE_FILES|SMB_CAP_LARGE_READX)) != 0;
 	resid = 0;	/* XXX gcc */
 	tsize = uio->uio_resid;
 	while (tsize > 0) {
 		len = tsize;
 		if (rx)
 		    error = smb_smb_readx(ssp, fid, &len, &resid, uio, scred);
 		else
 		    error = smb_smb_read(ssp, fid, &len, &resid, uio, scred);
 		if (error)
 			break;
 		tsize -= resid;
 @@ -856,38 +890,39 @@ smb_smb_write(struct smb_share *ssp, u_i
 		md_get_uint16le(mdp, &resid);
 		*rresid = resid;
 	} while(0);
 	smb_rq_done(rqp);
 	return error;
+}
 int
 smb_write(struct smb_share *ssp, u_int16_t fid, struct uio *uio,
 	struct smb_cred *scred)
+{
 	int error = 0;
 	size_t len, tsize, resid;
-	int wx = (SMB_CAPS(SSTOVC(ssp)) & SMB_CAP_LARGE_WRITEX);
+	bool wx = (SMB_CAPS(SSTOVC(ssp)) &
 		   (SMB_CAP_LARGE_FILES|SMB_CAP_LARGE_WRITEX)) != 0;
 	resid = 0;	/* XXX gcc */
 	tsize = uio->uio_resid;
 	while (tsize > 0) {
 		len = tsize;
 		if (wx)
 		    error = smb_smb_writex(ssp, fid, &len, &resid, uio, scred);
 		else
 		    error = smb_smb_write(ssp, fid, &len, &resid, uio, scred);
-		if (error)
+		if (error != 0)
 			break;
 		if (resid < len) {
 			error = EIO;
 			break;
+		}
 		tsize -= resid;
+	}
 	return error;
+}
 #if 0
 int
 smb_smb_echo(struct smb_vc *vcp, struct smb_cred *scred)