Attachment #22213 for bug #35819

Lines 4-10 Link Here

(-)linux-2.4.22-ppc-dev.orig/crypto/Config.in (-1 / +3 lines)
4	mainmenu_option next_comment	4	mainmenu_option next_comment
5	comment 'Cryptographic options'	5	comment 'Cryptographic options'
6		6
7	if [ "$CONFIG_INET_AH" = "y" -o \	7	if [ "$CONFIG_BLK_DEV_CRYPTOLOOP" = "y" -o \
		8	"$CONFIG_BLK_DEV_CRYPTOLOOP" = "m" -o \
		9	"$CONFIG_INET_AH" = "y" -o \
8	"$CONFIG_INET_AH" = "m" -o \	10	"$CONFIG_INET_AH" = "m" -o \
9	"$CONFIG_INET_ESP" = "y" -o \	11	"$CONFIG_INET_ESP" = "y" -o \
10	"$CONFIG_INET_ESP" = "m" -o \	12	"$CONFIG_INET_ESP" = "m" -o \

Lines 40-45 Link Here

(-)linux-2.4.22-ppc-dev.orig/drivers/block/Config.in (+1 lines)
40	dep_tristate 'Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)' CONFIG_BLK_DEV_UMEM $CONFIG_PCI $CONFIG_EXPERIMENTAL	40	dep_tristate 'Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)' CONFIG_BLK_DEV_UMEM $CONFIG_PCI $CONFIG_EXPERIMENTAL
41		41
42	tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP	42	tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
		43	dep_tristate ' Cryptoloop support' CONFIG_BLK_DEV_CRYPTOLOOP $CONFIG_BLK_DEV_LOOP
43	dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET	44	dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
44		45
45	tristate 'RAM disk support' CONFIG_BLK_DEV_RAM	46	tristate 'RAM disk support' CONFIG_BLK_DEV_RAM

Lines 31-36 Link Here

(-)linux-2.4.22-ppc-dev.orig/drivers/block/Makefile (+1 lines)
31	obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o	31	obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o
32	obj-$(CONFIG_BLK_DEV_UMEM) += umem.o	32	obj-$(CONFIG_BLK_DEV_UMEM) += umem.o
33	obj-$(CONFIG_BLK_DEV_NBD) += nbd.o	33	obj-$(CONFIG_BLK_DEV_NBD) += nbd.o
		34	obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o
34		35
35	subdir-$(CONFIG_PARIDE) += paride	36	subdir-$(CONFIG_PARIDE) += paride
36		37




/*
   Linux loop encryption enabling module

   Copyright (C)  2002 Herbert Valerio Riedel <hvr@gnu.org>
   Copyright (C)  2003 Fruhwirth Clemens <clemens@endorphin.org>

   This module is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   This module is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this module; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include <linux/module.h>

#include <linux/init.h>
#include <linux/string.h>
#include <linux/crypto.h>
#include <linux/blkdev.h>
#include <linux/loop.h>
#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <asm/scatterlist.h>

MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("loop blockdevice transferfunction adaptor / CryptoAPI");
MODULE_AUTHOR("Herbert Valerio Riedel <hvr@gnu.org>");

static int
cryptoloop_init(struct loop_device *lo, /* const */ struct loop_info *info)
{
	int err = -EINVAL;
	char cms[LO_NAME_SIZE];			/* cipher-mode string */
	char *cipher;
	char *mode;
	char *cmsp = cms;			/* c-m string pointer */
	struct crypto_tfm *tfm = NULL;

	/* encryption breaks for non sector aligned offsets */

	if (info->lo_offset % LOOP_IV_SECTOR_SIZE)
		goto out;

	strncpy(cms, info->lo_name, LO_NAME_SIZE);
	cms[LO_NAME_SIZE - 1] = 0;
	cipher = strsep(&cmsp, "-");
	mode = strsep(&cmsp, "-");

	if (mode == NULL || strcmp(mode, "cbc") == 0)
		tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC);
	else if (strcmp(mode, "ecb") == 0)
		tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB);
	if (tfm == NULL)
		return -EINVAL;

	err = tfm->crt_u.cipher.cit_setkey(tfm, info->lo_encrypt_key,
					   info->lo_encrypt_key_size);
	
	if (err != 0)
		goto out_free_tfm;

	lo->key_data = tfm;
	return 0;

 out_free_tfm:
	crypto_free_tfm(tfm);

 out:
	return err;
}

typedef int (*encdec_t)(struct crypto_tfm *tfm,
			struct scatterlist *sg_out,
			struct scatterlist *sg_in,
			unsigned int nsg, u8 *iv);

static int
cryptoloop_transfer(struct loop_device *lo, int cmd, char *raw_buf,
		     char *loop_buf, int size, sector_t IV)
{
	struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data;
	struct scatterlist sg_out = { 0, };
	struct scatterlist sg_in = { 0, };

	encdec_t encdecfunc;
	char const *in;
	char *out;

	if (cmd == READ) {
		in = raw_buf;
		out = loop_buf;
		encdecfunc = tfm->crt_u.cipher.cit_decrypt_iv;
	} else {
		in = loop_buf;
		out = raw_buf;
		encdecfunc = tfm->crt_u.cipher.cit_encrypt_iv;
	}

	while (size > 0) {
		const int sz = min(size, LOOP_IV_SECTOR_SIZE);
		u32 iv[4] = { 0, };
		iv[0] = cpu_to_le32(IV & 0xffffffff);

		sg_in.page = virt_to_page(in);
		sg_in.offset = (unsigned long)in & ~PAGE_MASK;
		sg_in.length = sz;

		sg_out.page = virt_to_page(out);
		sg_out.offset = (unsigned long)out & ~PAGE_MASK;
		sg_out.length = sz;

		encdecfunc(tfm, &sg_out, &sg_in, sz, (u8 *)iv);

		IV++;
		size -= sz;
		in += sz;
		out += sz;
	}

	return 0;
}


static int
cryptoloop_ioctl(struct loop_device *lo, int cmd, unsigned long arg)
{
	return -EINVAL;
}

static int
cryptoloop_release(struct loop_device *lo)
{
	struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data;
	if (tfm != NULL) {
		crypto_free_tfm(tfm);
		lo->key_data = NULL;
		return 0;
	}
	printk(KERN_ERR "cryptoloop_release(): tfm == NULL?\n");
	return -EINVAL;
}

static struct loop_func_table cryptoloop_funcs = {
	.number = LO_CRYPT_CRYPTOAPI,
	.init = cryptoloop_init,
	.ioctl = cryptoloop_ioctl,
	.transfer = cryptoloop_transfer,
	.release = cryptoloop_release,
	/* .owner = THIS_MODULE */
};

static int __init
init_cryptoloop(void)
{
	int rc = loop_register_transfer(&cryptoloop_funcs);

	if (rc)
		printk(KERN_ERR "cryptoloop: loop_register_transfer failed\n");
	return rc;
}

