From nobody Tue Sep 12 16:44:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTtx69Jqz4stXv; Tue, 12 Sep 2023 16:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTtx5lSBz3dLW; Tue, 12 Sep 2023 16:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EG6vaUE1ckAnV3fw4EmRLFPFbRMbdkK1zxYvB+tXBtw=; b=FZslEcBYNCg41xiKGwvwgeZ15N+Zp33v7rDPcdSsy6LRShxZhQj5pEzBLYXQ9SHtY12EKb mj+t3BO0eDiWxP4MJUnyLlOGTpn++/q4/tgbhQZ540Lk3oViVL4dwEEs32xWia6NiFT0G1 K4mmdmDzVZrg0Dcf/HOJ3bIxFdxdbXutfk2Q5UfSUBt6HOubkJA0t5QNag7tYBq+vx2yRi 9jAwZsWnO3gcZTmrMofsWXWyMDggSD2E78bguTeFDwfwSS/hMHJLmue1y+/EL6wXeEGpOY r2AhFmLMHQst22O1XhtyWloQhY/ewdGiFdo12th7r2+f469rZ8XUVXHxDibiJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537049; a=rsa-sha256; cv=none; b=XPRAtzNG7f4/logDl45gmd2pph92scrFj0EjbpRAMQAmci7GU0SqVhXBQ2YIrcw3qsqHfp Jq1CeojcpR55xSPtIi6lYAUVlXK69NhY4ksulrp19NcFrxizVEUU0eNeag5nDcWbE+a0oO DGJF8Dv8D3+P/KoKtWI0GMAf725m/fnstUXQl8hExC8mAKIHd4SAdMz+/4vr0fTOIVzoiu R9G+4oz16X1NrG1vQhZkyasBiXuNriptyCYt3A/zQ9Chbqo8AQlqCE1j7J9O7lJzdrW1ia oj/D2HmdfF+0X8oWAQJU/8UhNmead7dn1bAkwkNt1GRsdf5HmpS4vfrRFHtrIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EG6vaUE1ckAnV3fw4EmRLFPFbRMbdkK1zxYvB+tXBtw=; b=UkozN9mZPsO8nbIgTe+nxXW7VukbVGS4Nt44306cvCo/3HVl6wxt3KdJ/i45BSq/hZtAzg JeL6jR5kSYlVYTuqoKXNYLxgYe8vc4s4Ti0YQrbHe31t4LWLNKaQlEiLkQo4w52A1X6PGl ZDaIYEW0jmiqBQv0y4xlHsNGz2c+AraH4mdBXpTW83uNKENXpPRJT78fnM1VubdScPuwnX MCGE8Aeev5nUK5+9uvSc7cVySV5W3YGZ3o0+UpnLUIzH4VCOZ4fFPUZXm1BZP5nMIURlEy pv/c7BEOJw2VtBnaSiowKOhKGWEqSc4qzva3zr5BRq9/HuQnsp1hLAnzfHnr/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTtx4pbkzfjj; Tue, 12 Sep 2023 16:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGi91q070934; Tue, 12 Sep 2023 16:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGi97c070931; Tue, 12 Sep 2023 16:44:09 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:09 GMT Message-Id: <202309121644.38CGi97c070931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d64356323c10 - releng/14.0 - linux(4): Merge getxattr for future error recode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d64356323c1058909df7efe772f7ab0843a30f55 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d64356323c1058909df7efe772f7ab0843a30f55 commit d64356323c1058909df7efe772f7ab0843a30f55 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:09:49 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:13 +0000 linux(4): Merge getxattr for future error recode Approved by: re (gjb) Tested by: zirias MFC after: 1 week (cherry picked from commit 6b46ec66129d9490c91876f72d98e514121996a6) (cherry picked from commit 803280ea07e9c07007e0acd3864a18d40b86de2a) --- sys/compat/linux/linux_xattr.c | 62 ++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index b54a0d2f89ad..901123684154 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -68,6 +68,15 @@ struct setxattr_args { int follow; }; +struct getxattr_args { + int fd; + const char *path; + const char *name; + void *value; + l_size_t size; + int follow; +}; + static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; @@ -262,47 +271,66 @@ linux_fremovexattr(struct thread *td, struct linux_fremovexattr_args *args) } static int -linux_path_getxattr(struct thread *td, const char *upath, const char *uname, - void *value, l_size_t size, int follow) +getxattr(struct thread *td, struct getxattr_args *args) { char attrname[LINUX_XATTR_NAME_MAX + 1]; int attrnamespace, error; - error = xatrr_to_extattr(uname, &attrnamespace, attrname); + error = xatrr_to_extattr(args->name, &attrnamespace, attrname); if (error != 0) return (error); - - return (kern_extattr_get_path(td, upath, attrnamespace, - attrname, value, size, follow, UIO_USERSPACE)); + if (args->path != NULL) + error = kern_extattr_get_path(td, args->path, attrnamespace, + attrname, args->value, args->size, args->follow, UIO_USERSPACE); + else + error = kern_extattr_get_fd(td, args->fd, attrnamespace, + attrname, args->value, args->size); + return (error); } int linux_getxattr(struct thread *td, struct linux_getxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = FOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, FOLLOW)); + return (getxattr(td, &eargs)); } int linux_lgetxattr(struct thread *td, struct linux_lgetxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = NOFOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, NOFOLLOW)); + return (getxattr(td, &eargs)); } int linux_fgetxattr(struct thread *td, struct linux_fgetxattr_args *args) { - char attrname[LINUX_XATTR_NAME_MAX + 1]; - int attrnamespace, error; + struct getxattr_args eargs = { + .fd = args->fd, + .path = NULL, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = 0, + }; - error = xatrr_to_extattr(args->name, &attrnamespace, attrname); - if (error != 0) - return (error); - return (kern_extattr_get_fd(td, args->fd, attrnamespace, - attrname, args->value, args->size)); + return (getxattr(td, &eargs)); } static int