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 26155C433FE for ; Tue, 28 Dec 2021 18:42:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237091AbhL1SmE (ORCPT ); Tue, 28 Dec 2021 13:42:04 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:40880 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237088AbhL1SmE (ORCPT ); Tue, 28 Dec 2021 13:42:04 -0500 Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BSBAMrT019030 for ; Tue, 28 Dec 2021 10:42:03 -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=OWy9QG3fonHGqxVXvlRuujEN1WXELD0QpEupORg/w3Q=; b=czf0TuExIauJ+xPRQE5dozXp694qOcghilMbet6N9uPPUYrlamBMZLsizVJz+3u97dxW QwZ3U8NzjrRzygJG///d5Mi4V57QYLmS9gXTUS47mllfrUjg8oz+gUQqm2GHsqca1jaO CkcJNNpw6RzglaI6r8doSb6gK5iPkaBOtYI= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3d749t8jdy-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 28 Dec 2021 10:42:03 -0800 Received: from twshared18912.14.frc2.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 28 Dec 2021 10:42:02 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 248598B3D9C8; Tue, 28 Dec 2021 10:41:48 -0800 (PST) From: Stefan Roesch To: , , CC: , , Subject: [PATCH v9 3/5] fs: split off do_getxattr from getxattr Date: Tue, 28 Dec 2021 10:41:43 -0800 Message-ID: <20211228184145.1131605-4-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211228184145.1131605-1-shr@fb.com> References: <20211228184145.1131605-1-shr@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: RQtZpaOHjfLqogmRiAQ1u1DOgf3plH4Q X-Proofpoint-ORIG-GUID: RQtZpaOHjfLqogmRiAQ1u1DOgf3plH4Q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-28_10,2021-12-28_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=719 mlxscore=0 adultscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112280084 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org This splits off do_getxattr function from the getxattr function. This will allow io_uring to call it from its io worker. Signed-off-by: Stefan Roesch Acked-by: Christian Brauner --- fs/internal.h | 7 +++++++ fs/xattr.c | 32 ++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index 00c98b0cd634..942b2005a2be 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -220,6 +220,13 @@ struct xattr_ctx { unsigned int flags; }; =20 + +ssize_t do_getxattr(struct user_namespace *mnt_userns, + struct dentry *d, + const char *kname, + void __user *value, + size_t size); + int setxattr_copy(const char __user *name, struct xattr_ctx *ctx); int do_setxattr(struct user_namespace *mnt_userns, struct dentry *dentry= , struct xattr_ctx *ctx); diff --git a/fs/xattr.c b/fs/xattr.c index 923ba944d20e..3b6d683d07b9 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -677,19 +677,12 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __us= er *, name, /* * Extended attribute GET operations */ -static ssize_t -getxattr(struct user_namespace *mnt_userns, struct dentry *d, - const char __user *name, void __user *value, size_t size) +ssize_t +do_getxattr(struct user_namespace *mnt_userns, struct dentry *d, + const char *kname, void __user *value, size_t size) { - ssize_t error; void *kvalue =3D NULL; - char kname[XATTR_NAME_MAX + 1]; - - error =3D strncpy_from_user(kname, name, sizeof(kname)); - if (error =3D=3D 0 || error =3D=3D sizeof(kname)) - error =3D -ERANGE; - if (error < 0) - return error; + ssize_t error; =20 if (size) { if (size > XATTR_SIZE_MAX) @@ -713,10 +706,25 @@ getxattr(struct user_namespace *mnt_userns, struct = dentry *d, } =20 kvfree(kvalue); - return error; } =20 +static ssize_t +getxattr(struct user_namespace *mnt_userns, struct dentry *d, + const char __user *name, void __user *value, size_t size) +{ + ssize_t error; + struct xattr_name kname; + + error =3D strncpy_from_user(kname.name, name, sizeof(kname.name)); + if (error =3D=3D 0 || error =3D=3D sizeof(kname.name)) + error =3D -ERANGE; + if (error < 0) + return error; + + return do_getxattr(mnt_userns, d, kname.name, value, size); +} + static ssize_t path_getxattr(const char __user *pathname, const char __user *name, void __user *value, size_t size, unsigned int lookup_flags) --=20 2.30.2