static void __exit
cleanup_cryptoloop(void)
{
	if (loop_unregister_transfer(LO_CRYPT_CRYPTOAPI))
		printk(KERN_ERR
			"cryptoloop: loop_unregister_transfer failed\n");
}

module_init(init_cryptoloop);
module_exit(cleanup_cryptoloop);




 *   problem above. Encryption modules that used to rely on the old scheme
 *   should just call ->i_mapping->bmap() to calculate the physical block
 *   number.
 *
 * IV is now passed as (512 byte) sector number.
 * Jari Ruusu <jari.ruusu@pp.inet.fi>, May 18 2001
 *
 * External encryption module locking bug fixed.
 * Ingo Rohloff <rohloff@in.tum.de>, June 21 2001
 *
 * Make device backed loop work with swap (pre-allocated buffers + queue rewrite).
 * Jari Ruusu <jari.ruusu@pp.inet.fi>, September 2 2001
 *
 * File backed code now uses file->f_op->read/write. Based on Andrew Morton's idea.
 * Jari Ruusu <jari.ruusu@pp.inet.fi>, May 23 2002
 */ 

#include <linux/config.h>

static struct loop_device *loop_dev;
static int *loop_sizes;
static int *loop_blksizes;
static int *loop_hardsizes;
static devfs_handle_t devfs_handle;      /*  For the directory */

/*
 * Transfer functions
 */
static int transfer_none(struct loop_device *lo, int cmd, char *raw_buf,
			 char *loop_buf, int size, sector_t real_block)
{
	/* this code is only called from file backed loop  */
	/* and that code expects this function to be no-op */
			memcpy(loop_buf, raw_buf, size);
		else
			memcpy(raw_buf, loop_buf, size);
	}

	if (current->need_resched)
		schedule();
	return 0;
}

static int transfer_xor(struct loop_device *lo, int cmd, char *raw_buf,
			char *loop_buf, int size, sector_t real_block)
{
	char	*in, *out, *key;
	int	i, keysize;

	keysize = lo->lo_encrypt_key_size;
	for (i = 0; i < size; i++)
		*out++ = *in++ ^ key[(i & 511) % keysize];
	if (current->need_resched)
		schedule();
	return 0;
}

static int none_status(struct loop_device *lo, struct loop_info *info)
{
	lo->lo_flags |= LO_FLAGS_BH_REMAP;
	return 0;
}


/* xfer_funcs[0] is special - its release function is never called */ 
struct loop_func_table *xfer_funcs[MAX_LO_CRYPT] = {
	&none_funcs,
	&xor_funcs,
};

/*
 *  First number of 'lo_prealloc' is the default number of RAM pages
 *  to pre-allocate for each device backed loop. Every (configured)
 *  device backed loop pre-allocates this amount of RAM pages unless
 *  later 'lo_prealloc' numbers provide an override. 'lo_prealloc'
 *  overrides are defined in pairs: loop_index,number_of_pages
 */
static int lo_prealloc[9] = { 125, 999, 0, 999, 0, 999, 0, 999, 0 };
#define LO_PREALLOC_MIN 4    /* minimum user defined pre-allocated RAM pages */
#define LO_PREALLOC_MAX 512  /* maximum user defined pre-allocated RAM pages */

#ifdef MODULE
MODULE_PARM(lo_prealloc, "1-9i");
MODULE_PARM_DESC(lo_prealloc, "Number of pre-allocated pages [,index,pages]...");
#else
static int __init lo_prealloc_setup(char *str)
{
	int x, y, z;

	for (x = 0; x < (sizeof(lo_prealloc) / sizeof(int)); x++) {
		z = get_option(&str, &y);
		if (z > 0)
			lo_prealloc[x] = y;
		if (z < 2)
			break;
	}
	return 1;
}
__setup("lo_prealloc=", lo_prealloc_setup);
#endif

/*
 * This is loop helper thread nice value in range
 * from 0 (low priority) to -20 (high priority).
 */
#if defined(DEF_NICE) && defined(DEF_COUNTER)
static int lo_nice = -20;   /* old scheduler default */
#else
static int lo_nice = -1;    /* O(1) scheduler default */
#endif

#ifdef MODULE
MODULE_PARM(lo_nice, "1i");
MODULE_PARM_DESC(lo_nice, "Loop thread scheduler nice (0 ... -20)");
#else
static int __init lo_nice_setup(char *str)
{
	int y;
	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
	struct address_space_operations *aops = mapping->a_ops;
	struct page *page;
	char *kaddr, *data;
	unsigned long index;
	unsigned size, offset;
	int len;

	down(&mapping->host->i_sem);
	index = pos >> PAGE_CACHE_SHIFT;
	offset = pos & (PAGE_CACHE_SIZE - 1);
	len = bh->b_size;
	data = bh->b_data;
	while (len > 0) {
		int IV = index * (PAGE_CACHE_SIZE/bsize) + offset/bsize;
		int transfer_result;

	if (get_option(&str, &y) == 1)
		lo_nice = y;
	return 1;

		page = grab_cache_page(mapping, index);
		if (!page)
			goto fail;
		kaddr = kmap(page);
		if (aops->prepare_write(file, page, offset, offset+size))
			goto unlock;
		flush_dcache_page(page);
		transfer_result = lo_do_transfer(lo, WRITE, kaddr + offset, data, size, IV);
		if (transfer_result) {
			/*
			 * The transfer failed, but we still write the data to
			 * keep prepare/commit calls balanced.
			 */
			printk(KERN_ERR "loop: transfer error block %ld\n", index);
			memset(kaddr + offset, 0, size);
		}
		if (aops->commit_write(file, page, offset, offset+size))
			goto unlock;
		if (transfer_result)
			goto unlock;
		kunmap(page);
		data += size;
		len -= size;
		offset = 0;
		index++;
		pos += size;
		UnlockPage(page);
		page_cache_release(page);
	}
	up(&mapping->host->i_sem);
	return 0;

unlock:
	kunmap(page);
	UnlockPage(page);
	page_cache_release(page);
fail:
	up(&mapping->host->i_sem);
	return -1;
}
__setup("lo_nice=", lo_nice_setup);
#endif

typedef struct {
	struct buffer_head	**q0;
	struct buffer_head	**q1;
	struct buffer_head	**q2;
	int			x0;
	int			x1;
	int			x2;
} que_look_up_table;

static void loop_prealloc_cleanup(struct loop_device *lo)
{
	struct buffer_head *bh;

	while ((bh = lo->lo_bh_free)) {
		__free_page(bh->b_page);
		lo->lo_bh_free = bh->b_reqnext;
		bh->b_reqnext = NULL;
		kmem_cache_free(bh_cachep, bh);
	}

	kaddr = kmap(page);
	if (lo_do_transfer(lo, READ, kaddr + offset, p->data, size, IV)) {
		size = 0;
		printk(KERN_ERR "loop: transfer error block %ld\n",page->index);
		desc->error = -EINVAL;
	}
	kunmap(page);
	
	desc->count = count - size;
	desc->written += size;
	p->data += size;
	return size;
}

