From: Kari Argillander <kari.argillander@gmail.com>
To: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
ntfs3@lists.linux.dev
Cc: Kari Argillander <kari.argillander@gmail.com>
Subject: [PATCH 2/2] fs/ntfs3: Fix missing type checking in ntfs_get_acl_ex
Date: Thu, 26 Aug 2021 11:35:49 +0300 [thread overview]
Message-ID: <20210826083549.1565173-3-kari.argillander@gmail.com> (raw)
In-Reply-To: <20210826083549.1565173-1-kari.argillander@gmail.com>
Add default path for type checking. Comment says that this is checked
above, but for fast eyes I do not find it. We have this check also in
ntfs_set_acl_ex() so let's be consistent. Also other fs driver had
implemented default path. Some are even throwing BUG(), but that feels
little too harsh.
Fixes: be71b5cba2e6 ("fs/ntfs3: Add attrib operations")
Signed-off-by: Kari Argillander <kari.argillander@gmail.com>
---
fs/ntfs3/xattr.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c
index 944557d3a769..5e86bea7e0ab 100644
--- a/fs/ntfs3/xattr.c
+++ b/fs/ntfs3/xattr.c
@@ -498,20 +498,24 @@ static struct posix_acl *ntfs_get_acl_ex(struct user_namespace *mnt_userns,
int err;
void *buf;
- /* allocate PATH_MAX bytes */
- buf = __getname();
- if (!buf)
- return ERR_PTR(-ENOMEM);
-
- /* Possible values of 'type' was already checked above */
- if (type == ACL_TYPE_ACCESS) {
+ switch (type) {
+ case ACL_TYPE_ACCESS:
name = XATTR_NAME_POSIX_ACL_ACCESS;
name_len = sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1;
- } else {
+ break;
+ case ACL_TYPE_DEFAULT:
name = XATTR_NAME_POSIX_ACL_DEFAULT;
name_len = sizeof(XATTR_NAME_POSIX_ACL_DEFAULT) - 1;
+ break;
+ default:
+ return ERR_PTR(-EINVAL);
}
+ /* allocate PATH_MAX bytes */
+ buf = __getname();
+ if (!buf)
+ return ERR_PTR(-ENOMEM);
+
if (!locked)
ni_lock(ni);
--
2.25.1
prev parent reply other threads:[~2021-08-26 8:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 8:35 [PATCH 0/2] fs/ntfs3: Fix minor things in ntfs_get_acl_ex() Kari Argillander
2021-08-26 8:35 ` [PATCH 1/2] fs/ntfs3: Fix pass zero to ERR_PTR() in ntfs_get_acl_ex Kari Argillander
2021-08-26 9:13 ` Kari Argillander
2021-08-26 8:35 ` Kari Argillander [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210826083549.1565173-3-kari.argillander@gmail.com \
--to=kari.argillander@gmail.com \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=ntfs3@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox