Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

autofs4: deal with autofs4_write/autofs4_write races

Browse source 
Just serialize the actual writing of packets into pipe on
a new mutex, independent from everything else in the locking
hierarchy.  As soon as something has started feeding a piece
of packet into the pipe to daemon, we *want* everything else
about to try the same to wait until we are done.

Acked-by: Ian Kent <raven@themaw.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-01-10 22:35:38 -05:00
parent 8753333266
commit d668dc5663
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs/autofs4/autofs_i.h
View file

@ -116,6 +116,7 @@ struct autofs_sb_info {
int needs_reghost; int needs_reghost;
struct super_block *sb; struct super_block *sb;
struct mutex wq_mutex; struct mutex wq_mutex;
struct mutex pipe_mutex;
spinlock_t fs_lock; spinlock_t fs_lock;
struct autofs_wait_queue *queues; /* Wait queue pointer */ struct autofs_wait_queue *queues; /* Wait queue pointer */
spinlock_t lookup_lock; spinlock_t lookup_lock;

1
fs/autofs4/inode.c
View file

@ -225,6 +225,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
sbi->min_proto = 0; sbi->min_proto = 0;
sbi->max_proto = 0; sbi->max_proto = 0;
mutex_init(&sbi->wq_mutex); mutex_init(&sbi->wq_mutex);
mutex_init(&sbi->pipe_mutex);
spin_lock_init(&sbi->fs_lock); spin_lock_init(&sbi->fs_lock);
sbi->queues = NULL; sbi->queues = NULL;
spin_lock_init(&sbi->lookup_lock); spin_lock_init(&sbi->lookup_lock);

9
fs/autofs4/waitq.c
View file

@ -56,26 +56,27 @@ void autofs4_catatonic_mode(struct autofs_sb_info *sbi)
mutex_unlock(&sbi->wq_mutex); mutex_unlock(&sbi->wq_mutex);
} }
static int autofs4_write(struct file *file, const void *addr, int bytes) static int autofs4_write(struct autofs_sb_info *sbi,
struct file *file, const void *addr, int bytes)
{ {
unsigned long sigpipe, flags; unsigned long sigpipe, flags;
mm_segment_t fs; mm_segment_t fs;
const char *data = (const char *)addr; const char *data = (const char *)addr;
ssize_t wr = 0; ssize_t wr = 0;
/** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
sigpipe = sigismember(&current->pending.signal, SIGPIPE); sigpipe = sigismember(&current->pending.signal, SIGPIPE);
/* Save pointer to user space and point back to kernel space */ /* Save pointer to user space and point back to kernel space */
fs = get_fs(); fs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
mutex_lock(&sbi->pipe_mutex);
while (bytes && while (bytes &&
(wr = file->f_op->write(file,data,bytes,&file->f_pos)) > 0) { (wr = file->f_op->write(file,data,bytes,&file->f_pos)) > 0) {
data += wr; data += wr;
bytes -= wr; bytes -= wr;
} }
mutex_lock(&sbi->pipe_mutex);
set_fs(fs); set_fs(fs);
@ -179,7 +180,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
mutex_unlock(&sbi->wq_mutex); mutex_unlock(&sbi->wq_mutex);
if (autofs4_write(pipe, &pkt, pktsz)) if (autofs4_write(sbi, pipe, &pkt, pktsz))
autofs4_catatonic_mode(sbi); autofs4_catatonic_mode(sbi);
fput(pipe); fput(pipe);
} }