From nobody Wed Dec 17 09:50:17 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A042C4332F for ; Thu, 14 Dec 2023 18:45:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1573168AbjLNSpq (ORCPT ); Thu, 14 Dec 2023 13:45:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1573260AbjLNSpR (ORCPT ); Thu, 14 Dec 2023 13:45:17 -0500 Received: from tarta.nabijaczleweli.xyz (tarta.nabijaczleweli.xyz [139.28.40.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3FF610C4; Thu, 14 Dec 2023 10:45:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202305; t=1702579516; bh=nDrwqDx6g17tp76N5xVUDx8sUEDcvzOb97eotkFu3/k=; h=Date:From:Cc:Subject:References:In-Reply-To:From; b=bU9lIeGDIS4sb4eigHq8GkEC2G0QMzGoWlh/3T6TCHg4E7CiLMx6bQhTrB2uPpk8j ssozwnxjkVhZyEpDAVSf+GeMQ2iDxQaNQB9ZJF33EZtkloiW25yAV6e2kfwdpVNQBg rAo1xySnVgDvdqKVSOX/Hx4LKdqcTnlQaI84JLOg6QMzXXlCbUAe6Ced9wsyGUJjqU ybnPvgcZ4j8Qo80Ln49MG0FiNV3kUv2kbj6z9B/91NC+JUFPl13k8ro6EBaBE/uYLt aYiwtqxmm6DHMe24nl6WsxT3vvR/q0x+MAbHsLbLdGqvfOlyB/Lo/b3On3E8BUVJEp V6V+Z3IxNwrbA== Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 4786313990; Thu, 14 Dec 2023 19:45:16 +0100 (CET) Date: Thu, 14 Dec 2023 19:45:16 +0100 From: Ahelenia =?utf-8?Q?Ziemia=C5=84ska?= Cc: Jens Axboe , Christian Brauner , Alexander Viro , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RERESEND 10/11] splice: file->pipe: -EINVAL for non-regular files w/o FMODE_NOWAIT Message-ID: <25974c79b84c0b3aad566ff7c33b082f90ac5f17e.1697486714.git.nabijaczleweli@nabijaczleweli.xyz> User-Agent: NeoMutt/20231103 References: <2cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="nahgatr7vznet5uy" Content-Disposition: inline In-Reply-To: <2cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz> To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --nahgatr7vznet5uy Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We request non-blocking I/O in the generic implementation, but some files =E2=80=92 ttys =E2=80=92 only check O_NONBLOCK. Refuse them here, les= t we risk sleeping with the pipe locked for indeterminate lengths of time. This also masks inconsistent wake-ups (usually every second line) when splicing from ttys in icanon mode. Regular files don't /have/ a distinct O_NONBLOCK mode, because they always behave non-blockingly, and for them FMODE_NOWAIT is used in the purest sense of /* File is capable of returning -EAGAIN if I/O will block */ which is not set by the vast majority of filesystems, and it's not the semantic we want here. Link: https://lore.kernel.org/linux-fsdevel/qk6hjuam54khlaikf2ssom6custxf5i= s2ekkaequf4hvode3ls@zgf7j5j4ubvw/t/#u Signed-off-by: Ahelenia Ziemia=C5=84ska --- fs/splice.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/splice.c b/fs/splice.c index 9d29664f23ee..81788bf7daa1 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1300,6 +1300,8 @@ long do_splice(struct file *in, loff_t *off_in, struc= t file *out, } else if (opipe) { if (off_out) return -ESPIPE; + if (!((in->f_mode & FMODE_NOWAIT) || S_ISREG(in->f_inode->i_mode))) + return -EINVAL; if (off_in) { if (!(in->f_mode & FMODE_PREAD)) return -EINVAL; --=20 2.39.2 --nahgatr7vznet5uy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmV7TTsACgkQvP0LAY0m WPG0kw//XaT6a9M/I3lwDoHIwD8jmA4YvrDYXd17kTGGyTlEjJ3MkN1uy0tBL9JB F15x4n42QkCX2nBf+wClYkG4sbss0sPz7qw0nvU9no5+a4p9a9Q+Q6619FKoKTgD P1MD8ehjb0chM9VbWUZ2wXYxHn/CLDXuBXIx/FcGeu7/XWFCrJo6PJoENie6FBIb tNHKTkCDq1v4cQFi9ZzkKaEuYkt62FbRnMlP65tgdu62kFnbSm69rZqkSkw8e5fW uHRZ+mdEiGpcyPrf4Dh30BA3uee8kQ751LKN0hOEvwIqudidUhCNPYJ42d+ndSsa K7mu2XaPKtqgqNZar5OrNSiGqCXlOZlmxXcjEgeC6OWCMa7kdL891rngHVSN7VG5 LvV/wi+3BdNnASOspkE/N73LA43sEQPQbkNrNsXsp1PT/wJsXCnzm9fKD8uUewpN srV0zasghFl6aI6TYDCUwmEbNHtoB0tJF0mNvU9IvETZJg92jSvC/GDKlE6L1Bb+ VL/Pwz1POWtyzgZSGTcom/HAa2x5IgDZ8qEkb7OLegqDv/Aqw486RK+tJpW1Cf5M OKlAM50448ziDvq+WkvbKF2Pu0iseBFVAWP1q8wzYWYOb4yMUFwDVrpgE3E81iww CEbzBNC5UfeaeoIdwLpgBQW9dx/kfVVToK1O5EyJk+iuFQF1WRY= =2snT -----END PGP SIGNATURE----- --nahgatr7vznet5uy--