From nobody Fri Sep 1 08:14:39 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 4RcW68050sz4sDth; Fri, 1 Sep 2023 08:14:40 +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 4RcW676l2pz3KKH; Fri, 1 Sep 2023 08:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693556079; 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=pHruWn5Lt6F0g/z4kBk9hL6XOpXzltZyvzD21HEA6HA=; b=jGDr83Kwyk1ESnDwtBL+0/VyZ2EQJDXuNxrDuWjeVV09WxbZEdkecH+CVHmvUzCxo4Y888 x3Qdc4/XDgLtb/gqO8DO0PK6jy8spXkBMuUltBb/UnQHynv7lgMe6tJFHX2H9tfhWj0639 J/+KJ7J1xwfKkH3lrtkBy7YhLWkvmbxvupWNPAO+oZjM3FLwIcU8bqLXdYDsgDFrkm6hpA JlIIlgLqmBOE6kf6U7oqRKZizgSyJHG9J+UM2R7ww5aGKFEB24zCOJ12Qu0QJpDVe7rnVD pcwnd10JHxNxssqewM6d8K30W+mJSEFgyliIN9D3+ySKoY8PVw/lwmChVCnwvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693556079; a=rsa-sha256; cv=none; b=tmG9L3hMwMQBW57RN3RgfSAO2HwH8+GsQYpLk7E8/47biHLSA3KFT1eNB2/fX7768z63rw l9q0MEpCe+rWFY7rVKs6k59rIi48Z4gyfK1l22WOHYstRWX4cQPD6RQ7PGFu0Kl2kb9p01 cLfl5mbrhb7+9DTL3rHIFTzS+sh9ZxtUt5RuHTKBvb6fl4l5ZAN/mOJsnG6JX0oyD2Fv2b 39tWNyVwqMeT1bboXWlnIfSVXVYdxzwKP2zYwgqc2X6yaubkheSbjdJsYrUcXmRt2xZkIS TwTFNo8UnP2WqdDg8Nn3SgzaMb8uY5PWfQVuzZagKQsdNkt9AZvH13CXi/uqXA== 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=1693556079; 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=pHruWn5Lt6F0g/z4kBk9hL6XOpXzltZyvzD21HEA6HA=; b=XYRI77N0dPVQqC3XelCLzzgCWyipdeKOAhZ3+dE5zsmB1UsWOSZrY3jcQHO1HMjNjmodtU Yo/cz0Ith95t8IYv7fHHLS5CDe+HIzBTlBYCILz3bbWMKgpTB5tjL1qJY6SCqqwcOr2dMd /TuGz3D/zDzOdNPPusn80Wq/sEC9C4VRl3t74aZuhbSl8KqpP5pcnGGbvT4MkzI8QsE3Z9 dGQRNN6feiXZGeHg4YGNo0VPrW74G4cYR5ayfxVnO9SoVkr8fncA0zWtZ+I59THkEvRXrF Qwzxwku9wWcBf/mAgMqRoHbocZgye2zaIQSP5U8ZcFgDKt26guFiN2hjxBDHfA== 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 4RcW675nwsztXG; Fri, 1 Sep 2023 08:14:39 +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 3818Ed6M008276; Fri, 1 Sep 2023 08:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3818EdQw008273; Fri, 1 Sep 2023 08:14:39 GMT (envelope-from git) Date: Fri, 1 Sep 2023 08:14:39 GMT Message-Id: <202309010814.3818EdQw008273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 6b46ec66129d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 6b46ec66129d9490c91876f72d98e514121996a6 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6b46ec66129d9490c91876f72d98e514121996a6 commit 6b46ec66129d9490c91876f72d98e514121996a6 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:09:49 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-01 08:09:49 +0000 linux(4): Merge getxattr for future error recode Tested by: zirias MFC after: 1 week --- 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