static int lo_receive(struct loop_device *lo, struct buffer_head *bh, int bsize,
		      loff_t pos)
{
	struct lo_read_data cookie;
	read_descriptor_t desc;
	struct file *file;

	cookie.lo = lo;
	cookie.data = bh->b_data;
	cookie.bsize = bsize;
	desc.written = 0;
	desc.count = bh->b_size;
	desc.buf = (char*)&cookie;
	desc.error = 0;
	spin_lock_irq(&lo->lo_lock);
	file = lo->lo_backing_file;
	spin_unlock_irq(&lo->lo_lock);
	do_generic_file_read(file, &pos, &desc, lo_read_actor);
	return desc.error;
}

static int loop_prealloc_init(struct loop_device *lo, int y)
{
	struct buffer_head *bh;
	int x;

	if(!y) {
		y = lo_prealloc[0];
		for (x = 1; x < (sizeof(lo_prealloc) / sizeof(int)); x += 2) {
			if (lo_prealloc[x + 1] && (lo->lo_number == lo_prealloc[x])) {
				y = lo_prealloc[x + 1];
				break;
			}
		}
	}
	lo->lo_bh_flsh = (y * 3) / 4;

	for (x = 0; x < y; x++) {
		bh = kmem_cache_alloc(bh_cachep, SLAB_KERNEL);
		if (!bh) {
			loop_prealloc_cleanup(lo);
			return 1;
		}
		bh->b_page = alloc_page(GFP_KERNEL);
		if (!bh->b_page) {
			bh->b_reqnext = NULL;
			kmem_cache_free(bh_cachep, bh);
			loop_prealloc_cleanup(lo);
			return 1;
		}
		bh->b_reqnext = lo->lo_bh_free;
		lo->lo_bh_free = bh;
	}
	return 0;
}

static void loop_add_queue_last(struct loop_device *lo, struct buffer_head *bh, struct buffer_head **q)
					unsigned long sector)
{
	unsigned long flags;
	unsigned long offset, IV;

	spin_lock_irqsave(&lo->lo_lock, flags);
	if (*q) {
		bh->b_reqnext = (*q)->b_reqnext;
		(*q)->b_reqnext = bh;
	} else {
		bh->b_reqnext = bh;
	}
	*q = bh;
	spin_unlock_irqrestore(&lo->lo_lock, flags);

	if (waitqueue_active(&lo->lo_bh_wait))
		wake_up_interruptible(&lo->lo_bh_wait);
}

static void loop_add_queue_first(struct loop_device *lo, struct buffer_head *bh, struct buffer_head **q)
{
	spin_lock_irq(&lo->lo_lock);
	if (*q) {
		bh->b_reqnext = (*q)->b_reqnext;
		(*q)->b_reqnext = bh;
	} else {
		bh->b_reqnext = bh;
		*q = bh;
	}
	spin_unlock_irq(&lo->lo_lock);

	return ret;
}

static struct buffer_head *loop_get_bh(struct loop_device *lo, int *list_nr,
					que_look_up_table *qt)
{
	struct buffer_head *bh = NULL, *last;

	spin_lock_irq(&lo->lo_lock);
	if ((last = *qt->q0)) {
		bh = last->b_reqnext;
		if (bh == last)
			*qt->q0 = NULL;
		else
			last->b_reqnext = bh->b_reqnext;
		bh->b_reqnext = NULL;
		*list_nr = qt->x0;
	} else if ((last = *qt->q1)) {
		bh = last->b_reqnext;
		if (bh == last)
			*qt->q1 = NULL;
		else
			last->b_reqnext = bh->b_reqnext;
		bh->b_reqnext = NULL;
		*list_nr = qt->x1;
	} else if ((last = *qt->q2)) {
		bh = last->b_reqnext;
		if (bh == last)
			*qt->q2 = NULL;
		else
			last->b_reqnext = bh->b_reqnext;
		bh->b_reqnext = NULL;
		*list_nr = qt->x2;
	}
	spin_unlock_irq(&lo->lo_lock);
	return bh;
}

static void loop_put_buffer(struct loop_device *lo, struct buffer_head *b)
 * Add buffer_head to back of pending list
 */
static void loop_add_bh(struct loop_device *lo, struct buffer_head *bh)
{
	unsigned long flags;
	int wk;

	spin_lock_irqsave(&lo->lo_lock, flags);
	b->b_reqnext = lo->lo_bh_free;
	lo->lo_bh_free = b;
	wk = lo->lo_bh_need;
	} else
		lo->lo_bh = lo->lo_bhtail = bh;
	spin_unlock_irqrestore(&lo->lo_lock, flags);

	if (wk && waitqueue_active(&lo->lo_bh_wait))
		wake_up_interruptible(&lo->lo_bh_wait);
}

static void loop_end_io_transfer_wr(struct buffer_head *bh, int uptodate)
 * Grab first pending buffer
 */
static struct buffer_head *loop_get_bh(struct loop_device *lo)
{
	struct loop_device *lo = &loop_dev[MINOR(bh->b_dev)];
	struct buffer_head *rbh = bh->b_private;
	spin_lock_irq(&lo->lo_lock);
	if ((bh = lo->lo_bh)) {
		if (bh == lo->lo_bhtail)
			lo->lo_bhtail = NULL;
		lo->lo_bh = bh->b_reqnext;
		bh->b_reqnext = NULL;
	}
	spin_unlock_irq(&lo->lo_lock);

	rbh->b_reqnext = NULL;
	rbh->b_end_io(rbh, uptodate);
	loop_put_buffer(lo, bh);
	if (atomic_dec_and_test(&lo->lo_pending))
		wake_up_interruptible(&lo->lo_bh_wait);
}

static void loop_end_io_transfer_rd(struct buffer_head *bh, int uptodate)
 * when buffer i/o has completed. if BH_Dirty is set, this was a WRITE
 * and lo->transfer stuff has already been done. if not, it was a READ
 * so queue it for the loop thread and let it do the transfer out of
 * b_end_io context (we don't want to do decrypt of a page with irqs
 * disabled)
 */
static void loop_end_io_transfer(struct buffer_head *bh, int uptodate)
{
	struct loop_device *lo = &loop_dev[MINOR(bh->b_dev)];

	if (!uptodate)
		loop_end_io_transfer_wr(bh, uptodate);
	else
		loop_add_queue_last(lo, bh, &lo->lo_bhQue0);
		if (atomic_dec_and_test(&lo->lo_pending))
			up(&lo->lo_bh_mutex);
		loop_put_buffer(bh);
	} else
		loop_add_bh(lo, bh);
}

static struct buffer_head *loop_get_buffer(struct loop_device *lo,
		struct buffer_head *rbh, int from_thread, int rw)
{
	struct buffer_head *bh;
	struct page *p;
	unsigned long flags;

	spin_lock_irqsave(&lo->lo_lock, flags);
	bh = lo->lo_bh_free;
	if (bh) {
		lo->lo_bh_free = bh->b_reqnext;
		if (from_thread)
			lo->lo_bh_need = 0;
	} else {
		if (from_thread)
			lo->lo_bh_need = 1;
	}
	spin_unlock_irqrestore(&lo->lo_lock, flags);
	if (!bh)
		return (struct buffer_head *)0;

