From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1FB03FB09 for ; Fri, 15 Mar 2024 14:29:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710513002; cv=none; b=dUMXgg2BnJzbK6WcPCzZpJW6AQGon2UpGfIn3gNgP6ENqmBFWbC8D83DgasmO6C0oZ55KKfb5mfZKTKAEZF8CKJVu4TcajBeJ4wkO2DvyJ2ce5JNmvfDSXCzP2QjKItOOAblPaDjFX3pf5trxzw89kfo3bh904snNVlQkpJmycs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710513002; c=relaxed/simple; bh=KfYUBD7UBkzcBcghQDhrh4UXWg6wcsJSwijPDwGd+xc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=XDRBG8qoB2ud2Oph8jOcOCXOBKCKRl8K4p51Nxc6lwnQqZSy3k1Ydzdm5htJ1l3lmp/UdjrooCLLpRO9wOTiWDgwP6vFfDtw+cZqkK2zqcEI/w+QY5I60IsFJfNO8r7Ek+kgZnvxs+GdeMyWsaKyjc68UjNC/rqJxFgRSwBzFOI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=HwCNqalG; arc=none smtp.client-ip=209.85.208.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="HwCNqalG" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-56840d872aeso2300501a12.0 for ; Fri, 15 Mar 2024 07:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1710512998; x=1711117798; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=26x5Ax6QaYFW/lMxTgpz/jUxgNJVrtQaQeSP0hgClqs=; b=HwCNqalG9e38Unx0blfPCy7hKTXJXIfw/xLgPb5GLE6RNWVa2gUMjnOxs+QF0KNJyY oKuOFm1zxJh/INpx6YWniq6GkotQkReSO35ln5oL7QsJMyoYwBtHebuczvkAtw6I/+gd fwfSweriXw0W27J3ZoQgRIlue6cUQPToraG+DRgt7xe18Yy29TLFrgghGlOVMlPdiVD6 zipng7eC/es7xo1wBg+NVaeUPqqF8PoYStIsqxN+qdzeJrcyiE8d5lvNAHTff+/Vk/mz n3hJ9nDDPPp6dFcSEtf+ucaHVFFd6rz2ksIcJJRzkmovzdMNhIMqTEJ/g0l51aj0Q0pe 8o/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710512998; x=1711117798; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=26x5Ax6QaYFW/lMxTgpz/jUxgNJVrtQaQeSP0hgClqs=; b=ODE3VdY1yHEkWD1YSvgRmIxVpaopFAYNFbo1DrAcbjA3FR+OfHqQBAXUy14SM9nowx l/tWFV7/jk2AitMlLmIfqWNaPh+7AXEE033oLDRVYwYEBOuKE4o3HLhgFmY7XjBviMLG olyfSwgRlI4SDAS6zKFBp+HVe7/9GUaX5Uvw6Im3OkVSHDFoy0QHewjX6/f1VlVA+fUl zK4U7XO3H3US9jmLYnuqZzYll6kmCTF815wOYk5rJRsUJ9sEmmvbELlpmJhyKG9LVxVg ymrujMF1CmPCY4NE5mJjbBoAomuHTdVwLJ7hcg+J2Lmo1qzRR1vV+FkMiJVlj/N5I2NO yA+A== X-Forwarded-Encrypted: i=1; AJvYcCWUIH+pQ+knAQ2cHZnQoPylFyq4psnDeJAVe7nwrHL2ayLbC8uMqAlrD7yLKz6ZOFHMAvEmFSptZvoEDn3bV0E1XKnuHNtulkfQzQ== X-Gm-Message-State: AOJu0YzfFl+bmtTR+I/u5iEIC0wYhtEVNoxs6c0zOI66mKsp8G29VnYL dLgZS8TlIyNgWlY3UfECFnHMG/35h2mxjHpeFlt03Nobq62i9q/Ve5amjvoJzN0= X-Google-Smtp-Source: AGHT+IEZqEc+qFGuULCGQaqf2Z6e4zQ1Np1mSGjmmzxskLbaDmx1sdHG1RUdJKKtsyZZdnlj6/7Lbw== X-Received: by 2002:a05:6402:1f04:b0:568:a30c:2dae with SMTP id b4-20020a0564021f0400b00568a30c2daemr3938824edb.0.1710512998347; Fri, 15 Mar 2024 07:29:58 -0700 (PDT) Received: from raven.blarg.de (p200300dc6f010900023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f01:900:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id y14-20020aa7ccce000000b005653c441a20sm1726147edt.34.2024.03.15.07.29.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 07:29:58 -0700 (PDT) From: Max Kellermann To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, brauner@kernel.org, mforney@mforney.org Cc: stable@vger.kernel.org, Max Kellermann Subject: [PATCH] Revert "ext4: apply umask if ACL support is disabled" Date: Fri, 15 Mar 2024 15:29:56 +0100 Message-Id: <20240315142956.2420360-1-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- fs/ext4/acl.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h index ef4c19e5f570..0c5a79c3b5d4 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.39.2