From: Max Kellermann <max.kellermann@ionos.com>
To: Xiubo Li <xiubli@redhat.com>, Ilya Dryomov <idryomov@gmail.com>,
Jeff Layton <jlayton@kernel.org>, Jan Kara <jack@suse.com>,
Dave Kleikamp <shaggy@kernel.org>
Cc: Max Kellermann <max.kellermann@ionos.com>,
ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-ext4@vger.kernel.org, jfs-discussion@lists.sourceforge.net
Subject: [PATCH] fs: apply umask if POSIX ACL support is disabled
Date: Tue, 19 Sep 2023 10:18:59 +0200 [thread overview]
Message-ID: <20230919081900.1096840-1-max.kellermann@ionos.com> (raw)
Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
fs/ceph/super.h | 1 +
fs/ext2/acl.h | 1 +
fs/jfs/jfs_acl.h | 1 +
include/linux/posix_acl.h | 1 +
4 files changed, 4 insertions(+)
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 51c7f2b14f6f..e7e2f264acf4 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -1194,6 +1194,7 @@ static inline void ceph_forget_all_cached_acls(struct inode *inode)
static inline int ceph_pre_init_acls(struct inode *dir, umode_t *mode,
struct ceph_acl_sec_ctx *as_ctx)
{
+ *mode &= ~current_umask();
return 0;
}
static inline void ceph_init_inode_acls(struct inode *inode,
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index 4a8443a2b8ec..694af789c614 100644
--- a/fs/ext2/acl.h
+++ b/fs/ext2/acl.h
@@ -67,6 +67,7 @@ extern int ext2_init_acl (struct inode *, struct inode *);
static inline int ext2_init_acl (struct inode *inode, struct inode *dir)
{
+ inode->i_mode &= ~current_umask();
return 0;
}
#endif
diff --git a/fs/jfs/jfs_acl.h b/fs/jfs/jfs_acl.h
index f892e54d0fcd..10791e97a46f 100644
--- a/fs/jfs/jfs_acl.h
+++ b/fs/jfs/jfs_acl.h
@@ -17,6 +17,7 @@ int jfs_init_acl(tid_t, struct inode *, struct inode *);
static inline int jfs_init_acl(tid_t tid, struct inode *inode,
struct inode *dir)
{
+ inode->i_mode &= ~current_umask();
return 0;
}
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 0e65b3d634d9..54bc9b1061ca 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -128,6 +128,7 @@ static inline void cache_no_acl(struct inode *inode)
static inline int posix_acl_create(struct inode *inode, umode_t *mode,
struct posix_acl **default_acl, struct posix_acl **acl)
{
+ *mode &= ~current_umask();
*default_acl = *acl = NULL;
return 0;
}
--
2.39.2
next reply other threads:[~2023-09-19 8:19 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 8:18 Max Kellermann [this message]
2023-09-21 0:51 ` [PATCH] fs: apply umask if POSIX ACL support is disabled Xiubo Li
2023-10-03 15:32 ` Dave Kleikamp
2023-10-07 1:19 ` Xiubo Li
2023-10-09 14:43 ` [PATCH v2] fs/{posix_acl,ext2,jfs,ceph}: apply umask if " Max Kellermann
2023-10-09 16:49 ` Dave Kleikamp
2023-10-10 13:11 ` Jan Kara
2023-10-10 13:17 ` Max Kellermann
2023-10-11 10:05 ` Jan Kara
2023-10-11 10:51 ` Max Kellermann
2023-10-11 12:06 ` Jan Kara
2023-10-11 12:18 ` Max Kellermann
2023-10-11 12:27 ` Jan Kara
2023-10-11 12:27 ` Max Kellermann
2023-10-11 13:59 ` Jan Kara
2023-10-11 15:27 ` Christian Brauner
2023-10-11 16:29 ` Jan Kara
2023-10-12 9:22 ` Christian Brauner
2023-10-12 9:41 ` Jan Kara
2023-10-11 17:00 ` Theodore Ts'o
2023-10-11 17:26 ` Jan Kara
2023-10-12 14:29 ` Theodore Ts'o
2023-10-12 14:42 ` Jan Kara
2024-03-13 20:40 ` Michael Forney
2024-03-14 13:08 ` Max Kellermann
2024-03-15 13:52 ` Christian Brauner
2023-10-09 14:45 ` [PATCH] fs: apply umask if POSIX " Max Kellermann
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=20230919081900.1096840-1-max.kellermann@ionos.com \
--to=max.kellermann@ionos.com \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=jack@suse.com \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=jlayton@kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shaggy@kernel.org \
--cc=xiubli@redhat.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).