	p = bh->b_page;
	memset(bh, 0, sizeof(struct buffer_head));
	bh->b_page = p;
			break;

		run_task_queue(&tq_disk);
		set_current_state(TASK_INTERRUPTIBLE);
		schedule_timeout(HZ);
	} while (1);
	memset(bh, 0, sizeof(*bh));

	bh->b_private = rbh;
	bh->b_size = rbh->b_size;
	bh->b_dev = rbh->b_rdev;
	bh->b_rdev = lo->lo_device;
	bh->b_state = (1 << BH_Req) | (1 << BH_Mapped) | (1 << BH_Lock);
	bh->b_data = page_address(bh->b_page);
	bh->b_end_io = (rw == WRITE) ? loop_end_io_transfer_wr : loop_end_io_transfer_rd;
	bh->b_rsector = rbh->b_rsector + (lo->lo_offset >> 9);
	init_waitqueue_head(&bh->b_wait);

	return bh;
}
	 * blocks... if highmem bounce buffering can get away with it,
	 * so can we :-)
	 */
	do {
		bh->b_page = alloc_page(GFP_NOIO);
		if (bh->b_page)
			break;

#define MAX_DISK_SIZE 1024*1024*1024
		set_current_state(TASK_INTERRUPTIBLE);
		schedule_timeout(HZ);
	} while (1);

static int compute_loop_size(struct loop_device *lo, struct dentry * lo_dentry, kdev_t lodev)
{
	if (S_ISREG(lo_dentry->d_inode->i_mode))
		return (lo_dentry->d_inode->i_size - lo->lo_offset) >> BLOCK_SIZE_BITS;
	if (blk_size[MAJOR(lodev)])
		return blk_size[MAJOR(lodev)][MINOR(lodev)] -
                                (lo->lo_offset >> BLOCK_SIZE_BITS);
	return MAX_DISK_SIZE;
}

static void figure_loop_size(struct loop_device *lo)
{
	loop_sizes[lo->lo_number] = compute_loop_size(lo,
					lo->lo_backing_file->f_dentry,
					lo->lo_device);
}

static int loop_file_io(struct file *file, char *buf, int size, loff_t *ppos, int w)
{
	mm_segment_t fs;
	int x, y, z;

	y = 0;
	do {
		z = size - y;
		fs = get_fs();  
		set_fs(get_ds());
		if (w) {
			x = file->f_op->write(file, buf + y, z, ppos);
			set_fs(fs);
		} else {
			x = file->f_op->read(file, buf + y, z, ppos);
			set_fs(fs);
			if (!x)
				return 1;
		}
		if (x < 0) {
			if ((x == -EAGAIN) || (x == -ENOMEM) || (x == -ERESTART) || (x == -EINTR)) {
				run_task_queue(&tq_disk);
				set_current_state(TASK_INTERRUPTIBLE);
				schedule_timeout(HZ / 2);
				continue;
			}
			return 1;
		}
		y += x;
	} while (y < size);
	return 0;
}

static int do_bh_filebacked(struct loop_device *lo, struct buffer_head *bh, int rw)
{
	loff_t pos;
	struct file *file = lo->lo_backing_file;
	char *data, *buf;
	unsigned int size, len;
	unsigned long IV;

	pos = ((loff_t) bh->b_rsector << 9) + lo->lo_offset;
	buf = page_address(lo->lo_bh_free->b_page);
	len = bh->b_size;
	data = bh->b_data;
	IV = bh->b_rsector + (lo->lo_offset >> 9);
	while (len > 0) {
		if (lo->lo_encrypt_type == LO_CRYPT_NONE) {
			/* this code relies that NONE transfer is a no-op */
			buf = data;
		}
		size = PAGE_SIZE;
		if (size > len)
			size = len;
		if (rw == WRITE) {
			if (lo_do_transfer(lo, WRITE, buf, data, size, IV)) {
				printk(KERN_ERR "loop%d: write transfer error, sector %lu\n", lo->lo_number, IV);
				return 1;
			}
			if (loop_file_io(file, buf, size, &pos, 1)) {
				printk(KERN_ERR "loop%d: write i/o error, sector %lu\n", lo->lo_number, IV);
				return 1;
			}
		} else {
			if (loop_file_io(file, buf, size, &pos, 0)) {
				printk(KERN_ERR "loop%d: read i/o error, sector %lu\n", lo->lo_number, IV);
				return 1;
			}
			if (lo_do_transfer(lo, READ, buf, data, size, IV)) {
				printk(KERN_ERR "loop%d: read transfer error, sector %lu\n", lo->lo_number, IV);
				return 1;
			}
		}
		data += size;
		len -= size;
		IV += size >> 9;
	}
	return 0;
}

static int loop_make_request(request_queue_t *q, int rw, struct buffer_head *rbh)
{
	struct buffer_head *bh;
	struct loop_device *lo;
	unsigned long IV;

	set_current_state(TASK_RUNNING);
	if (!buffer_locked(rbh))
		BUG();


	} else if (rw == READA) {
		rw = READ;
	} else if (rw != READ) {
		printk(KERN_ERR "loop%d: unknown command (%d)\n", lo->lo_number, rw);
		goto err;
	}


	 * file backed, queue for loop_thread to handle
	 */
	if (lo->lo_flags & LO_FLAGS_DO_BMAP) {
		loop_add_queue_last(lo, rbh, (rw == WRITE) ? &lo->lo_bhQue1 : &lo->lo_bhQue0);
		return 0;
	}

	/*
	 * device backed, just remap rdev & rsector for NONE transfer
	 */
	if (lo->lo_encrypt_type == LO_CRYPT_NONE) {
		rbh->b_rsector += lo->lo_offset >> 9;
		rbh->b_rdev = lo->lo_device;
		generic_make_request(rw, rbh);
		if (atomic_dec_and_test(&lo->lo_pending))
			wake_up_interruptible(&lo->lo_bh_wait);
		return 0;
	}

	/*
	 * device backed, start reads and writes now if buffer available
	 */
	bh = loop_get_buffer(lo, rbh, 0, rw);
	if (!bh) {
		/* just queue request and let thread handle alloc later */
		loop_add_queue_last(lo, rbh, (rw == WRITE) ? &lo->lo_bhQue1 : &lo->lo_bhQue2);
		return 0;
	}
	if (rw == WRITE) {
		if (lo_do_transfer(lo, WRITE, bh->b_data, rbh->b_data, bh->b_size, bh->b_rsector)) {
			loop_put_buffer(lo, bh);
				   bh->b_size, IV))
			goto err;
		}
	}

	generic_make_request(rw, bh);
	return 0;

err:
	if (atomic_dec_and_test(&lo->lo_pending))
		wake_up_interruptible(&lo->lo_bh_wait);
	loop_put_buffer(bh);
out:
	buffer_IO_error(rbh);
	return 0;

	goto out;
}

