From patchwork Tue Apr 5 13:28:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 8751491 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7F462C0553 for ; Tue, 5 Apr 2016 13:30:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B18D4203A4 for ; Tue, 5 Apr 2016 13:30:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D7BF2039E for ; Tue, 5 Apr 2016 13:30:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933076AbcDENa1 (ORCPT ); Tue, 5 Apr 2016 09:30:27 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:34690 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933066AbcDENaX (ORCPT ); Tue, 5 Apr 2016 09:30:23 -0400 Received: by mail-pa0-f65.google.com with SMTP id hb4so1314735pac.1; Tue, 05 Apr 2016 06:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=8eDbU5M8W2DsLJkLfvQ6KfYDLNxbOn92dEZi9HAgvOc=; b=rSWsstUyitKTpfAXO4lILtihlY/kCVCNSPDEc3WB9RjHs/WLAA9EWtRO6nB6dupWU+ EY/I8NpPtBRXTxuBrt+Yiqahp0JZXSUth7CuJPKDL0/TIGhTwjZcoBlneasTVO7kKn9A +gv2DUvm9qUY8XaQNl40YqIKIFEALZX8UQztjgykJJKGKRW2WyD/pUNyD2fjlCd6Chss dzLDghuLV3DsetgS5Eg4JRXG/Sb2ABveXMMvvfgCvzReMG/vl8s5GBtUNVhHIFs1zL6G zeUWQR2FaAL2e9Sf7uRJWCHSHHrsABsvGDpcWf1KbYMdSfKtfk4Hg1V3xfkKBdCNwm6/ vy4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8eDbU5M8W2DsLJkLfvQ6KfYDLNxbOn92dEZi9HAgvOc=; b=FE4UVs+TVvJ6I++UGx4jr0RNngKYYuy+S6ArDoAxFgKO27PJuvSm+CTrwNxFDuig0y VcjKC6aupFoKmvac+xDoVKTOXwcFDSAxDNIPRYl+IHOhHVGX30rysA8TgIrkeQ44CrKd 5OaSd5N0oTSaN9oW6wIbxVIfXGWkYO4qyWe3pzb3LmvOosDmZbbdWpx4tFGjCquLbQgi 8Umf6S7LwtH8YJEdnRM0eBIT+yHW9qW0ecukIAvdngxKtx6S/4HhicCqMvj9A3bHr2ai E7erUu1y5n2wJ/RufW/Y65JfnpT2pgFhpZV8A9OpoYb9wPFsirYMMjRnTV5OvZkKX8t7 42xA== X-Gm-Message-State: AD7BkJK5OOmf4TpdPI4pKRFZUPviz9jUOWU3i1g4PBdVW5kf8HriiF/Ov1yKFy/iQ600gA== X-Received: by 10.66.66.198 with SMTP id h6mr61317985pat.112.1459863022225; Tue, 05 Apr 2016 06:30:22 -0700 (PDT) Received: from localhost ([128.199.137.77]) by smtp.gmail.com with ESMTPSA id 17sm47088990pfp.96.2016.04.05.06.30.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2016 06:30:21 -0700 (PDT) From: Eryu Guan To: linux-fsdevel@vger.kernel.org Cc: Eryu Guan , Steven Whitehouse , Bob Peterson , Alexander Viro , Dave Chinner , xfs@oss.sgi.com (supporter:XFS FILESYSTEM), cluster-devel@redhat.com (open list:GFS2 FILE SYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] fs: return EPERM on immutable inode Date: Tue, 5 Apr 2016 21:28:10 +0800 Message-Id: <1459862890-22957-1-git-send-email-guaneryu@gmail.com> X-Mailer: git-send-email 2.5.5 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In most cases, EPERM is returned on immutable inode, and there're only a few places returning EACCES. And EPERM looks more reasonable to me. So converting all EACCES to EPERM on immutable inode. Signed-off-by: Eryu Guan Acked-by: Dave Chinner --- I noticed this when running LTP on overlayfs, setxattr03 failed due to unexpected EACCES on immutable inode. fs/gfs2/inode.c | 2 +- fs/namei.c | 2 +- fs/utimes.c | 3 ++- fs/xfs/xfs_ioctl.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index bb30f9a..4c68d91 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -1757,7 +1757,7 @@ int gfs2_permission(struct inode *inode, int mask) } if ((mask & MAY_WRITE) && IS_IMMUTABLE(inode)) - error = -EACCES; + error = -EPERM; else error = generic_permission(inode, mask); if (unlock) diff --git a/fs/namei.c b/fs/namei.c index 1d9ca2d..7f4a40a 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -408,7 +408,7 @@ int __inode_permission(struct inode *inode, int mask) * Nobody gets write access to an immutable file. */ if (IS_IMMUTABLE(inode)) - return -EACCES; + return -EPERM; } retval = do_inode_permission(inode, mask); diff --git a/fs/utimes.c b/fs/utimes.c index 85c40f4..794f5f5 100644 --- a/fs/utimes.c +++ b/fs/utimes.c @@ -92,10 +92,11 @@ static int utimes_common(struct path *path, struct timespec *times) * then we need to check permissions, because * inode_change_ok() won't do it. */ - error = -EACCES; + error = -EPERM; if (IS_IMMUTABLE(inode)) goto mnt_drop_write_and_out; + error = -EACCES; if (!inode_owner_or_capable(inode)) { error = inode_permission(inode, MAY_WRITE); if (error) diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index bcb6c19..4c4c58f 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -232,7 +232,7 @@ xfs_open_by_handle( } if ((fmode & FMODE_WRITE) && IS_IMMUTABLE(inode)) { - error = -EACCES; + error = -EPERM; goto out_dput; }