f70ee5ec8f
In the loop in scatterwalk_copychunks(), if walk->offset is zero,
then scatterwalk_pagedone rounds that up to the nearest page boundary:
walk->offset += PAGE_SIZE - 1;
walk->offset &= PAGE_MASK;
which is a no-op in this case, so we don't advance to the next element
of the scatterlist array:
if (walk->offset >= walk->sg->offset + walk->sg->length)
scatterwalk_start(walk, sg_next(walk->sg));
and we end up copying the same data twice.
It appears that other callers of scatterwalk_{page}done first advance
walk->offset, so I believe that's the correct thing to do here.
This caused a bug in NFS when run with krb5p security, which would
cause some writes to fail with permissions errors--for example, writes
of less than 8 bytes (the des blocksize) at the start of a file.
A git-bisect shows the bug was originally introduced by
5c64097aa0, first in 2.6.19-rc1.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
106 lines
2.4 KiB
C
106 lines
2.4 KiB
C
/*
|
|
* Cryptographic API.
|
|
*
|
|
* Cipher operations.
|
|
*
|
|
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
|
|
* 2002 Adam J. Richter <adam@yggdrasil.com>
|
|
* 2004 Jean-Luc Cooke <jlcooke@certainkey.com>
|
|
*
|
|
* This program 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.
|
|
*
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pagemap.h>
|
|
#include <linux/highmem.h>
|
|
#include <linux/scatterlist.h>
|
|
|
|
#include "internal.h"
|
|
#include "scatterwalk.h"
|
|
|
|
enum km_type crypto_km_types[] = {
|
|
KM_USER0,
|
|
KM_USER1,
|
|
KM_SOFTIRQ0,
|
|
KM_SOFTIRQ1,
|
|
};
|
|
EXPORT_SYMBOL_GPL(crypto_km_types);
|
|
|
|
static inline void memcpy_dir(void *buf, void *sgdata, size_t nbytes, int out)
|
|
{
|
|
void *src = out ? buf : sgdata;
|
|
void *dst = out ? sgdata : buf;
|
|
|
|
memcpy(dst, src, nbytes);
|
|
}
|
|
|
|
void scatterwalk_start(struct scatter_walk *walk, struct scatterlist *sg)
|
|
{
|
|
walk->sg = sg;
|
|
|
|
BUG_ON(!sg->length);
|
|
|
|
walk->offset = sg->offset;
|
|
}
|
|
EXPORT_SYMBOL_GPL(scatterwalk_start);
|
|
|
|
void *scatterwalk_map(struct scatter_walk *walk, int out)
|
|
{
|
|
return crypto_kmap(scatterwalk_page(walk), out) +
|
|
offset_in_page(walk->offset);
|
|
}
|
|
EXPORT_SYMBOL_GPL(scatterwalk_map);
|
|
|
|
static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
|
|
unsigned int more)
|
|
{
|
|
if (out)
|
|
flush_dcache_page(scatterwalk_page(walk));
|
|
|
|
if (more) {
|
|
walk->offset += PAGE_SIZE - 1;
|
|
walk->offset &= PAGE_MASK;
|
|
if (walk->offset >= walk->sg->offset + walk->sg->length)
|
|
scatterwalk_start(walk, sg_next(walk->sg));
|
|
}
|
|
}
|
|
|
|
void scatterwalk_done(struct scatter_walk *walk, int out, int more)
|
|
{
|
|
if (!offset_in_page(walk->offset) || !more)
|
|
scatterwalk_pagedone(walk, out, more);
|
|
}
|
|
EXPORT_SYMBOL_GPL(scatterwalk_done);
|
|
|
|
void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
|
|
size_t nbytes, int out)
|
|
{
|
|
for (;;) {
|
|
unsigned int len_this_page = scatterwalk_pagelen(walk);
|
|
u8 *vaddr;
|
|
|
|
if (len_this_page > nbytes)
|
|
len_this_page = nbytes;
|
|
|
|
vaddr = scatterwalk_map(walk, out);
|
|
memcpy_dir(buf, vaddr, len_this_page, out);
|
|
scatterwalk_unmap(vaddr, out);
|
|
|
|
scatterwalk_advance(walk, nbytes);
|
|
|
|
if (nbytes == len_this_page)
|
|
break;
|
|
|
|
buf += len_this_page;
|
|
nbytes -= len_this_page;
|
|
|
|
scatterwalk_pagedone(walk, out, 1);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(scatterwalk_copychunks);
|