static inline void loop_handle_bh(struct loop_device *lo,struct buffer_head *bh)
{
	int ret;

	/*
	 * For block backed loop, we know this is a READ
	 */
	if (lo->lo_flags & LO_FLAGS_DO_BMAP) {
		int rw = !!test_and_clear_bit(BH_Dirty, &bh->b_state);

		ret = do_bh_filebacked(lo, bh, rw);
		bh->b_end_io(bh, !ret);
	} else {
		struct buffer_head *rbh = bh->b_private;
		unsigned long IV = loop_get_iv(lo, rbh->b_rsector);

		ret = lo_do_transfer(lo, READ, bh->b_data, rbh->b_data,
				     bh->b_size, IV);

		rbh->b_end_io(rbh, !ret);
		loop_put_buffer(bh);
	}
}

/*
 * worker thread that handles reads/writes to file backed loop devices,
 * to avoid blocking in our make_request_fn. it also does loop decrypting

static int loop_thread(void *data)
{
	struct loop_device *lo = data;
	struct buffer_head *bh, *xbh;
	int x, rw, qi = 0, flushcnt = 0;
	wait_queue_t waitq;
	que_look_up_table qt[4] = {
		{ &lo->lo_bhQue0, &lo->lo_bhQue1, &lo->lo_bhQue2, 0, 1, 2 },
		{ &lo->lo_bhQue2, &lo->lo_bhQue0, &lo->lo_bhQue1, 2, 0, 1 },
		{ &lo->lo_bhQue0, &lo->lo_bhQue2, &lo->lo_bhQue1, 0, 2, 1 },
		{ &lo->lo_bhQue1, &lo->lo_bhQue0, &lo->lo_bhQue2, 1, 0, 2 }
	};
	static const struct rlimit loop_rlim_defaults[RLIM_NLIMITS] = INIT_RLIMITS;

	init_waitqueue_entry(&waitq, current);
	memcpy(&current->rlim[0], &loop_rlim_defaults[0], sizeof(current->rlim));
	daemonize();
	exit_files(current);
	reparent_to_init();

	flush_signals(current);
	spin_unlock_irq(&current->sigmask_lock);

	if (lo_nice > 0)
		lo_nice = 0;
	if (lo_nice < -20)
		lo_nice = -20;
#if defined(DEF_NICE) && defined(DEF_COUNTER)
	/* old scheduler syntax */
	current->policy = SCHED_OTHER;
	current->nice = lo_nice;
#else
	/* O(1) scheduler syntax */
	set_user_nice(current, lo_nice);
#endif

	spin_lock_irq(&lo->lo_lock);
	lo->lo_state = Lo_bound;
	atomic_inc(&lo->lo_pending);

	up(&lo->lo_sem);

	for (;;) {
		add_wait_queue(&lo->lo_bh_wait, &waitq);
		for (;;) {
			set_current_state(TASK_INTERRUPTIBLE);
			if (!atomic_read(&lo->lo_pending))
				break;

			x = 0;
			spin_lock_irq(&lo->lo_lock);
			if (lo->lo_bhQue0) {
				x = 1;
			} else if (lo->lo_bhQue1 || lo->lo_bhQue2) {
				/* file backed works too because lo->lo_bh_need == 0 */
				if (lo->lo_bh_free || !lo->lo_bh_need)
					x = 1;
			}
			spin_unlock_irq(&lo->lo_lock);
			if (x)
				break;

			schedule();
		}
		set_current_state(TASK_RUNNING);
		remove_wait_queue(&lo->lo_bh_wait, &waitq);

		/*
		 * could be woken because of tear-down, not because of
		 * pending work
		 */
		if (!atomic_read(&lo->lo_pending))
			break;

		/*
		 * read queues using alternating order to prevent starvation
		 */
		bh = loop_get_bh(lo, &x, &qt[++qi & 3]);
		if (!bh)
			continue;

		/*
		 *  x  list tag       usage(buffer-allocated)
		 * --- -------------  -----------------------
		 *  0  lo->lo_bhQue0  dev-read(y) / file-read
		 *  1  lo->lo_bhQue1  dev-write(n) / file-write
		 *  2  lo->lo_bhQue2  dev-read(n)
		 */
		rw = (x == 1) ? WRITE : READ;
		if ((x >= 1) && !(lo->lo_flags & LO_FLAGS_DO_BMAP)) {
			/* loop_make_request didn't allocate a buffer, do that now */
			xbh = loop_get_buffer(lo, bh, 1, rw);
			if (!xbh) {
				run_task_queue(&tq_disk);
				flushcnt = 0;
				loop_add_queue_first(lo, bh, (rw == WRITE) ? &lo->lo_bhQue1 : &lo->lo_bhQue2);
				/* lo->lo_bh_need should be 1 now, go back to sleep */
				continue;
			}
			if (rw == WRITE) {
				if (lo_do_transfer(lo, WRITE, xbh->b_data, bh->b_data, xbh->b_size, xbh->b_rsector)) {
					loop_put_buffer(lo, xbh);
					buffer_IO_error(bh);
					atomic_dec(&lo->lo_pending);
					continue;
				}
			}
			generic_make_request(rw, xbh);

			/* start I/O if there are no more requests lacking buffers */
			x = 0;
			spin_lock_irq(&lo->lo_lock);
			if (!lo->lo_bhQue1 && !lo->lo_bhQue2)
				x = 1;
			spin_unlock_irq(&lo->lo_lock);
			if (x || (++flushcnt >= lo->lo_bh_flsh)) {
				run_task_queue(&tq_disk);
				flushcnt = 0;
			}

			/* request not completely processed yet */
			continue;
		}
		if (lo->lo_flags & LO_FLAGS_DO_BMAP) {
			/* request is for file backed device */
			x = do_bh_filebacked(lo, bh, rw);
			bh->b_reqnext = NULL;
			bh->b_end_io(bh, !x);
		} else {
			/* device backed read has completed, do decrypt now */
			xbh = bh->b_private;
			/* must not use bh->b_rsector as IV, as it may be modified by LVM at this point */
			/* instead, recompute IV from original request */
			x = lo_do_transfer(lo, READ, bh->b_data, xbh->b_data, bh->b_size, xbh->b_rsector + (lo->lo_offset >> 9));
			xbh->b_reqnext = NULL;
			xbh->b_end_io(xbh, !x);
			loop_put_buffer(lo, bh);
		}
		loop_handle_bh(lo, bh);

		/*
		 * woken both for pending work and tear-down, lo_pending
		 * will hit zero then
		 */
		if (atomic_dec_and_test(&lo->lo_pending))

	return 0;
}

static void loop_set_softblksz(struct loop_device *lo, kdev_t dev)
{
	int bs = 0, x;

	if (blksize_size[MAJOR(lo->lo_device)])
		bs = blksize_size[MAJOR(lo->lo_device)][MINOR(lo->lo_device)];
	if (!bs)
		bs = BLOCK_SIZE;
	if (lo->lo_flags & LO_FLAGS_DO_BMAP) {
		x = loop_sizes[lo->lo_number];
		if ((bs == 8192) && (x & 7))
			bs = 4096;
		if ((bs == 4096) && (x & 3))
			bs = 2048;
		if ((bs == 2048) && (x & 1))
			bs = 1024;
	}
	set_blocksize(dev, bs);
}

