From mboxrd@z Thu Jan 1 00:00:00 1970 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 73D8AC433F5 for ; Tue, 15 Feb 2022 18:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242809AbiBOSDz (ORCPT ); Tue, 15 Feb 2022 13:03:55 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:40388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242818AbiBOSDy (ORCPT ); Tue, 15 Feb 2022 13:03:54 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A22211861E for ; Tue, 15 Feb 2022 10:03:44 -0800 (PST) Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21FHtHxP030470 for ; Tue, 15 Feb 2022 10:03:44 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=ynEAjDxLFX/0YITX75d7F1VJ3XLGLWEk5W5R3IbUC0Q=; b=WvbR8XhisFac8tPB8IXOuGSsNxm3GURWexsnjYnlna32KsgZIP9uEGHzz4orchPsrCov Xld1pZ2xICuF5kIRCUL1/irtytVxfKcipXsTOCc/f9H0oE04YDnMj1IksnWyJOvfgFsh d4gWTHhB1Kq/oUoRUL6Uai9Doit/WJSJWlI= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3e8fmu0v1q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 15 Feb 2022 10:03:44 -0800 Received: from twshared0654.04.ash8.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Tue, 15 Feb 2022 10:03:43 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id DC262AC8C96C; Tue, 15 Feb 2022 10:03:29 -0800 (PST) From: Stefan Roesch To: , , CC: , Subject: [PATCH v3 2/2] io-uring: Copy path name during prepare stage for statx Date: Tue, 15 Feb 2022 10:03:28 -0800 Message-ID: <20220215180328.2320199-3-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220215180328.2320199-1-shr@fb.com> References: <20220215180328.2320199-1-shr@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: OtuqU1hV-_19eqGOobBmvwMu4mpQb3pR X-Proofpoint-ORIG-GUID: OtuqU1hV-_19eqGOobBmvwMu4mpQb3pR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-15_05,2022-02-14_04,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 phishscore=0 impostorscore=0 malwarescore=0 suspectscore=0 bulkscore=0 mlxscore=0 spamscore=0 clxscore=1015 priorityscore=1501 adultscore=0 lowpriorityscore=0 mlxlogscore=783 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202150105 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org One of the key architectual tenets is to keep the parameters for io-uring stable. After the call has been submitted, its value can be changed. Unfortunaltely this is not the case for the current statx implementation. This changes replaces the const char * filename pointer in the io_statx structure with a struct filename *. In addition it also creates the filename object during the prepare phase. With this change, the opcode also needs to invoke cleanup, so the filename object gets freed after processing the request. Signed-off-by: Stefan Roesch --- fs/io_uring.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 77b9c7e4793b..28b09b163df1 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -642,7 +642,7 @@ struct io_statx { int dfd; unsigned int mask; unsigned int flags; - const char __user *filename; + struct filename *filename; struct statx __user *buffer; }; =20 @@ -4721,6 +4721,8 @@ static int io_fadvise(struct io_kiocb *req, unsigne= d int issue_flags) =20 static int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe= *sqe) { + const char __user *path; + if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) return -EINVAL; if (sqe->ioprio || sqe->buf_index || sqe->splice_fd_in) @@ -4730,10 +4732,22 @@ static int io_statx_prep(struct io_kiocb *req, co= nst struct io_uring_sqe *sqe) =20 req->statx.dfd =3D READ_ONCE(sqe->fd); req->statx.mask =3D READ_ONCE(sqe->len); - req->statx.filename =3D u64_to_user_ptr(READ_ONCE(sqe->addr)); + path =3D u64_to_user_ptr(READ_ONCE(sqe->addr)); req->statx.buffer =3D u64_to_user_ptr(READ_ONCE(sqe->addr2)); req->statx.flags =3D READ_ONCE(sqe->statx_flags); =20 + req->statx.filename =3D getname_flags(path, + getname_statx_lookup_flags(req->statx.flags), + NULL); + + if (IS_ERR(req->statx.filename)) { + int ret =3D PTR_ERR(req->statx.filename); + + req->statx.filename =3D NULL; + return ret; + } + + req->flags |=3D REQ_F_NEED_CLEANUP; return 0; } =20 @@ -6708,6 +6722,10 @@ static void io_clean_op(struct io_kiocb *req) putname(req->hardlink.oldpath); putname(req->hardlink.newpath); break; + case IORING_OP_STATX: + if (req->statx.filename) + putname(req->statx.filename); + break; } } if ((req->flags & REQ_F_POLLED) && req->apoll) { --=20 2.30.2