From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AA97C43217 for ; Mon, 13 Sep 2021 22:33:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3FF661107 for ; Mon, 13 Sep 2021 22:33:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343625AbhIMWfE (ORCPT ); Mon, 13 Sep 2021 18:35:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:50186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245674AbhIMWfD (ORCPT ); Mon, 13 Sep 2021 18:35:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6EB036112E; Mon, 13 Sep 2021 22:33:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572427; bh=zZOv9c0hDXozICSiYrxi1nEvEJ4mookKp3h0i39ylNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gaTJeREaE/eawI2JiLyDkwW1ICchQGeQfXxSZblWHGlGj0dvHR66IJ6SckczHS7IL OUyhkGQ34pOYbCvyq8YVzbI/9+tjN1rNmNaJMUCRL6N0C8OPSwAnUuLcdd80xjYxWQ QDcLLUoKdFDx8cliTrbSdodl93w84hVM3hpDlpMIujZlgY01qOqMb5D9BNISeyIlnT MwlvTJcw3XgODJqWccYGCbIvQuY+XyowxJbpsFso8xyzBPO2Dy+TBpPRHxxAuQVK+z vAcS/iHu+gud9quPlG3I/OGWk2mSvNnM7/9/GiNE1oxRP76dbfL9bljKAXSXnAotlu v6oGud9+S0L7A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andreas Gruenbacher , Bob Peterson , Al Viro , Sasha Levin , cluster-devel@redhat.com Subject: [PATCH AUTOSEL 5.14 05/25] gfs2: Switch to may_setattr in gfs2_setattr Date: Mon, 13 Sep 2021 18:33:19 -0400 Message-Id: <20210913223339.435347-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913223339.435347-1-sashal@kernel.org> References: <20210913223339.435347-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andreas Gruenbacher [ Upstream commit d75b9fa053e4cd278281386d860c26fdbfbe9d03 ] The permission check in gfs2_setattr is an old and outdated version of may_setattr(). Switch to the updated version. Fixes fstest generic/079. Signed-off-by: Andreas Gruenbacher Signed-off-by: Bob Peterson Signed-off-by: Al Viro Signed-off-by: Sasha Levin --- fs/gfs2/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 6e15434b23ac..3130f85d2b3f 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -1985,8 +1985,8 @@ static int gfs2_setattr(struct user_namespace *mnt_userns, if (error) goto out; - error = -EPERM; - if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) + error = may_setattr(&init_user_ns, inode, attr->ia_valid); + if (error) goto error; error = setattr_prepare(&init_user_ns, dentry, attr); -- 2.30.2