mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull more set_fs removal from Al Viro: "Christoph's 'use kernel_read and friends rather than open-coding set_fs()' series" * 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fs: unexport vfs_readv and vfs_writev fs: unexport vfs_read and vfs_write fs: unexport __vfs_read/__vfs_write lustre: switch to kernel_write gadget/f_mass_storage: stop messing with the address limit mconsole: switch to kernel_read btrfs: switch write_buf to kernel_write net/9p: switch p9_fd_read to kernel_write mm/nommu: switch do_mmap_private to kernel_read serial2002: switch serial2002_tty_write to kernel_{read/write} fs: make the buf argument to __kernel_write a void pointer fs: fix kernel_write prototype fs: fix kernel_read prototype fs: move kernel_read to fs/read_write.c fs: move kernel_write to fs/read_write.c autofs4: switch autofs4_write to __kernel_write ashmem: switch to ->read_iter
This commit is contained in:
commit
581bfce969
|
@ -87,6 +87,7 @@ int arch_elf_pt_proc(void *_ehdr, void *_phdr, struct file *elf,
|
||||||
bool elf32;
|
bool elf32;
|
||||||
u32 flags;
|
u32 flags;
|
||||||
int ret;
|
int ret;
|
||||||
|
loff_t pos;
|
||||||
|
|
||||||
elf32 = ehdr->e32.e_ident[EI_CLASS] == ELFCLASS32;
|
elf32 = ehdr->e32.e_ident[EI_CLASS] == ELFCLASS32;
|
||||||
flags = elf32 ? ehdr->e32.e_flags : ehdr->e64.e_flags;
|
flags = elf32 ? ehdr->e32.e_flags : ehdr->e64.e_flags;
|
||||||
|
@ -108,21 +109,16 @@ int arch_elf_pt_proc(void *_ehdr, void *_phdr, struct file *elf,
|
||||||
|
|
||||||
if (phdr32->p_filesz < sizeof(abiflags))
|
if (phdr32->p_filesz < sizeof(abiflags))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
pos = phdr32->p_offset;
|
||||||
ret = kernel_read(elf, phdr32->p_offset,
|
|
||||||
(char *)&abiflags,
|
|
||||||
sizeof(abiflags));
|
|
||||||
} else {
|
} else {
|
||||||
if (phdr64->p_type != PT_MIPS_ABIFLAGS)
|
if (phdr64->p_type != PT_MIPS_ABIFLAGS)
|
||||||
return 0;
|
return 0;
|
||||||
if (phdr64->p_filesz < sizeof(abiflags))
|
if (phdr64->p_filesz < sizeof(abiflags))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
pos = phdr64->p_offset;
|
||||||
ret = kernel_read(elf, phdr64->p_offset,
|
|
||||||
(char *)&abiflags,
|
|
||||||
sizeof(abiflags));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ret = kernel_read(elf, &abiflags, sizeof(abiflags), &pos);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
if (ret != sizeof(abiflags))
|
if (ret != sizeof(abiflags))
|
||||||
|
|
|
@ -148,12 +148,7 @@ void mconsole_proc(struct mc_request *req)
|
||||||
}
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
loff_t pos = file->f_pos;
|
len = kernel_read(file, buf, PAGE_SIZE - 1, &file->f_pos);
|
||||||
mm_segment_t old_fs = get_fs();
|
|
||||||
set_fs(KERNEL_DS);
|
|
||||||
len = vfs_read(file, buf, PAGE_SIZE - 1, &pos);
|
|
||||||
set_fs(old_fs);
|
|
||||||
file->f_pos = pos;
|
|
||||||
if (len < 0) {
|
if (len < 0) {
|
||||||
mconsole_reply(req, "Read of file failed", 1, 0);
|
mconsole_reply(req, "Read of file failed", 1, 0);
|
||||||
goto out_free;
|
goto out_free;
|
||||||
|
|
|
@ -407,10 +407,10 @@ static int load_aout_library(struct file *file)
|
||||||
unsigned long bss, start_addr, len, error;
|
unsigned long bss, start_addr, len, error;
|
||||||
int retval;
|
int retval;
|
||||||
struct exec ex;
|
struct exec ex;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
retval = -ENOEXEC;
|
retval = -ENOEXEC;
|
||||||
error = kernel_read(file, 0, (char *) &ex, sizeof(ex));
|
error = kernel_read(file, &ex, sizeof(ex), &pos);
|
||||||
if (error != sizeof(ex))
|
if (error != sizeof(ex))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
|
|
@ -277,7 +277,7 @@ static int cx25821_get_audio_data(struct cx25821_dev *dev,
|
||||||
p = (char *)dev->_audiodata_buf_virt_addr + frame_offset;
|
p = (char *)dev->_audiodata_buf_virt_addr + frame_offset;
|
||||||
|
|
||||||
for (i = 0; i < dev->_audio_lines_count; i++) {
|
for (i = 0; i < dev->_audio_lines_count; i++) {
|
||||||
int n = kernel_read(file, file_offset, mybuf, AUDIO_LINE_SIZE);
|
int n = kernel_read(file, mybuf, AUDIO_LINE_SIZE, &file_offset);
|
||||||
if (n < AUDIO_LINE_SIZE) {
|
if (n < AUDIO_LINE_SIZE) {
|
||||||
pr_info("Done: exit %s() since no more bytes to read from Audio file\n",
|
pr_info("Done: exit %s() since no more bytes to read from Audio file\n",
|
||||||
__func__);
|
__func__);
|
||||||
|
@ -290,7 +290,6 @@ static int cx25821_get_audio_data(struct cx25821_dev *dev,
|
||||||
memcpy(p, mybuf, n);
|
memcpy(p, mybuf, n);
|
||||||
p += n;
|
p += n;
|
||||||
}
|
}
|
||||||
file_offset += n;
|
|
||||||
}
|
}
|
||||||
dev->_audioframe_count++;
|
dev->_audioframe_count++;
|
||||||
fput(file);
|
fput(file);
|
||||||
|
@ -318,7 +317,7 @@ static int cx25821_openfile_audio(struct cx25821_dev *dev,
|
||||||
{
|
{
|
||||||
char *p = (void *)dev->_audiodata_buf_virt_addr;
|
char *p = (void *)dev->_audiodata_buf_virt_addr;
|
||||||
struct file *file;
|
struct file *file;
|
||||||
loff_t offset;
|
loff_t file_offset = 0;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
file = filp_open(dev->_audiofilename, O_RDONLY | O_LARGEFILE, 0);
|
file = filp_open(dev->_audiofilename, O_RDONLY | O_LARGEFILE, 0);
|
||||||
|
@ -328,11 +327,11 @@ static int cx25821_openfile_audio(struct cx25821_dev *dev,
|
||||||
return PTR_ERR(file);
|
return PTR_ERR(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (j = 0, offset = 0; j < NUM_AUDIO_FRAMES; j++) {
|
for (j = 0; j < NUM_AUDIO_FRAMES; j++) {
|
||||||
for (i = 0; i < dev->_audio_lines_count; i++) {
|
for (i = 0; i < dev->_audio_lines_count; i++) {
|
||||||
char buf[AUDIO_LINE_SIZE];
|
char buf[AUDIO_LINE_SIZE];
|
||||||
int n = kernel_read(file, offset, buf,
|
loff_t offset = file_offset;
|
||||||
AUDIO_LINE_SIZE);
|
int n = kernel_read(file, buf, AUDIO_LINE_SIZE, &file_offset);
|
||||||
|
|
||||||
if (n < AUDIO_LINE_SIZE) {
|
if (n < AUDIO_LINE_SIZE) {
|
||||||
pr_info("Done: exit %s() since no more bytes to read from Audio file\n",
|
pr_info("Done: exit %s() since no more bytes to read from Audio file\n",
|
||||||
|
@ -344,8 +343,6 @@ static int cx25821_openfile_audio(struct cx25821_dev *dev,
|
||||||
|
|
||||||
if (p)
|
if (p)
|
||||||
memcpy(p + offset, buf, n);
|
memcpy(p + offset, buf, n);
|
||||||
|
|
||||||
offset += n;
|
|
||||||
}
|
}
|
||||||
dev->_audioframe_count++;
|
dev->_audioframe_count++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1356,7 +1356,7 @@ static ssize_t read_file(struct nandsim *ns, struct file *file, void *buf, size_
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
noreclaim_flag = memalloc_noreclaim_save();
|
noreclaim_flag = memalloc_noreclaim_save();
|
||||||
tx = kernel_read(file, pos, buf, count);
|
tx = kernel_read(file, buf, count, &pos);
|
||||||
memalloc_noreclaim_restore(noreclaim_flag);
|
memalloc_noreclaim_restore(noreclaim_flag);
|
||||||
put_pages(ns);
|
put_pages(ns);
|
||||||
return tx;
|
return tx;
|
||||||
|
@ -1372,7 +1372,7 @@ static ssize_t write_file(struct nandsim *ns, struct file *file, void *buf, size
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
noreclaim_flag = memalloc_noreclaim_save();
|
noreclaim_flag = memalloc_noreclaim_save();
|
||||||
tx = kernel_write(file, buf, count, pos);
|
tx = kernel_write(file, buf, count, &pos);
|
||||||
memalloc_noreclaim_restore(noreclaim_flag);
|
memalloc_noreclaim_restore(noreclaim_flag);
|
||||||
put_pages(ns);
|
put_pages(ns);
|
||||||
return tx;
|
return tx;
|
||||||
|
|
|
@ -294,19 +294,9 @@ static int ashmem_release(struct inode *ignored, struct file *file)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
static ssize_t ashmem_read_iter(struct kiocb *iocb, struct iov_iter *iter)
|
||||||
* ashmem_read() - Reads a set of bytes from an Ashmem-enabled file
|
|
||||||
* @file: The associated backing file.
|
|
||||||
* @buf: The buffer of data being written to
|
|
||||||
* @len: The number of bytes being read
|
|
||||||
* @pos: The position of the first byte to read.
|
|
||||||
*
|
|
||||||
* Return: 0 if successful, or another return code if not.
|
|
||||||
*/
|
|
||||||
static ssize_t ashmem_read(struct file *file, char __user *buf,
|
|
||||||
size_t len, loff_t *pos)
|
|
||||||
{
|
{
|
||||||
struct ashmem_area *asma = file->private_data;
|
struct ashmem_area *asma = iocb->ki_filp->private_data;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
mutex_lock(&ashmem_mutex);
|
mutex_lock(&ashmem_mutex);
|
||||||
|
@ -320,20 +310,17 @@ static ssize_t ashmem_read(struct file *file, char __user *buf,
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex_unlock(&ashmem_mutex);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* asma and asma->file are used outside the lock here. We assume
|
* asma and asma->file are used outside the lock here. We assume
|
||||||
* once asma->file is set it will never be changed, and will not
|
* once asma->file is set it will never be changed, and will not
|
||||||
* be destroyed until all references to the file are dropped and
|
* be destroyed until all references to the file are dropped and
|
||||||
* ashmem_release is called.
|
* ashmem_release is called.
|
||||||
*/
|
*/
|
||||||
ret = __vfs_read(asma->file, buf, len, pos);
|
mutex_unlock(&ashmem_mutex);
|
||||||
if (ret >= 0)
|
ret = vfs_iter_read(asma->file, iter, &iocb->ki_pos, 0);
|
||||||
/** Update backing file pos, since f_ops->read() doesn't */
|
mutex_lock(&ashmem_mutex);
|
||||||
asma->file->f_pos = *pos;
|
if (ret > 0)
|
||||||
return ret;
|
asma->file->f_pos = iocb->ki_pos;
|
||||||
|
|
||||||
out_unlock:
|
out_unlock:
|
||||||
mutex_unlock(&ashmem_mutex);
|
mutex_unlock(&ashmem_mutex);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -834,7 +821,7 @@ static const struct file_operations ashmem_fops = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.open = ashmem_open,
|
.open = ashmem_open,
|
||||||
.release = ashmem_release,
|
.release = ashmem_release,
|
||||||
.read = ashmem_read,
|
.read_iter = ashmem_read_iter,
|
||||||
.llseek = ashmem_llseek,
|
.llseek = ashmem_llseek,
|
||||||
.mmap = ashmem_mmap,
|
.mmap = ashmem_mmap,
|
||||||
.unlocked_ioctl = ashmem_ioctl,
|
.unlocked_ioctl = ashmem_ioctl,
|
||||||
|
|
|
@ -106,16 +106,8 @@ static long serial2002_tty_ioctl(struct file *f, unsigned int op,
|
||||||
|
|
||||||
static int serial2002_tty_write(struct file *f, unsigned char *buf, int count)
|
static int serial2002_tty_write(struct file *f, unsigned char *buf, int count)
|
||||||
{
|
{
|
||||||
const char __user *p = (__force const char __user *)buf;
|
loff_t pos = 0;
|
||||||
int result;
|
return kernel_write(f, buf, count, &pos);
|
||||||
loff_t offset = 0;
|
|
||||||
mm_segment_t oldfs;
|
|
||||||
|
|
||||||
oldfs = get_fs();
|
|
||||||
set_fs(KERNEL_DS);
|
|
||||||
result = __vfs_write(f, p, count, &offset);
|
|
||||||
set_fs(oldfs);
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void serial2002_tty_read_poll_wait(struct file *f, int timeout)
|
static void serial2002_tty_read_poll_wait(struct file *f, int timeout)
|
||||||
|
@ -148,19 +140,14 @@ static int serial2002_tty_read(struct file *f, int timeout)
|
||||||
{
|
{
|
||||||
unsigned char ch;
|
unsigned char ch;
|
||||||
int result;
|
int result;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
result = -1;
|
result = -1;
|
||||||
if (!IS_ERR(f)) {
|
if (!IS_ERR(f)) {
|
||||||
mm_segment_t oldfs;
|
|
||||||
char __user *p = (__force char __user *)&ch;
|
|
||||||
loff_t offset = 0;
|
|
||||||
|
|
||||||
oldfs = get_fs();
|
|
||||||
set_fs(KERNEL_DS);
|
|
||||||
if (f->f_op->poll) {
|
if (f->f_op->poll) {
|
||||||
serial2002_tty_read_poll_wait(f, timeout);
|
serial2002_tty_read_poll_wait(f, timeout);
|
||||||
|
|
||||||
if (__vfs_read(f, p, 1, &offset) == 1)
|
if (kernel_read(f, &ch, 1, &pos) == 1)
|
||||||
result = ch;
|
result = ch;
|
||||||
} else {
|
} else {
|
||||||
/* Device does not support poll, busy wait */
|
/* Device does not support poll, busy wait */
|
||||||
|
@ -171,14 +158,13 @@ static int serial2002_tty_read(struct file *f, int timeout)
|
||||||
if (retries >= timeout)
|
if (retries >= timeout)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (__vfs_read(f, p, 1, &offset) == 1) {
|
if (kernel_read(f, &ch, 1, &pos) == 1) {
|
||||||
result = ch;
|
result = ch;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
usleep_range(100, 1000);
|
usleep_range(100, 1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
set_fs(oldfs);
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -731,8 +731,7 @@ int cfs_tracefile_dump_all_pages(char *filename)
|
||||||
__LASSERT_TAGE_INVARIANT(tage);
|
__LASSERT_TAGE_INVARIANT(tage);
|
||||||
|
|
||||||
buf = kmap(tage->page);
|
buf = kmap(tage->page);
|
||||||
rc = vfs_write(filp, (__force const char __user *)buf,
|
rc = kernel_write(filp, buf, tage->used, &filp->f_pos);
|
||||||
tage->used, &filp->f_pos);
|
|
||||||
kunmap(tage->page);
|
kunmap(tage->page);
|
||||||
|
|
||||||
if (rc != (int)tage->used) {
|
if (rc != (int)tage->used) {
|
||||||
|
@ -976,7 +975,6 @@ static int tracefiled(void *arg)
|
||||||
struct tracefiled_ctl *tctl = arg;
|
struct tracefiled_ctl *tctl = arg;
|
||||||
struct cfs_trace_page *tage;
|
struct cfs_trace_page *tage;
|
||||||
struct cfs_trace_page *tmp;
|
struct cfs_trace_page *tmp;
|
||||||
mm_segment_t __oldfs;
|
|
||||||
struct file *filp;
|
struct file *filp;
|
||||||
char *buf;
|
char *buf;
|
||||||
int last_loop = 0;
|
int last_loop = 0;
|
||||||
|
@ -1014,8 +1012,6 @@ static int tracefiled(void *arg)
|
||||||
__LASSERT(list_empty(&pc.pc_pages));
|
__LASSERT(list_empty(&pc.pc_pages));
|
||||||
goto end_loop;
|
goto end_loop;
|
||||||
}
|
}
|
||||||
__oldfs = get_fs();
|
|
||||||
set_fs(get_ds());
|
|
||||||
|
|
||||||
list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) {
|
list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) {
|
||||||
static loff_t f_pos;
|
static loff_t f_pos;
|
||||||
|
@ -1028,8 +1024,7 @@ static int tracefiled(void *arg)
|
||||||
f_pos = i_size_read(file_inode(filp));
|
f_pos = i_size_read(file_inode(filp));
|
||||||
|
|
||||||
buf = kmap(tage->page);
|
buf = kmap(tage->page);
|
||||||
rc = vfs_write(filp, (__force const char __user *)buf,
|
rc = kernel_write(filp, buf, tage->used, &f_pos);
|
||||||
tage->used, &f_pos);
|
|
||||||
kunmap(tage->page);
|
kunmap(tage->page);
|
||||||
|
|
||||||
if (rc != (int)tage->used) {
|
if (rc != (int)tage->used) {
|
||||||
|
@ -1040,7 +1035,6 @@ static int tracefiled(void *arg)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
set_fs(__oldfs);
|
|
||||||
|
|
||||||
filp_close(filp, NULL);
|
filp_close(filp, NULL);
|
||||||
put_pages_on_daemon_list(&pc);
|
put_pages_on_daemon_list(&pc);
|
||||||
|
|
|
@ -52,7 +52,6 @@ int libcfs_kkuc_msg_put(struct file *filp, void *payload)
|
||||||
struct kuc_hdr *kuch = (struct kuc_hdr *)payload;
|
struct kuc_hdr *kuch = (struct kuc_hdr *)payload;
|
||||||
ssize_t count = kuch->kuc_msglen;
|
ssize_t count = kuch->kuc_msglen;
|
||||||
loff_t offset = 0;
|
loff_t offset = 0;
|
||||||
mm_segment_t fs;
|
|
||||||
int rc = -ENXIO;
|
int rc = -ENXIO;
|
||||||
|
|
||||||
if (IS_ERR_OR_NULL(filp))
|
if (IS_ERR_OR_NULL(filp))
|
||||||
|
@ -63,18 +62,14 @@ int libcfs_kkuc_msg_put(struct file *filp, void *payload)
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
fs = get_fs();
|
|
||||||
set_fs(KERNEL_DS);
|
|
||||||
while (count > 0) {
|
while (count > 0) {
|
||||||
rc = vfs_write(filp, (void __force __user *)payload,
|
rc = kernel_write(filp, payload, count, &offset);
|
||||||
count, &offset);
|
|
||||||
if (rc < 0)
|
if (rc < 0)
|
||||||
break;
|
break;
|
||||||
count -= rc;
|
count -= rc;
|
||||||
payload += rc;
|
payload += rc;
|
||||||
rc = 0;
|
rc = 0;
|
||||||
}
|
}
|
||||||
set_fs(fs);
|
|
||||||
|
|
||||||
if (rc < 0)
|
if (rc < 0)
|
||||||
CWARN("message send failed (%d)\n", rc);
|
CWARN("message send failed (%d)\n", rc);
|
||||||
|
|
|
@ -896,13 +896,14 @@ static int core_alua_write_tpg_metadata(
|
||||||
u32 md_buf_len)
|
u32 md_buf_len)
|
||||||
{
|
{
|
||||||
struct file *file = filp_open(path, O_RDWR | O_CREAT | O_TRUNC, 0600);
|
struct file *file = filp_open(path, O_RDWR | O_CREAT | O_TRUNC, 0600);
|
||||||
|
loff_t pos = 0;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (IS_ERR(file)) {
|
if (IS_ERR(file)) {
|
||||||
pr_err("filp_open(%s) for ALUA metadata failed\n", path);
|
pr_err("filp_open(%s) for ALUA metadata failed\n", path);
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
ret = kernel_write(file, md_buf, md_buf_len, 0);
|
ret = kernel_write(file, md_buf, md_buf_len, &pos);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
pr_err("Error writing ALUA metadata file: %s\n", path);
|
pr_err("Error writing ALUA metadata file: %s\n", path);
|
||||||
fput(file);
|
fput(file);
|
||||||
|
|
|
@ -443,7 +443,7 @@ fd_do_prot_fill(struct se_device *se_dev, sector_t lba, sector_t nolb,
|
||||||
|
|
||||||
for (prot = 0; prot < prot_length;) {
|
for (prot = 0; prot < prot_length;) {
|
||||||
sector_t len = min_t(sector_t, bufsize, prot_length - prot);
|
sector_t len = min_t(sector_t, bufsize, prot_length - prot);
|
||||||
ssize_t ret = kernel_write(prot_fd, buf, len, pos + prot);
|
ssize_t ret = kernel_write(prot_fd, buf, len, &pos);
|
||||||
|
|
||||||
if (ret != len) {
|
if (ret != len) {
|
||||||
pr_err("vfs_write to prot file failed: %zd\n", ret);
|
pr_err("vfs_write to prot file failed: %zd\n", ret);
|
||||||
|
|
|
@ -1974,6 +1974,7 @@ static int __core_scsi3_write_aptpl_to_file(
|
||||||
char path[512];
|
char path[512];
|
||||||
u32 pr_aptpl_buf_len;
|
u32 pr_aptpl_buf_len;
|
||||||
int ret;
|
int ret;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
memset(path, 0, 512);
|
memset(path, 0, 512);
|
||||||
|
|
||||||
|
@ -1993,7 +1994,7 @@ static int __core_scsi3_write_aptpl_to_file(
|
||||||
|
|
||||||
pr_aptpl_buf_len = (strlen(buf) + 1); /* Add extra for NULL */
|
pr_aptpl_buf_len = (strlen(buf) + 1); /* Add extra for NULL */
|
||||||
|
|
||||||
ret = kernel_write(file, buf, pr_aptpl_buf_len, 0);
|
ret = kernel_write(file, buf, pr_aptpl_buf_len, &pos);
|
||||||
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
pr_debug("Error writing APTPL metadata file: %s\n", path);
|
pr_debug("Error writing APTPL metadata file: %s\n", path);
|
||||||
|
|
|
@ -686,9 +686,8 @@ static int do_read(struct fsg_common *common)
|
||||||
|
|
||||||
/* Perform the read */
|
/* Perform the read */
|
||||||
file_offset_tmp = file_offset;
|
file_offset_tmp = file_offset;
|
||||||
nread = vfs_read(curlun->filp,
|
nread = kernel_read(curlun->filp, bh->buf, amount,
|
||||||
(char __user *)bh->buf,
|
&file_offset_tmp);
|
||||||
amount, &file_offset_tmp);
|
|
||||||
VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
|
VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
|
||||||
(unsigned long long)file_offset, (int)nread);
|
(unsigned long long)file_offset, (int)nread);
|
||||||
if (signal_pending(current))
|
if (signal_pending(current))
|
||||||
|
@ -883,8 +882,8 @@ static int do_write(struct fsg_common *common)
|
||||||
|
|
||||||
/* Perform the write */
|
/* Perform the write */
|
||||||
file_offset_tmp = file_offset;
|
file_offset_tmp = file_offset;
|
||||||
nwritten = vfs_write(curlun->filp, (char __user *)bh->buf,
|
nwritten = kernel_write(curlun->filp, bh->buf, amount,
|
||||||
amount, &file_offset_tmp);
|
&file_offset_tmp);
|
||||||
VLDBG(curlun, "file write %u @ %llu -> %d\n", amount,
|
VLDBG(curlun, "file write %u @ %llu -> %d\n", amount,
|
||||||
(unsigned long long)file_offset, (int)nwritten);
|
(unsigned long long)file_offset, (int)nwritten);
|
||||||
if (signal_pending(current))
|
if (signal_pending(current))
|
||||||
|
@ -1021,9 +1020,8 @@ static int do_verify(struct fsg_common *common)
|
||||||
|
|
||||||
/* Perform the read */
|
/* Perform the read */
|
||||||
file_offset_tmp = file_offset;
|
file_offset_tmp = file_offset;
|
||||||
nread = vfs_read(curlun->filp,
|
nread = kernel_read(curlun->filp, bh->buf, amount,
|
||||||
(char __user *) bh->buf,
|
&file_offset_tmp);
|
||||||
amount, &file_offset_tmp);
|
|
||||||
VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
|
VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
|
||||||
(unsigned long long) file_offset,
|
(unsigned long long) file_offset,
|
||||||
(int) nread);
|
(int) nread);
|
||||||
|
@ -2453,13 +2451,6 @@ static int fsg_main_thread(void *common_)
|
||||||
/* Allow the thread to be frozen */
|
/* Allow the thread to be frozen */
|
||||||
set_freezable();
|
set_freezable();
|
||||||
|
|
||||||
/*
|
|
||||||
* Arrange for userspace references to be interpreted as kernel
|
|
||||||
* pointers. That way we can pass a kernel pointer to a routine
|
|
||||||
* that expects a __user pointer and it will work okay.
|
|
||||||
*/
|
|
||||||
set_fs(get_ds());
|
|
||||||
|
|
||||||
/* The main loop */
|
/* The main loop */
|
||||||
while (common->state != FSG_STATE_TERMINATED) {
|
while (common->state != FSG_STATE_TERMINATED) {
|
||||||
if (exception_in_progress(common) || signal_pending(current)) {
|
if (exception_in_progress(common) || signal_pending(current)) {
|
||||||
|
|
|
@ -56,19 +56,14 @@ static int autofs4_write(struct autofs_sb_info *sbi,
|
||||||
struct file *file, const void *addr, int bytes)
|
struct file *file, const void *addr, int bytes)
|
||||||
{
|
{
|
||||||
unsigned long sigpipe, flags;
|
unsigned long sigpipe, flags;
|
||||||
mm_segment_t fs;
|
|
||||||
const char *data = (const char *)addr;
|
const char *data = (const char *)addr;
|
||||||
ssize_t wr = 0;
|
ssize_t wr = 0;
|
||||||
|
|
||||||
sigpipe = sigismember(¤t->pending.signal, SIGPIPE);
|
sigpipe = sigismember(¤t->pending.signal, SIGPIPE);
|
||||||
|
|
||||||
/* Save pointer to user space and point back to kernel space */
|
|
||||||
fs = get_fs();
|
|
||||||
set_fs(KERNEL_DS);
|
|
||||||
|
|
||||||
mutex_lock(&sbi->pipe_mutex);
|
mutex_lock(&sbi->pipe_mutex);
|
||||||
while (bytes) {
|
while (bytes) {
|
||||||
wr = __vfs_write(file, data, bytes, &file->f_pos);
|
wr = __kernel_write(file, data, bytes, &file->f_pos);
|
||||||
if (wr <= 0)
|
if (wr <= 0)
|
||||||
break;
|
break;
|
||||||
data += wr;
|
data += wr;
|
||||||
|
@ -76,8 +71,6 @@ static int autofs4_write(struct autofs_sb_info *sbi,
|
||||||
}
|
}
|
||||||
mutex_unlock(&sbi->pipe_mutex);
|
mutex_unlock(&sbi->pipe_mutex);
|
||||||
|
|
||||||
set_fs(fs);
|
|
||||||
|
|
||||||
/* Keep the currently executing process from receiving a
|
/* Keep the currently executing process from receiving a
|
||||||
* SIGPIPE unless it was already supposed to get one
|
* SIGPIPE unless it was already supposed to get one
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -341,11 +341,12 @@ static int load_aout_library(struct file *file)
|
||||||
unsigned long error;
|
unsigned long error;
|
||||||
int retval;
|
int retval;
|
||||||
struct exec ex;
|
struct exec ex;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
inode = file_inode(file);
|
inode = file_inode(file);
|
||||||
|
|
||||||
retval = -ENOEXEC;
|
retval = -ENOEXEC;
|
||||||
error = kernel_read(file, 0, (char *) &ex, sizeof(ex));
|
error = kernel_read(file, &ex, sizeof(ex), &pos);
|
||||||
if (error != sizeof(ex))
|
if (error != sizeof(ex))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
|
|
@ -409,6 +409,7 @@ static struct elf_phdr *load_elf_phdrs(struct elfhdr *elf_ex,
|
||||||
{
|
{
|
||||||
struct elf_phdr *elf_phdata = NULL;
|
struct elf_phdr *elf_phdata = NULL;
|
||||||
int retval, size, err = -1;
|
int retval, size, err = -1;
|
||||||
|
loff_t pos = elf_ex->e_phoff;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If the size of this structure has changed, then punt, since
|
* If the size of this structure has changed, then punt, since
|
||||||
|
@ -432,8 +433,7 @@ static struct elf_phdr *load_elf_phdrs(struct elfhdr *elf_ex,
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/* Read in the program headers */
|
/* Read in the program headers */
|
||||||
retval = kernel_read(elf_file, elf_ex->e_phoff,
|
retval = kernel_read(elf_file, elf_phdata, size, &pos);
|
||||||
(char *)elf_phdata, size);
|
|
||||||
if (retval != size) {
|
if (retval != size) {
|
||||||
err = (retval < 0) ? retval : -EIO;
|
err = (retval < 0) ? retval : -EIO;
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -698,6 +698,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
|
||||||
struct elfhdr interp_elf_ex;
|
struct elfhdr interp_elf_ex;
|
||||||
} *loc;
|
} *loc;
|
||||||
struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
|
struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
|
||||||
|
loff_t pos;
|
||||||
|
|
||||||
loc = kmalloc(sizeof(*loc), GFP_KERNEL);
|
loc = kmalloc(sizeof(*loc), GFP_KERNEL);
|
||||||
if (!loc) {
|
if (!loc) {
|
||||||
|
@ -750,9 +751,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
|
||||||
if (!elf_interpreter)
|
if (!elf_interpreter)
|
||||||
goto out_free_ph;
|
goto out_free_ph;
|
||||||
|
|
||||||
retval = kernel_read(bprm->file, elf_ppnt->p_offset,
|
pos = elf_ppnt->p_offset;
|
||||||
elf_interpreter,
|
retval = kernel_read(bprm->file, elf_interpreter,
|
||||||
elf_ppnt->p_filesz);
|
elf_ppnt->p_filesz, &pos);
|
||||||
if (retval != elf_ppnt->p_filesz) {
|
if (retval != elf_ppnt->p_filesz) {
|
||||||
if (retval >= 0)
|
if (retval >= 0)
|
||||||
retval = -EIO;
|
retval = -EIO;
|
||||||
|
@ -776,9 +777,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
|
||||||
would_dump(bprm, interpreter);
|
would_dump(bprm, interpreter);
|
||||||
|
|
||||||
/* Get the exec headers */
|
/* Get the exec headers */
|
||||||
retval = kernel_read(interpreter, 0,
|
pos = 0;
|
||||||
(void *)&loc->interp_elf_ex,
|
retval = kernel_read(interpreter, &loc->interp_elf_ex,
|
||||||
sizeof(loc->interp_elf_ex));
|
sizeof(loc->interp_elf_ex), &pos);
|
||||||
if (retval != sizeof(loc->interp_elf_ex)) {
|
if (retval != sizeof(loc->interp_elf_ex)) {
|
||||||
if (retval >= 0)
|
if (retval >= 0)
|
||||||
retval = -EIO;
|
retval = -EIO;
|
||||||
|
@ -1175,9 +1176,10 @@ static int load_elf_library(struct file *file)
|
||||||
unsigned long elf_bss, bss, len;
|
unsigned long elf_bss, bss, len;
|
||||||
int retval, error, i, j;
|
int retval, error, i, j;
|
||||||
struct elfhdr elf_ex;
|
struct elfhdr elf_ex;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
error = -ENOEXEC;
|
error = -ENOEXEC;
|
||||||
retval = kernel_read(file, 0, (char *)&elf_ex, sizeof(elf_ex));
|
retval = kernel_read(file, &elf_ex, sizeof(elf_ex), &pos);
|
||||||
if (retval != sizeof(elf_ex))
|
if (retval != sizeof(elf_ex))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -1201,7 +1203,8 @@ static int load_elf_library(struct file *file)
|
||||||
|
|
||||||
eppnt = elf_phdata;
|
eppnt = elf_phdata;
|
||||||
error = -ENOEXEC;
|
error = -ENOEXEC;
|
||||||
retval = kernel_read(file, elf_ex.e_phoff, (char *)eppnt, j);
|
pos = elf_ex.e_phoff;
|
||||||
|
retval = kernel_read(file, eppnt, j, &pos);
|
||||||
if (retval != j)
|
if (retval != j)
|
||||||
goto out_free_ph;
|
goto out_free_ph;
|
||||||
|
|
||||||
|
|
|
@ -145,6 +145,7 @@ static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params,
|
||||||
struct elf32_phdr *phdr;
|
struct elf32_phdr *phdr;
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
int retval, loop;
|
int retval, loop;
|
||||||
|
loff_t pos = params->hdr.e_phoff;
|
||||||
|
|
||||||
if (params->hdr.e_phentsize != sizeof(struct elf_phdr))
|
if (params->hdr.e_phentsize != sizeof(struct elf_phdr))
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -156,8 +157,7 @@ static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params,
|
||||||
if (!params->phdrs)
|
if (!params->phdrs)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
retval = kernel_read(file, params->hdr.e_phoff,
|
retval = kernel_read(file, params->phdrs, size, &pos);
|
||||||
(char *) params->phdrs, size);
|
|
||||||
if (unlikely(retval != size))
|
if (unlikely(retval != size))
|
||||||
return retval < 0 ? retval : -ENOEXEC;
|
return retval < 0 ? retval : -ENOEXEC;
|
||||||
|
|
||||||
|
@ -199,6 +199,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)
|
||||||
char *interpreter_name = NULL;
|
char *interpreter_name = NULL;
|
||||||
int executable_stack;
|
int executable_stack;
|
||||||
int retval, i;
|
int retval, i;
|
||||||
|
loff_t pos;
|
||||||
|
|
||||||
kdebug("____ LOAD %d ____", current->pid);
|
kdebug("____ LOAD %d ____", current->pid);
|
||||||
|
|
||||||
|
@ -246,10 +247,9 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)
|
||||||
if (!interpreter_name)
|
if (!interpreter_name)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
retval = kernel_read(bprm->file,
|
pos = phdr->p_offset;
|
||||||
phdr->p_offset,
|
retval = kernel_read(bprm->file, interpreter_name,
|
||||||
interpreter_name,
|
phdr->p_filesz, &pos);
|
||||||
phdr->p_filesz);
|
|
||||||
if (unlikely(retval != phdr->p_filesz)) {
|
if (unlikely(retval != phdr->p_filesz)) {
|
||||||
if (retval >= 0)
|
if (retval >= 0)
|
||||||
retval = -ENOEXEC;
|
retval = -ENOEXEC;
|
||||||
|
@ -277,8 +277,9 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)
|
||||||
*/
|
*/
|
||||||
would_dump(bprm, interpreter);
|
would_dump(bprm, interpreter);
|
||||||
|
|
||||||
retval = kernel_read(interpreter, 0, bprm->buf,
|
pos = 0;
|
||||||
BINPRM_BUF_SIZE);
|
retval = kernel_read(interpreter, bprm->buf,
|
||||||
|
BINPRM_BUF_SIZE, &pos);
|
||||||
if (unlikely(retval != BINPRM_BUF_SIZE)) {
|
if (unlikely(retval != BINPRM_BUF_SIZE)) {
|
||||||
if (retval >= 0)
|
if (retval >= 0)
|
||||||
retval = -ENOEXEC;
|
retval = -ENOEXEC;
|
||||||
|
|
|
@ -176,19 +176,14 @@ static int create_flat_tables(struct linux_binprm *bprm, unsigned long arg_start
|
||||||
#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */
|
#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */
|
||||||
#define RESERVED 0xC0 /* bit 6,7: reserved */
|
#define RESERVED 0xC0 /* bit 6,7: reserved */
|
||||||
|
|
||||||
static int decompress_exec(
|
static int decompress_exec(struct linux_binprm *bprm, loff_t fpos, char *dst,
|
||||||
struct linux_binprm *bprm,
|
long len, int fd)
|
||||||
unsigned long offset,
|
|
||||||
char *dst,
|
|
||||||
long len,
|
|
||||||
int fd)
|
|
||||||
{
|
{
|
||||||
unsigned char *buf;
|
unsigned char *buf;
|
||||||
z_stream strm;
|
z_stream strm;
|
||||||
loff_t fpos;
|
|
||||||
int ret, retval;
|
int ret, retval;
|
||||||
|
|
||||||
pr_debug("decompress_exec(offset=%lx,buf=%p,len=%lx)\n", offset, dst, len);
|
pr_debug("decompress_exec(offset=%llx,buf=%p,len=%lx)\n", fpos, dst, len);
|
||||||
|
|
||||||
memset(&strm, 0, sizeof(strm));
|
memset(&strm, 0, sizeof(strm));
|
||||||
strm.workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
|
strm.workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
|
||||||
|
@ -202,13 +197,11 @@ static int decompress_exec(
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Read in first chunk of data and parse gzip header. */
|
/* Read in first chunk of data and parse gzip header. */
|
||||||
fpos = offset;
|
ret = kernel_read(bprm->file, buf, LBUFSIZE, &fpos);
|
||||||
ret = kernel_read(bprm->file, offset, buf, LBUFSIZE);
|
|
||||||
|
|
||||||
strm.next_in = buf;
|
strm.next_in = buf;
|
||||||
strm.avail_in = ret;
|
strm.avail_in = ret;
|
||||||
strm.total_in = 0;
|
strm.total_in = 0;
|
||||||
fpos += ret;
|
|
||||||
|
|
||||||
retval = -ENOEXEC;
|
retval = -ENOEXEC;
|
||||||
|
|
||||||
|
@ -274,7 +267,7 @@ static int decompress_exec(
|
||||||
}
|
}
|
||||||
|
|
||||||
while ((ret = zlib_inflate(&strm, Z_NO_FLUSH)) == Z_OK) {
|
while ((ret = zlib_inflate(&strm, Z_NO_FLUSH)) == Z_OK) {
|
||||||
ret = kernel_read(bprm->file, fpos, buf, LBUFSIZE);
|
ret = kernel_read(bprm->file, buf, LBUFSIZE, &fpos);
|
||||||
if (ret <= 0)
|
if (ret <= 0)
|
||||||
break;
|
break;
|
||||||
len -= ret;
|
len -= ret;
|
||||||
|
@ -282,7 +275,6 @@ static int decompress_exec(
|
||||||
strm.next_in = buf;
|
strm.next_in = buf;
|
||||||
strm.avail_in = ret;
|
strm.avail_in = ret;
|
||||||
strm.total_in = 0;
|
strm.total_in = 0;
|
||||||
fpos += ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
|
|
@ -218,12 +218,15 @@ static int load_misc_binary(struct linux_binprm *bprm)
|
||||||
|
|
||||||
bprm->file = interp_file;
|
bprm->file = interp_file;
|
||||||
if (fmt->flags & MISC_FMT_CREDENTIALS) {
|
if (fmt->flags & MISC_FMT_CREDENTIALS) {
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* No need to call prepare_binprm(), it's already been
|
* No need to call prepare_binprm(), it's already been
|
||||||
* done. bprm->buf is stale, update from interp_file.
|
* done. bprm->buf is stale, update from interp_file.
|
||||||
*/
|
*/
|
||||||
memset(bprm->buf, 0, BINPRM_BUF_SIZE);
|
memset(bprm->buf, 0, BINPRM_BUF_SIZE);
|
||||||
retval = kernel_read(bprm->file, 0, bprm->buf, BINPRM_BUF_SIZE);
|
retval = kernel_read(bprm->file, bprm->buf, BINPRM_BUF_SIZE,
|
||||||
|
&pos);
|
||||||
} else
|
} else
|
||||||
retval = prepare_binprm(bprm);
|
retval = prepare_binprm(bprm);
|
||||||
|
|
||||||
|
|
|
@ -539,33 +539,23 @@ static struct btrfs_path *alloc_path_for_send(void)
|
||||||
static int write_buf(struct file *filp, const void *buf, u32 len, loff_t *off)
|
static int write_buf(struct file *filp, const void *buf, u32 len, loff_t *off)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
mm_segment_t old_fs;
|
|
||||||
u32 pos = 0;
|
u32 pos = 0;
|
||||||
|
|
||||||
old_fs = get_fs();
|
|
||||||
set_fs(KERNEL_DS);
|
|
||||||
|
|
||||||
while (pos < len) {
|
while (pos < len) {
|
||||||
ret = vfs_write(filp, (__force const char __user *)buf + pos,
|
ret = kernel_write(filp, buf + pos, len - pos, off);
|
||||||
len - pos, off);
|
|
||||||
/* TODO handle that correctly */
|
/* TODO handle that correctly */
|
||||||
/*if (ret == -ERESTARTSYS) {
|
/*if (ret == -ERESTARTSYS) {
|
||||||
continue;
|
continue;
|
||||||
}*/
|
}*/
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto out;
|
return ret;
|
||||||
if (ret == 0) {
|
if (ret == 0) {
|
||||||
ret = -EIO;
|
return -EIO;
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
pos += ret;
|
pos += ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = 0;
|
return 0;
|
||||||
|
|
||||||
out:
|
|
||||||
set_fs(old_fs);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tlv_put(struct send_ctx *sctx, u16 attr, const void *data, int len)
|
static int tlv_put(struct send_ctx *sctx, u16 attr, const void *data, int len)
|
||||||
|
|
|
@ -368,9 +368,10 @@ static int coda_venus_readdir(struct file *coda_file, struct dir_context *ctx)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
|
loff_t pos = ctx->pos - 2;
|
||||||
|
|
||||||
/* read entries from the directory file */
|
/* read entries from the directory file */
|
||||||
ret = kernel_read(host_file, ctx->pos - 2, (char *)vdir,
|
ret = kernel_read(host_file, vdir, sizeof(*vdir), &pos);
|
||||||
sizeof(*vdir));
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
pr_err("%s: read dir %s failed %d\n",
|
pr_err("%s: read dir %s failed %d\n",
|
||||||
__func__, coda_f2s(&cii->c_fid), ret);
|
__func__, coda_f2s(&cii->c_fid), ret);
|
||||||
|
|
|
@ -47,7 +47,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
|
||||||
lower_file = ecryptfs_inode_to_private(ecryptfs_inode)->lower_file;
|
lower_file = ecryptfs_inode_to_private(ecryptfs_inode)->lower_file;
|
||||||
if (!lower_file)
|
if (!lower_file)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
rc = kernel_write(lower_file, data, size, offset);
|
rc = kernel_write(lower_file, data, size, &offset);
|
||||||
mark_inode_dirty_sync(ecryptfs_inode);
|
mark_inode_dirty_sync(ecryptfs_inode);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -237,7 +237,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
|
||||||
lower_file = ecryptfs_inode_to_private(ecryptfs_inode)->lower_file;
|
lower_file = ecryptfs_inode_to_private(ecryptfs_inode)->lower_file;
|
||||||
if (!lower_file)
|
if (!lower_file)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
return kernel_read(lower_file, offset, data, size);
|
return kernel_read(lower_file, data, size, &offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
24
fs/exec.c
24
fs/exec.c
|
@ -885,23 +885,6 @@ struct file *open_exec(const char *name)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(open_exec);
|
EXPORT_SYMBOL(open_exec);
|
||||||
|
|
||||||
int kernel_read(struct file *file, loff_t offset,
|
|
||||||
char *addr, unsigned long count)
|
|
||||||
{
|
|
||||||
mm_segment_t old_fs;
|
|
||||||
loff_t pos = offset;
|
|
||||||
int result;
|
|
||||||
|
|
||||||
old_fs = get_fs();
|
|
||||||
set_fs(get_ds());
|
|
||||||
/* The cast to a user pointer is valid due to the set_fs() */
|
|
||||||
result = vfs_read(file, (void __user *)addr, count, &pos);
|
|
||||||
set_fs(old_fs);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
EXPORT_SYMBOL(kernel_read);
|
|
||||||
|
|
||||||
int kernel_read_file(struct file *file, void **buf, loff_t *size,
|
int kernel_read_file(struct file *file, void **buf, loff_t *size,
|
||||||
loff_t max_size, enum kernel_read_file_id id)
|
loff_t max_size, enum kernel_read_file_id id)
|
||||||
{
|
{
|
||||||
|
@ -939,8 +922,7 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size,
|
||||||
|
|
||||||
pos = 0;
|
pos = 0;
|
||||||
while (pos < i_size) {
|
while (pos < i_size) {
|
||||||
bytes = kernel_read(file, pos, (char *)(*buf) + pos,
|
bytes = kernel_read(file, *buf + pos, i_size - pos, &pos);
|
||||||
i_size - pos);
|
|
||||||
if (bytes < 0) {
|
if (bytes < 0) {
|
||||||
ret = bytes;
|
ret = bytes;
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -948,7 +930,6 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size,
|
||||||
|
|
||||||
if (bytes == 0)
|
if (bytes == 0)
|
||||||
break;
|
break;
|
||||||
pos += bytes;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pos != i_size) {
|
if (pos != i_size) {
|
||||||
|
@ -1567,6 +1548,7 @@ static void bprm_fill_uid(struct linux_binprm *bprm)
|
||||||
int prepare_binprm(struct linux_binprm *bprm)
|
int prepare_binprm(struct linux_binprm *bprm)
|
||||||
{
|
{
|
||||||
int retval;
|
int retval;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
bprm_fill_uid(bprm);
|
bprm_fill_uid(bprm);
|
||||||
|
|
||||||
|
@ -1577,7 +1559,7 @@ int prepare_binprm(struct linux_binprm *bprm)
|
||||||
bprm->called_set_creds = 1;
|
bprm->called_set_creds = 1;
|
||||||
|
|
||||||
memset(bprm->buf, 0, BINPRM_BUF_SIZE);
|
memset(bprm->buf, 0, BINPRM_BUF_SIZE);
|
||||||
return kernel_read(bprm->file, 0, bprm->buf, BINPRM_BUF_SIZE);
|
return kernel_read(bprm->file, bprm->buf, BINPRM_BUF_SIZE, &pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPORT_SYMBOL(prepare_binprm);
|
EXPORT_SYMBOL(prepare_binprm);
|
||||||
|
|
|
@ -413,7 +413,20 @@ ssize_t __vfs_read(struct file *file, char __user *buf, size_t count,
|
||||||
else
|
else
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(__vfs_read);
|
|
||||||
|
ssize_t kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
|
||||||
|
{
|
||||||
|
mm_segment_t old_fs;
|
||||||
|
ssize_t result;
|
||||||
|
|
||||||
|
old_fs = get_fs();
|
||||||
|
set_fs(get_ds());
|
||||||
|
/* The cast to a user pointer is valid due to the set_fs() */
|
||||||
|
result = vfs_read(file, (void __user *)buf, count, pos);
|
||||||
|
set_fs(old_fs);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(kernel_read);
|
||||||
|
|
||||||
ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
|
ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
|
||||||
{
|
{
|
||||||
|
@ -441,8 +454,6 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPORT_SYMBOL(vfs_read);
|
|
||||||
|
|
||||||
static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
|
static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
|
||||||
{
|
{
|
||||||
struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = len };
|
struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = len };
|
||||||
|
@ -471,9 +482,8 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
|
||||||
else
|
else
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(__vfs_write);
|
|
||||||
|
|
||||||
ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
|
ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
|
||||||
{
|
{
|
||||||
mm_segment_t old_fs;
|
mm_segment_t old_fs;
|
||||||
const char __user *p;
|
const char __user *p;
|
||||||
|
@ -496,9 +506,24 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
|
||||||
inc_syscw(current);
|
inc_syscw(current);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPORT_SYMBOL(__kernel_write);
|
EXPORT_SYMBOL(__kernel_write);
|
||||||
|
|
||||||
|
ssize_t kernel_write(struct file *file, const void *buf, size_t count,
|
||||||
|
loff_t *pos)
|
||||||
|
{
|
||||||
|
mm_segment_t old_fs;
|
||||||
|
ssize_t res;
|
||||||
|
|
||||||
|
old_fs = get_fs();
|
||||||
|
set_fs(get_ds());
|
||||||
|
/* The cast to a user pointer is valid due to the set_fs() */
|
||||||
|
res = vfs_write(file, (__force const char __user *)buf, count, pos);
|
||||||
|
set_fs(old_fs);
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(kernel_write);
|
||||||
|
|
||||||
ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_t *pos)
|
ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_t *pos)
|
||||||
{
|
{
|
||||||
ssize_t ret;
|
ssize_t ret;
|
||||||
|
@ -527,8 +552,6 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPORT_SYMBOL(vfs_write);
|
|
||||||
|
|
||||||
static inline loff_t file_pos_read(struct file *file)
|
static inline loff_t file_pos_read(struct file *file)
|
||||||
{
|
{
|
||||||
return file->f_pos;
|
return file->f_pos;
|
||||||
|
@ -959,9 +982,8 @@ ssize_t vfs_readv(struct file *file, const struct iovec __user *vec,
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(vfs_readv);
|
|
||||||
|
|
||||||
ssize_t vfs_writev(struct file *file, const struct iovec __user *vec,
|
static ssize_t vfs_writev(struct file *file, const struct iovec __user *vec,
|
||||||
unsigned long vlen, loff_t *pos, rwf_t flags)
|
unsigned long vlen, loff_t *pos, rwf_t flags)
|
||||||
{
|
{
|
||||||
struct iovec iovstack[UIO_FASTIOV];
|
struct iovec iovstack[UIO_FASTIOV];
|
||||||
|
@ -978,7 +1000,6 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec,
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(vfs_writev);
|
|
||||||
|
|
||||||
static ssize_t do_readv(unsigned long fd, const struct iovec __user *vec,
|
static ssize_t do_readv(unsigned long fd, const struct iovec __user *vec,
|
||||||
unsigned long vlen, rwf_t flags)
|
unsigned long vlen, rwf_t flags)
|
||||||
|
|
16
fs/splice.c
16
fs/splice.c
|
@ -364,22 +364,6 @@ static ssize_t kernel_readv(struct file *file, const struct kvec *vec,
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t kernel_write(struct file *file, const char *buf, size_t count,
|
|
||||||
loff_t pos)
|
|
||||||
{
|
|
||||||
mm_segment_t old_fs;
|
|
||||||
ssize_t res;
|
|
||||||
|
|
||||||
old_fs = get_fs();
|
|
||||||
set_fs(get_ds());
|
|
||||||
/* The cast to a user pointer is valid due to the set_fs() */
|
|
||||||
res = vfs_write(file, (__force const char __user *)buf, count, &pos);
|
|
||||||
set_fs(old_fs);
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(kernel_write);
|
|
||||||
|
|
||||||
static ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
|
static ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
|
||||||
struct pipe_inode_info *pipe, size_t len,
|
struct pipe_inode_info *pipe, size_t len,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
|
|
|
@ -1754,13 +1754,10 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
|
||||||
struct iovec **ret_pointer);
|
struct iovec **ret_pointer);
|
||||||
|
|
||||||
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
|
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
|
||||||
extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *);
|
|
||||||
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
|
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
|
||||||
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
|
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
|
||||||
extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
|
extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
|
||||||
unsigned long, loff_t *, rwf_t);
|
unsigned long, loff_t *, rwf_t);
|
||||||
extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
|
|
||||||
unsigned long, loff_t *, rwf_t);
|
|
||||||
extern ssize_t vfs_copy_file_range(struct file *, loff_t , struct file *,
|
extern ssize_t vfs_copy_file_range(struct file *, loff_t , struct file *,
|
||||||
loff_t, size_t, unsigned int);
|
loff_t, size_t, unsigned int);
|
||||||
extern int vfs_clone_file_prep_inodes(struct inode *inode_in, loff_t pos_in,
|
extern int vfs_clone_file_prep_inodes(struct inode *inode_in, loff_t pos_in,
|
||||||
|
@ -2788,15 +2785,15 @@ static inline const char *kernel_read_file_id_str(enum kernel_read_file_id id)
|
||||||
return kernel_read_file_str[id];
|
return kernel_read_file_str[id];
|
||||||
}
|
}
|
||||||
|
|
||||||
extern int kernel_read(struct file *, loff_t, char *, unsigned long);
|
|
||||||
extern int kernel_read_file(struct file *, void **, loff_t *, loff_t,
|
extern int kernel_read_file(struct file *, void **, loff_t *, loff_t,
|
||||||
enum kernel_read_file_id);
|
enum kernel_read_file_id);
|
||||||
extern int kernel_read_file_from_path(char *, void **, loff_t *, loff_t,
|
extern int kernel_read_file_from_path(char *, void **, loff_t *, loff_t,
|
||||||
enum kernel_read_file_id);
|
enum kernel_read_file_id);
|
||||||
extern int kernel_read_file_from_fd(int, void **, loff_t *, loff_t,
|
extern int kernel_read_file_from_fd(int, void **, loff_t *, loff_t,
|
||||||
enum kernel_read_file_id);
|
enum kernel_read_file_id);
|
||||||
extern ssize_t kernel_write(struct file *, const char *, size_t, loff_t);
|
extern ssize_t kernel_read(struct file *, void *, size_t, loff_t *);
|
||||||
extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
|
extern ssize_t kernel_write(struct file *, const void *, size_t, loff_t *);
|
||||||
|
extern ssize_t __kernel_write(struct file *, const void *, size_t, loff_t *);
|
||||||
extern struct file * open_exec(const char *);
|
extern struct file * open_exec(const char *);
|
||||||
|
|
||||||
/* fs/dcache.c -- generic fs support functions */
|
/* fs/dcache.c -- generic fs support functions */
|
||||||
|
|
|
@ -516,7 +516,7 @@ static void do_acct_process(struct bsd_acct_struct *acct)
|
||||||
if (file_start_write_trylock(file)) {
|
if (file_start_write_trylock(file)) {
|
||||||
/* it's been opened O_APPEND, so position is irrelevant */
|
/* it's been opened O_APPEND, so position is irrelevant */
|
||||||
loff_t pos = 0;
|
loff_t pos = 0;
|
||||||
__kernel_write(file, (char *)&ac, sizeof(acct_t), &pos);
|
__kernel_write(file, &ac, sizeof(acct_t), &pos);
|
||||||
file_end_write(file);
|
file_end_write(file);
|
||||||
}
|
}
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -986,8 +986,9 @@ static ssize_t bin_intvec(struct file *file,
|
||||||
size_t length = oldlen / sizeof(*vec);
|
size_t length = oldlen / sizeof(*vec);
|
||||||
char *str, *end;
|
char *str, *end;
|
||||||
int i;
|
int i;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
result = kernel_read(file, 0, buffer, BUFSZ - 1);
|
result = kernel_read(file, buffer, BUFSZ - 1, &pos);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
goto out_kfree;
|
goto out_kfree;
|
||||||
|
|
||||||
|
@ -1016,6 +1017,7 @@ static ssize_t bin_intvec(struct file *file,
|
||||||
size_t length = newlen / sizeof(*vec);
|
size_t length = newlen / sizeof(*vec);
|
||||||
char *str, *end;
|
char *str, *end;
|
||||||
int i;
|
int i;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
str = buffer;
|
str = buffer;
|
||||||
end = str + BUFSZ;
|
end = str + BUFSZ;
|
||||||
|
@ -1029,7 +1031,7 @@ static ssize_t bin_intvec(struct file *file,
|
||||||
str += scnprintf(str, end - str, "%lu\t", value);
|
str += scnprintf(str, end - str, "%lu\t", value);
|
||||||
}
|
}
|
||||||
|
|
||||||
result = kernel_write(file, buffer, str - buffer, 0);
|
result = kernel_write(file, buffer, str - buffer, &pos);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
goto out_kfree;
|
goto out_kfree;
|
||||||
}
|
}
|
||||||
|
@ -1057,8 +1059,9 @@ static ssize_t bin_ulongvec(struct file *file,
|
||||||
size_t length = oldlen / sizeof(*vec);
|
size_t length = oldlen / sizeof(*vec);
|
||||||
char *str, *end;
|
char *str, *end;
|
||||||
int i;
|
int i;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
result = kernel_read(file, 0, buffer, BUFSZ - 1);
|
result = kernel_read(file, buffer, BUFSZ - 1, &pos);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
goto out_kfree;
|
goto out_kfree;
|
||||||
|
|
||||||
|
@ -1087,6 +1090,7 @@ static ssize_t bin_ulongvec(struct file *file,
|
||||||
size_t length = newlen / sizeof(*vec);
|
size_t length = newlen / sizeof(*vec);
|
||||||
char *str, *end;
|
char *str, *end;
|
||||||
int i;
|
int i;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
str = buffer;
|
str = buffer;
|
||||||
end = str + BUFSZ;
|
end = str + BUFSZ;
|
||||||
|
@ -1100,7 +1104,7 @@ static ssize_t bin_ulongvec(struct file *file,
|
||||||
str += scnprintf(str, end - str, "%lu\t", value);
|
str += scnprintf(str, end - str, "%lu\t", value);
|
||||||
}
|
}
|
||||||
|
|
||||||
result = kernel_write(file, buffer, str - buffer, 0);
|
result = kernel_write(file, buffer, str - buffer, &pos);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
goto out_kfree;
|
goto out_kfree;
|
||||||
}
|
}
|
||||||
|
@ -1120,8 +1124,9 @@ static ssize_t bin_uuid(struct file *file,
|
||||||
if (oldval && oldlen) {
|
if (oldval && oldlen) {
|
||||||
char buf[UUID_STRING_LEN + 1];
|
char buf[UUID_STRING_LEN + 1];
|
||||||
uuid_t uuid;
|
uuid_t uuid;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
result = kernel_read(file, 0, buf, sizeof(buf) - 1);
|
result = kernel_read(file, buf, sizeof(buf) - 1, &pos);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -1154,8 +1159,9 @@ static ssize_t bin_dn_node_address(struct file *file,
|
||||||
char buf[15], *nodep;
|
char buf[15], *nodep;
|
||||||
unsigned long area, node;
|
unsigned long area, node;
|
||||||
__le16 dnaddr;
|
__le16 dnaddr;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
result = kernel_read(file, 0, buf, sizeof(buf) - 1);
|
result = kernel_read(file, buf, sizeof(buf) - 1, &pos);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -1188,6 +1194,7 @@ static ssize_t bin_dn_node_address(struct file *file,
|
||||||
__le16 dnaddr;
|
__le16 dnaddr;
|
||||||
char buf[15];
|
char buf[15];
|
||||||
int len;
|
int len;
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
result = -EINVAL;
|
result = -EINVAL;
|
||||||
if (newlen != sizeof(dnaddr))
|
if (newlen != sizeof(dnaddr))
|
||||||
|
@ -1201,7 +1208,7 @@ static ssize_t bin_dn_node_address(struct file *file,
|
||||||
le16_to_cpu(dnaddr) >> 10,
|
le16_to_cpu(dnaddr) >> 10,
|
||||||
le16_to_cpu(dnaddr) & 0x3ff);
|
le16_to_cpu(dnaddr) & 0x3ff);
|
||||||
|
|
||||||
result = kernel_write(file, buf, len, 0);
|
result = kernel_write(file, buf, len, &pos);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1164,17 +1164,12 @@ static int do_mmap_private(struct vm_area_struct *vma,
|
||||||
|
|
||||||
if (vma->vm_file) {
|
if (vma->vm_file) {
|
||||||
/* read the contents of a file into the copy */
|
/* read the contents of a file into the copy */
|
||||||
mm_segment_t old_fs;
|
|
||||||
loff_t fpos;
|
loff_t fpos;
|
||||||
|
|
||||||
fpos = vma->vm_pgoff;
|
fpos = vma->vm_pgoff;
|
||||||
fpos <<= PAGE_SHIFT;
|
fpos <<= PAGE_SHIFT;
|
||||||
|
|
||||||
old_fs = get_fs();
|
ret = kernel_read(vma->vm_file, base, len, &fpos);
|
||||||
set_fs(KERNEL_DS);
|
|
||||||
ret = __vfs_read(vma->vm_file, base, len, &fpos);
|
|
||||||
set_fs(old_fs);
|
|
||||||
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto error_free;
|
goto error_free;
|
||||||
|
|
||||||
|
|
|
@ -272,6 +272,7 @@ static int p9_fd_read(struct p9_client *client, void *v, int len)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct p9_trans_fd *ts = NULL;
|
struct p9_trans_fd *ts = NULL;
|
||||||
|
loff_t pos;
|
||||||
|
|
||||||
if (client && client->status != Disconnected)
|
if (client && client->status != Disconnected)
|
||||||
ts = client->trans;
|
ts = client->trans;
|
||||||
|
@ -282,7 +283,8 @@ static int p9_fd_read(struct p9_client *client, void *v, int len)
|
||||||
if (!(ts->rd->f_flags & O_NONBLOCK))
|
if (!(ts->rd->f_flags & O_NONBLOCK))
|
||||||
p9_debug(P9_DEBUG_ERROR, "blocking read ...\n");
|
p9_debug(P9_DEBUG_ERROR, "blocking read ...\n");
|
||||||
|
|
||||||
ret = kernel_read(ts->rd, ts->rd->f_pos, v, len);
|
pos = ts->rd->f_pos;
|
||||||
|
ret = kernel_read(ts->rd, v, len, &pos);
|
||||||
if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
|
if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
|
||||||
client->status = Disconnected;
|
client->status = Disconnected;
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -420,8 +422,7 @@ static void p9_read_work(struct work_struct *work)
|
||||||
|
|
||||||
static int p9_fd_write(struct p9_client *client, void *v, int len)
|
static int p9_fd_write(struct p9_client *client, void *v, int len)
|
||||||
{
|
{
|
||||||
int ret;
|
ssize_t ret;
|
||||||
mm_segment_t oldfs;
|
|
||||||
struct p9_trans_fd *ts = NULL;
|
struct p9_trans_fd *ts = NULL;
|
||||||
|
|
||||||
if (client && client->status != Disconnected)
|
if (client && client->status != Disconnected)
|
||||||
|
@ -433,12 +434,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
|
||||||
if (!(ts->wr->f_flags & O_NONBLOCK))
|
if (!(ts->wr->f_flags & O_NONBLOCK))
|
||||||
p9_debug(P9_DEBUG_ERROR, "blocking write ...\n");
|
p9_debug(P9_DEBUG_ERROR, "blocking write ...\n");
|
||||||
|
|
||||||
oldfs = get_fs();
|
ret = kernel_write(ts->wr, v, len, &ts->wr->f_pos);
|
||||||
set_fs(get_ds());
|
|
||||||
/* The cast to a user pointer is valid due to the set_fs() */
|
|
||||||
ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
|
|
||||||
set_fs(oldfs);
|
|
||||||
|
|
||||||
if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
|
if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
|
||||||
client->status = Disconnected;
|
client->status = Disconnected;
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -147,6 +147,7 @@ int big_key_preparse(struct key_preparsed_payload *prep)
|
||||||
* File content is stored encrypted with randomly generated key.
|
* File content is stored encrypted with randomly generated key.
|
||||||
*/
|
*/
|
||||||
size_t enclen = ALIGN(datalen, crypto_skcipher_blocksize(big_key_skcipher));
|
size_t enclen = ALIGN(datalen, crypto_skcipher_blocksize(big_key_skcipher));
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
/* prepare aligned data to encrypt */
|
/* prepare aligned data to encrypt */
|
||||||
data = kmalloc(enclen, GFP_KERNEL);
|
data = kmalloc(enclen, GFP_KERNEL);
|
||||||
|
@ -179,7 +180,7 @@ int big_key_preparse(struct key_preparsed_payload *prep)
|
||||||
goto err_enckey;
|
goto err_enckey;
|
||||||
}
|
}
|
||||||
|
|
||||||
written = kernel_write(file, data, enclen, 0);
|
written = kernel_write(file, data, enclen, &pos);
|
||||||
if (written != enclen) {
|
if (written != enclen) {
|
||||||
ret = written;
|
ret = written;
|
||||||
if (written >= 0)
|
if (written >= 0)
|
||||||
|
@ -295,6 +296,7 @@ long big_key_read(const struct key *key, char __user *buffer, size_t buflen)
|
||||||
u8 *data;
|
u8 *data;
|
||||||
u8 *enckey = (u8 *)key->payload.data[big_key_data];
|
u8 *enckey = (u8 *)key->payload.data[big_key_data];
|
||||||
size_t enclen = ALIGN(datalen, crypto_skcipher_blocksize(big_key_skcipher));
|
size_t enclen = ALIGN(datalen, crypto_skcipher_blocksize(big_key_skcipher));
|
||||||
|
loff_t pos = 0;
|
||||||
|
|
||||||
data = kmalloc(enclen, GFP_KERNEL);
|
data = kmalloc(enclen, GFP_KERNEL);
|
||||||
if (!data)
|
if (!data)
|
||||||
|
@ -307,7 +309,7 @@ long big_key_read(const struct key *key, char __user *buffer, size_t buflen)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* read file to kernel and decrypt */
|
/* read file to kernel and decrypt */
|
||||||
ret = kernel_read(file, 0, data, enclen);
|
ret = kernel_read(file, data, enclen, &pos);
|
||||||
if (ret >= 0 && ret != enclen) {
|
if (ret >= 0 && ret != enclen) {
|
||||||
ret = -EIO;
|
ret = -EIO;
|
||||||
goto err_fput;
|
goto err_fput;
|
||||||
|
|
Loading…
Reference in a new issue