Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Jesper Nilsson <jesper.nilsson@axis.com>
To: <stable@vger.kernel.org>
Cc: Max Kellermann <max.kellermann@ionos.com>,
	Christian Brauner <brauner@kernel.org>,
	Michael Forney <mforney@mforney.org>,
	Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 5.15.y] Revert "ext4: apply umask if ACL support is disabled"
Date: Mon, 10 Feb 2025 21:28:01 +0100	[thread overview]
Message-ID: <20250210202801.2415267-1-jesper.nilsson@axis.com> (raw)
In-Reply-To: <171468877064.2998637.14217086529278734176.b4-ty@mit.edu>

From: Max Kellermann <max.kellermann@ionos.com>

This reverts commit 484fd6c1de13b336806a967908a927cc0356e312.  The
commit caused a regression because now the umask was applied to
symlinks and the fix is unnecessary because the umask/O_TMPFILE bug
has been fixed somewhere else already.

Fixes: https://lore.kernel.org/lkml/28DSITL9912E1.2LSZUVTGTO52Q@mforney.org/
Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Tested-by: Michael Forney <mforney@mforney.org>
Link: https://lore.kernel.org/r/20240315142956.2420360-1-max.kellermann@ionos.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit c77194965dd0dcc26f9c1671d2e74e4eb1248af5)

---
This revert never reached linux-5.15.y, and caused the same regression
with symbolic links. The original problem is just as the revert states
fixed and the test program for O_TMPFILE works as expected.
---
 fs/ext4/acl.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index 0db6ae0ca936..3219669732bf 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -68,11 +68,6 @@ extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);
 static inline int
 ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
 {
-	/* usually, the umask is applied by posix_acl_create(), but if
-	   ext4 ACL support is disabled at compile time, we need to do
-	   it here, because posix_acl_create() will never be called */
-	inode->i_mode &= ~current_umask();
-
 	return 0;
 }
 #endif  /* CONFIG_EXT4_FS_POSIX_ACL */
-- 
2.36.0


  reply	other threads:[~2025-02-10 20:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-15 14:29 [PATCH] Revert "ext4: apply umask if ACL support is disabled" Max Kellermann
2024-03-18  8:44 ` Christian Brauner
2024-03-25  0:22 ` Michael Forney
2024-05-01 20:04   ` Michael Forney
2024-05-02 22:26 ` Theodore Ts'o
2025-02-10 20:28   ` Jesper Nilsson [this message]
2025-02-19  7:29     ` [PATCH 5.15.y] " Greg KH

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=20250210202801.2415267-1-jesper.nilsson@axis.com \
    --to=jesper.nilsson@axis.com \
    --cc=brauner@kernel.org \
    --cc=max.kellermann@ionos.com \
    --cc=mforney@mforney.org \
    --cc=stable@vger.kernel.org \
    --cc=tytso@mit.edu \
    /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