From: Linus Torvalds Date: Fri, 6 Dec 2019 00:35:53 +0000 (-0800) Subject: Merge branch 'pipe-rework' (patches from David Howells) X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=da73fcd8cfdc3d0ef49280fa0d511723a0220e03;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'pipe-rework' (patches from David Howells) Merge two fixes for the pipe rework from David Howells: "Here are a couple of patches to fix bugs syzbot found in the pipe changes: - An assertion check will sometimes trip when polling a pipe because the ring size and indices used are approximate and may be being changed simultaneously. An equivalent approximate calculation was done previously, but without the assertion check, so I've just dropped the check. To make it accurate, the pipe mutex would need to be taken or the spin lock could be used - but usage of the spinlock would need to be rolled out into splice, iov_iter and other places for that. - The index mask and the max_usage values cannot be cached across pipe_wait() as F_SETPIPE_SZ could have been called during the wait. This can cause pipe_write() to break" * pipe-rework: pipe: Fix missing mask update after pipe_wait() pipe: Remove assertion from pipe_poll() --- da73fcd8cfdc3d0ef49280fa0d511723a0220e03