static int loop_set_fd(struct loop_device *lo, struct file *lo_file, kdev_t dev,
		       unsigned int arg)
{
	struct file	*file;
	struct inode	*inode;
	kdev_t		lo_device;
	int		lo_flags = 0, hardsz = 512;
	int		error;
	int		bs;

	MOD_INC_USE_COUNT;


	if (!(file->f_mode & FMODE_WRITE))
		lo_flags |= LO_FLAGS_READ_ONLY;

	lo->lo_bh_free = lo->lo_bhQue2 = lo->lo_bhQue1 = lo->lo_bhQue0 = NULL;
	lo->lo_bh_need = lo->lo_bh_flsh = 0;
	init_waitqueue_head(&lo->lo_bh_wait);
	if (S_ISBLK(inode->i_mode)) {
		lo_device = inode->i_rdev;
		if (lo_device == dev) {
			error = -EBUSY;
			goto out_putf;
		}
		if (loop_prealloc_init(lo, 0)) {
			error = -ENOMEM;
			goto out_putf;
		}
		hardsz = get_hardsect_size(lo_device);
	} else if (S_ISREG(inode->i_mode)) {
		struct address_space_operations *aops = inode->i_mapping->a_ops;
		/*
		 * If we can't read - sorry. If we only can't write - well,
		 * it's going to be read-only.
		 */
		if (!file->f_op || !file->f_op->read)
			goto out_putf;

		if (!file->f_op->write)
			lo_flags |= LO_FLAGS_READ_ONLY;

		lo_device = inode->i_dev;
		lo_flags |= LO_FLAGS_DO_BMAP;
		if (loop_prealloc_init(lo, 1)) {
			error = -ENOMEM;
			goto out_putf;
		}
		error = 0;
	} else
		goto out_putf;

	get_file(file);

	if ((S_ISREG(inode->i_mode) && IS_RDONLY(inode)) || is_read_only(lo_device)
	    || !(lo_file->f_mode & FMODE_WRITE))
		lo_flags |= LO_FLAGS_READ_ONLY;


	lo->transfer = NULL;
	lo->ioctl = NULL;
	figure_loop_size(lo);
	lo->old_gfp_mask = inode->i_mapping->gfp_mask;
	inode->i_mapping->gfp_mask &= ~(__GFP_IO|__GFP_FS);

	if (lo_flags & LO_FLAGS_DO_BMAP) {
		lo->old_gfp_mask = inode->i_mapping->gfp_mask;
		inode->i_mapping->gfp_mask = GFP_NOIO | __GFP_HIGH;
	} else {
		lo->old_gfp_mask = -1;
	}

	loop_hardsizes[MINOR(dev)] = hardsz;
	loop_set_softblksz(lo, dev);

	lo->lo_bh = lo->lo_bhtail = NULL;
	kernel_thread(loop_thread, lo, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
	down(&lo->lo_sem);


	spin_lock_irq(&lo->lo_lock);
	lo->lo_state = Lo_rundown;
	if (atomic_dec_and_test(&lo->lo_pending))
		wake_up_interruptible(&lo->lo_bh_wait);
	spin_unlock_irq(&lo->lo_lock);

	down(&lo->lo_sem);

	loop_prealloc_cleanup(lo);
	lo->lo_backing_file = NULL;

	loop_release_xfer(lo);

	memset(lo->lo_name, 0, LO_NAME_SIZE);
	loop_sizes[lo->lo_number] = 0;
	invalidate_bdev(bdev, 0);
	if (gfp != -1)
		filp->f_dentry->d_inode->i_mapping->gfp_mask = gfp;
	lo->lo_state = Lo_unbound;
	fput(filp);
	MOD_DEC_USE_COUNT;
	return 0;
}

static int loop_set_status(struct loop_device *lo, kdev_t dev, struct loop_info *arg)
{
	struct loop_info info; 
	int err;

		lo->lo_key_owner = current->uid; 
	}	
	figure_loop_size(lo);
	loop_set_softblksz(lo, dev);
	return 0;
}


		err = loop_clr_fd(lo, inode->i_bdev);
		break;
	case LOOP_SET_STATUS:
		err = loop_set_status(lo, inode->i_rdev, (struct loop_info *) arg);
		break;
	case LOOP_GET_STATUS:
		err = loop_get_status(lo, (struct loop_info *) arg);

