 @@ -1,14 +1,14 @@
-/* $NetBSD: cgd.c,v 1.132 2020/06/13 22:15:06 riastradh Exp $ */
+/* $NetBSD: cgd.c,v 1.133 2020/06/13 22:15:57 riastradh Exp $ */
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roland C. Dowdeswell.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.132 2020/06/13 22:15:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.133 2020/06/13 22:15:57 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 @@ -376,27 +376,27 @@ static int cgd_destroy(device_t);
 static int	cgd_diskstart(device_t, struct buf *);
 static void	cgd_diskstart2(struct cgd_softc *, struct cgd_xfer *);
 static void	cgdiodone(struct buf *);
 static void	cgd_iodone2(struct cgd_softc *, struct cgd_xfer *);
 static void	cgd_enqueue(struct cgd_softc *, struct cgd_xfer *);
 static void	cgd_process(struct work *, void *);
 static int	cgd_dumpblocks(device_t, void *, daddr_t, int);
 static int	cgd_ioctl_set(struct cgd_softc *, void *, struct lwp *);
 static int	cgd_ioctl_clr(struct cgd_softc *, struct lwp *);
 static int	cgd_ioctl_get(dev_t, void *, struct lwp *);
 static int	cgdinit(struct cgd_softc *, const char *, struct vnode *,
 			struct lwp *);
-static void	cgd_cipher(struct cgd_softc *, void *, void *,
+static void	cgd_cipher(struct cgd_softc *, void *, const void *,
 			   size_t, daddr_t, size_t, int);
 static void	cgd_selftest(void);
 static const struct dkdriver cgddkdriver = {
         .d_minphys  = minphys,
         .d_open = cgdopen,
         .d_close = cgdclose,
         .d_strategy = cgdstrategy,
         .d_iosize = NULL,
         .d_diskstart = cgd_diskstart,
         .d_dumpblocks = cgd_dumpblocks,
         .d_lastclose = NULL
 @@ -1525,31 +1525,31 @@ cgd_process(struct work *wk, void *arg)
 	if (cx->cx_dir == CGD_CIPHER_ENCRYPT) {
 		cgd_diskstart2(sc, cx);
 	} else {
 		cgd_iodone2(sc, cx);
+	}
 	mutex_enter(&cw->cw_lock);
 	if (cw->cw_busy > 0)
 		cw->cw_busy--;
 	mutex_exit(&cw->cw_lock);
+}
 static void
-cgd_cipher(struct cgd_softc *sc, void *dstv, void *srcv,
+cgd_cipher(struct cgd_softc *sc, void *dstv, const void *srcv,
     size_t len, daddr_t blkno, size_t secsize, int dir)
+{
 	char		*dst = dstv;
-	char		*src = srcv;
+	const char	*src = srcv;
 	cfunc_cipher	*cipher = sc->sc_cfuncs->cf_cipher;
 	size_t		blocksize = sc->sc_cdata.cf_blocksize;
 	size_t		todo;
 	char		blkno_buf[CGD_MAXBLOCKSIZE];
 	DPRINTF_FOLLOW(("cgd_cipher() dir=%d\n", dir));
 	KASSERT(len % blocksize == 0);
 	/* ensure that sizeof(daddr_t) <= blocksize (for encblkno IVing) */
 	KASSERT(sizeof(daddr_t) <= blocksize);
 	KASSERT(blocksize <= CGD_MAXBLOCKSIZE);
 	for (; len > 0; len -= todo) {

 @@ -1,14 +1,14 @@
-/* $NetBSD: cgdvar.h,v 1.20 2020/06/13 18:38:33 riastradh Exp $ */
+/* $NetBSD: cgdvar.h,v 1.21 2020/06/13 22:15:58 riastradh Exp $ */
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roland C. Dowdeswell.
+ *
  * 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.
 @@ -77,27 +77,27 @@ struct cryptdata {
 	size_t		 cf_blocksize;	/* block size (in bytes) */
 	int		 cf_keylen;	/* key length */
 	int		 cf_mode;	/* Cipher Mode and IV Gen method
 					 * (see cgu_mode above for defines) */
 	void		*cf_priv;	/* enc alg private data */
 };
 struct cgd_xfer {
 	struct work		 cx_work;
 	struct cgd_softc	*cx_sc;
 	struct buf		*cx_obp;
 	struct buf		*cx_nbp;
 	void			*cx_dstv;
-	void			*cx_srcv;
+	const void		*cx_srcv;
 	size_t			 cx_len;
 	daddr_t			 cx_blkno;
 	size_t			 cx_secsize;
 	int			 cx_dir;
 };
 struct cgd_worker {
 	struct workqueue	*cw_wq;		/* work queue */
 	struct pool		*cw_cpool;	/* cgd_xfer contexts */
 	u_int		 	 cw_busy;	/* number of busy contexts */
 	u_int			 cw_last;	/* index of last CPU used */
 	kmutex_t		 cw_lock;
 };