From: NeilBrown Date: Fri, 8 Mar 2019 00:29:16 +0000 (-0800) Subject: autofs: clear O_NONBLOCK on the pipe X-Git-Tag: v5.1-rc1~118^2~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=660c9fc72e06d7a46d96d2cb8524a26565072a76;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h index b735f2b1e4620..70c132acdab1b 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; }