static int lo_open(struct inode *inode, struct file *file)
{
	struct loop_device *lo;
	int	dev;

	if (!inode)
		return -EINVAL;

	lo = &loop_dev[dev];
	MOD_INC_USE_COUNT;
	down(&lo->lo_ctl_mutex);

	type = lo->lo_encrypt_type; 
	if (type && xfer_funcs[type] && xfer_funcs[type]->lock)
		xfer_funcs[type]->lock(lo);
	lo->lo_refcnt++;
	up(&lo->lo_ctl_mutex);
	return 0;

static int lo_release(struct inode *inode, struct file *file)
{
	struct loop_device *lo;
	int	dev;

	if (!inode)
		return 0;


	lo = &loop_dev[dev];
	down(&lo->lo_ctl_mutex);
	type = lo->lo_encrypt_type;
	--lo->lo_refcnt;
	if (xfer_funcs[type] && xfer_funcs[type]->unlock)
		xfer_funcs[type]->unlock(lo);

	up(&lo->lo_ctl_mutex);
	MOD_DEC_USE_COUNT;
	return 0;


int loop_register_transfer(struct loop_func_table *funcs)
{
	if ((unsigned)funcs->number >= MAX_LO_CRYPT || xfer_funcs[funcs->number])
		return -EINVAL;
	xfer_funcs[funcs->number] = funcs;
	return 0; 

		return -EIO;
	}


	loop_dev = kmalloc(max_loop * sizeof(struct loop_device), GFP_KERNEL);
	if (!loop_dev)
		goto out_dev;

	loop_sizes = kmalloc(max_loop * sizeof(int), GFP_KERNEL);
	if (!loop_sizes)

	if (!loop_blksizes)
		goto out_blksizes;

	loop_hardsizes = kmalloc(max_loop * sizeof(int), GFP_KERNEL);
	if (!loop_hardsizes)
		goto out_hardsizes;

	blk_queue_make_request(BLK_DEFAULT_QUEUE(MAJOR_NR), loop_make_request);

	for (i = 0; i < max_loop; i++) {

		memset(lo, 0, sizeof(struct loop_device));
		init_MUTEX(&lo->lo_ctl_mutex);
		init_MUTEX_LOCKED(&lo->lo_sem);
		init_MUTEX_LOCKED(&lo->lo_bh_mutex);
		lo->lo_number = i;
		spin_lock_init(&lo->lo_lock);
	}

	memset(loop_sizes, 0, max_loop * sizeof(int));
	memset(loop_blksizes, 0, max_loop * sizeof(int));
	memset(loop_hardsizes, 0, max_loop * sizeof(int));
	blk_size[MAJOR_NR] = loop_sizes;
	blksize_size[MAJOR_NR] = loop_blksizes;
	hardsect_size[MAJOR_NR] = loop_hardsizes;
	for (i = 0; i < max_loop; i++)
		register_disk(NULL, MKDEV(MAJOR_NR, i), 1, &lo_fops, 0);

	for (i = 0; i < (sizeof(lo_prealloc) / sizeof(int)); i += 2) {
		if (!lo_prealloc[i])
			continue;
		if (lo_prealloc[i] < LO_PREALLOC_MIN)
			lo_prealloc[i] = LO_PREALLOC_MIN;
		if (lo_prealloc[i] > LO_PREALLOC_MAX)
			lo_prealloc[i] = LO_PREALLOC_MAX;
	}

	devfs_handle = devfs_mk_dir(NULL, "loop", NULL);
	devfs_register_series(devfs_handle, "%u", max_loop, DEVFS_FL_DEFAULT,
			      MAJOR_NR, 0,

	printk(KERN_INFO "loop: loaded (max %d devices)\n", max_loop);
	return 0;

out_hardsizes:
	kfree(loop_blksizes);
out_blksizes:
	kfree(loop_sizes);
out_sizes:
	kfree(loop_dev);
out_dev:
	if (devfs_unregister_blkdev(MAJOR_NR, "loop"))
		printk(KERN_WARNING "loop: cannot unregister blkdev\n");
	printk(KERN_ERR "loop: ran out of memory\n");

	devfs_unregister(devfs_handle);
	if (devfs_unregister_blkdev(MAJOR_NR, "loop"))
		printk(KERN_WARNING "loop: cannot unregister blkdev\n");

	blk_size[MAJOR_NR] = 0;
	blksize_size[MAJOR_NR] = 0;
	hardsect_size[MAJOR_NR] = 0;
	kfree(loop_dev);
	kfree(loop_sizes);
	kfree(loop_blksizes);
	kfree(loop_hardsizes);
}

module_init(loop_init);

Lines 16-21 Link Here

(-)linux-2.4.22-ppc-dev.orig/include/linux/loop.h (-14 / +26 lines)
16	#define LO_KEY_SIZE 32	16	#define LO_KEY_SIZE 32
17		17
18	#ifdef __KERNEL__	18	#ifdef __KERNEL__
		19	typedef int sector_t; /* for 2.6 this is defined in <asm/types.h> and
		20	most likely an u64; but since cryptoloop uses
		21	only the lower 32 bits of the block number
		22	passed, let's just use an 32bit int for now */
		23
		24	/* definitions for IV metric */
		25	#define LOOP_IV_SECTOR_BITS 9
		26	#define LOOP_IV_SECTOR_SIZE (1 << LOOP_IV_SECTOR_BITS)
19		27
20	/* Possible states of device */	28	/* Possible states of device */
21	enum {	29	enum {
Lines 24-29 Link Here
24	Lo_rundown,	32	Lo_rundown,
25	};	33	};
26		34
		35	struct loop_device;
		36
		37	typedef int (* transfer_proc_t)(struct loop_device *, int cmd,
		38	char raw_buf, char loop_buf, int size,
		39	sector_t real_block);
		40
27	struct loop_device {	41	struct loop_device {
28	int lo_number;	42	int lo_number;
29	int lo_refcnt;	43	int lo_refcnt;
Lines 32-40 Link Here
32	int lo_encrypt_type;	46	int lo_encrypt_type;
33	int lo_encrypt_key_size;	47	int lo_encrypt_key_size;
34	int lo_flags;	48	int lo_flags;
35	int (transfer)(struct loop_device , int cmd,	49	transfer_proc_t transfer;
36	char raw_buf, char loop_buf, int size,
37	int real_block);
38	char lo_name[LO_NAME_SIZE];	50	char lo_name[LO_NAME_SIZE];
39	char lo_encrypt_key[LO_KEY_SIZE];	51	char lo_encrypt_key[LO_KEY_SIZE];
40	__u32 lo_init[2];	52	__u32 lo_init[2];
Lines 49-74 Link Here
49	int old_gfp_mask;	61	int old_gfp_mask;
50		62
51	spinlock_t lo_lock;	63	spinlock_t lo_lock;
52	struct buffer_head *lo_bh;	64	struct buffer_head *lo_bhQue0;
53	struct buffer_head *lo_bhtail;	65	struct buffer_head *lo_bhQue1;
54	int lo_state;	66	int lo_state;
55	struct semaphore lo_sem;	67	struct semaphore lo_sem;
56	struct semaphore lo_ctl_mutex;	68	struct semaphore lo_ctl_mutex;
57	struct semaphore lo_bh_mutex;
58	atomic_t lo_pending;	69	atomic_t lo_pending;
		70	struct buffer_head *lo_bhQue2;
		71	struct buffer_head *lo_bh_free;
		72	int lo_bh_flsh;
		73	int lo_bh_need;
		74	wait_queue_head_t lo_bh_wait;
59	};	75	};
60		76
61	typedef int (* transfer_proc_t)(struct loop_device *, int cmd,
62	char raw_buf, char loop_buf, int size,
63	int real_block);
64
65	static inline int lo_do_transfer(struct loop_device lo, int cmd, char rbuf,	77	static inline int lo_do_transfer(struct loop_device lo, int cmd, char rbuf,
66	char *lbuf, int size, int rblock)	78	char *lbuf, int size, sector_t real_block)
67	{	79	{
68	if (!lo->transfer)	80	if (!lo->transfer)
69	return 0;	81	return 0;
70		82
71	return lo->transfer(lo, cmd, rbuf, lbuf, size, rblock);	83	return lo->transfer(lo, cmd, rbuf, lbuf, size, real_block);
72	}	84	}
73	#endif /* __KERNEL__ */	85	#endif /* __KERNEL__ */
74		86
Lines 77-83 Link Here
77	*/	89	*/
78	#define LO_FLAGS_DO_BMAP 1	90	#define LO_FLAGS_DO_BMAP 1
79	#define LO_FLAGS_READ_ONLY 2	91	#define LO_FLAGS_READ_ONLY 2
80	#define LO_FLAGS_BH_REMAP 4
81		92
82	/*	93	/*
83	* Note that this structure gets the wrong offsets when directly used	94	* Note that this structure gets the wrong offsets when directly used
Lines 122-127 Link Here
122	#define LO_CRYPT_IDEA 6	133	#define LO_CRYPT_IDEA 6
123	#define LO_CRYPT_DUMMY 9	134	#define LO_CRYPT_DUMMY 9
124	#define LO_CRYPT_SKIPJACK 10	135	#define LO_CRYPT_SKIPJACK 10
		136	#define LO_CRYPT_CRYPTOAPI 18
125	#define MAX_LO_CRYPT 20	137	#define MAX_LO_CRYPT 20
126		138
127	#ifdef __KERNEL__	139	#ifdef __KERNEL__
Lines 129-135 Link Here
129	struct loop_func_table {	141	struct loop_func_table {
130	int number; /* filter type */	142	int number; /* filter type */
131	int (transfer)(struct loop_device lo, int cmd, char *raw_buf,	143	int (transfer)(struct loop_device lo, int cmd, char *raw_buf,
132	char *loop_buf, int size, int real_block);	144	char *loop_buf, int size, sector_t real_block);
133	int (init)(struct loop_device , struct loop_info *);	145	int (init)(struct loop_device , struct loop_info *);
134	/* release is called from loop_unregister_transfer or clr_fd */	146	/* release is called from loop_unregister_transfer or clr_fd */
135	int (release)(struct loop_device );	147	int (release)(struct loop_device );

Return to bug 35819

Line 0 Link Here

(-)linux-2.4.22-ppc-dev.orig/drivers/block/cryptoloop.c (+179 lines)
		1	/*
		2	Linux loop encryption enabling module
		3
		4	Copyright (C) 2002 Herbert Valerio Riedel <hvr@gnu.org>
		5	Copyright (C) 2003 Fruhwirth Clemens <clemens@endorphin.org>
		6
		7	This module is free software; you can redistribute it and/or modify
		8	it under the terms of the GNU General Public License as published by
		9	the Free Software Foundation; either version 2 of the License, or
		10	(at your option) any later version.
		11
		12	This module is distributed in the hope that it will be useful,
		13	but WITHOUT ANY WARRANTY; without even the implied warranty of
		14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	GNU General Public License for more details.
		16
		17	You should have received a copy of the GNU General Public License
		18	along with this module; if not, write to the Free Software
		19	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		20	*/
		21
		22	#include <linux/module.h>
		23
		24	#include <linux/init.h>
		25	#include <linux/string.h>
		26	#include <linux/crypto.h>
		27	#include <linux/blkdev.h>
		28	#include <linux/loop.h>
		29	#include <asm/semaphore.h>
		30	#include <asm/uaccess.h>
		31	#include <asm/scatterlist.h>
		32
		33	MODULE_LICENSE("GPL");
		34	MODULE_DESCRIPTION("loop blockdevice transferfunction adaptor / CryptoAPI");
		35	MODULE_AUTHOR("Herbert Valerio Riedel <hvr@gnu.org>");
		36
		37	static int
		38	cryptoloop_init(struct loop_device lo, / const / struct loop_info info)
		39	{
		40	int err = -EINVAL;
		41	char cms[LO_NAME_SIZE]; /* cipher-mode string */
		42	char *cipher;
		43	char *mode;
		44	char cmsp = cms; / c-m string pointer */
		45	struct crypto_tfm *tfm = NULL;
		46
		47	/* encryption breaks for non sector aligned offsets */
		48
		49	if (info->lo_offset % LOOP_IV_SECTOR_SIZE)
		50	goto out;
		51
		52	strncpy(cms, info->lo_name, LO_NAME_SIZE);
		53	cms[LO_NAME_SIZE - 1] = 0;
		54	cipher = strsep(&cmsp, "-");
		55	mode = strsep(&cmsp, "-");
		56
		57	if (mode == NULL \|\| strcmp(mode, "cbc") == 0)
		58	tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC);
		59	else if (strcmp(mode, "ecb") == 0)
		60	tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB);
		61	if (tfm == NULL)
		62	return -EINVAL;
		63
		64	err = tfm->crt_u.cipher.cit_setkey(tfm, info->lo_encrypt_key,
65	info->lo_encrypt_key_size);
66
67	if (err != 0)
68	goto out_free_tfm;
69
70	lo->key_data = tfm;
71	return 0;
72
73	out_free_tfm:
74	crypto_free_tfm(tfm);
75
76	out:
77	return err;
78	}
79
80	typedef int (encdec_t)(struct crypto_tfm tfm,
81	struct scatterlist *sg_out,
82	struct scatterlist *sg_in,
83	unsigned int nsg, u8 *iv);
84
85	static int
86	cryptoloop_transfer(struct loop_device lo, int cmd, char raw_buf,
87	char *loop_buf, int size, sector_t IV)
88	{
89	struct crypto_tfm tfm = (struct crypto_tfm ) lo->key_data;
90	struct scatterlist sg_out = { 0, };
91	struct scatterlist sg_in = { 0, };
92
93	encdec_t encdecfunc;
94	char const *in;
95	char *out;
96
97	if (cmd == READ) {
98	in = raw_buf;
99	out = loop_buf;
100	encdecfunc = tfm->crt_u.cipher.cit_decrypt_iv;
101	} else {
102	in = loop_buf;
103	out = raw_buf;
104	encdecfunc = tfm->crt_u.cipher.cit_encrypt_iv;
105	}
106
107	while (size > 0) {
108	const int sz = min(size, LOOP_IV_SECTOR_SIZE);
109	u32 iv[4] = { 0, };
110	iv[0] = cpu_to_le32(IV & 0xffffffff);
111
112	sg_in.page = virt_to_page(in);
113	sg_in.offset = (unsigned long)in & ~PAGE_MASK;
114	sg_in.length = sz;
115
116	sg_out.page = virt_to_page(out);
117	sg_out.offset = (unsigned long)out & ~PAGE_MASK;
118	sg_out.length = sz;
119
120	encdecfunc(tfm, &sg_out, &sg_in, sz, (u8 *)iv);
121
122	IV++;
123	size -= sz;
124	in += sz;
125	out += sz;
126	}
127
128	return 0;
129	}
130
131
132	static int
133	cryptoloop_ioctl(struct loop_device *lo, int cmd, unsigned long arg)
134	{
135	return -EINVAL;
136	}
137
138	static int
139	cryptoloop_release(struct loop_device *lo)
140	{
141	struct crypto_tfm tfm = (struct crypto_tfm ) lo->key_data;
142	if (tfm != NULL) {
143	crypto_free_tfm(tfm);
144	lo->key_data = NULL;
145	return 0;
146	}
147	printk(KERN_ERR "cryptoloop_release(): tfm == NULL?\n");
148	return -EINVAL;
149	}
150
151	static struct loop_func_table cryptoloop_funcs = {
152	.number = LO_CRYPT_CRYPTOAPI,
153	.init = cryptoloop_init,
154	.ioctl = cryptoloop_ioctl,
155	.transfer = cryptoloop_transfer,
156	.release = cryptoloop_release,
157	/* .owner = THIS_MODULE */
158	};
159
160	static int __init
161	init_cryptoloop(void)
162	{
163	int rc = loop_register_transfer(&cryptoloop_funcs);
164
165	if (rc)
166	printk(KERN_ERR "cryptoloop: loop_register_transfer failed\n");
167	return rc;
168	}
169
170	static void __exit
171	cleanup_cryptoloop(void)
172	{
173	if (loop_unregister_transfer(LO_CRYPT_CRYPTOAPI))
174	printk(KERN_ERR
175	"cryptoloop: loop_unregister_transfer failed\n");
176	}
177
178	module_init(init_cryptoloop);
179	module_exit(cleanup_cryptoloop);