diff options
| author | NeilBrown <neilb@suse.com> | 2019-03-08 01:29:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-08 03:32:01 +0100 |
| commit | 660c9fc72e06d7a46d96d2cb8524a26565072a76 (patch) | |
| tree | 4adce139d95571ff6789dc81120227d98145a90e /fs/autofs/autofs_i.h | |
| parent | fs/autofs/inode.c: use seq_puts() for simple strings in autofs_show_options() (diff) | |
| download | linux-660c9fc72e06d7a46d96d2cb8524a26565072a76.tar.xz linux-660c9fc72e06d7a46d96d2cb8524a26565072a76.zip | |
autofs: clear O_NONBLOCK on the pipe
autofs does not expect the pipe it is given to have O_NONBLOCK set -
specifically if __kernel_write() in autofs_write() returns -EAGAIN, this
is treated as a fatal error and the pipe is closed.
For safety autofs should, therefore, clear the O_NONBLOCK flag.
Releases of systemd prior to 8th February 2019 used
pipe2(p, O_NONBLOCK|O_CLOEXEC)
and thus (inadvertently) set this flag.
Link: http://lkml.kernel.org/r/154993550902.3321.1183632970046073478.stgit@pluto-themaw-net
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/autofs/autofs_i.h')
| -rw-r--r-- | fs/autofs/autofs_i.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h index b735f2b1e462..70c132acdab1 100644 --- a/fs/autofs/autofs_i.h +++ b/fs/autofs/autofs_i.h @@ -216,6 +216,8 @@ static inline int autofs_prepare_pipe(struct file *pipe) return -EINVAL; /* We want a packet pipe */ pipe->f_flags |= O_DIRECT; + /* We don't expect -EAGAIN */ + pipe->f_flags &= ~O_NONBLOCK; return 0; } |